Polish the camera example

- Use modern string literals
- Remove clearing of Qt::WindowContextHelpButtonHint (default in 6)
- Order includes by module
- Streamline code, introduce helper functions for clarity

Pick-to: 6.5
Change-Id: Idaa56af5fb1c8472947a51ad68be7b1c98da73a4
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>

1 files changed, 12 insertions, 14 deletions

diff --git a/examples/multimedia/camera/imagesettings.cpp b/examples/multimedia/camera/imagesettings.cpp
index 0b8d9704a..c2b022a70 100644
--- a/examples/multimedia/camera/imagesettings.cpp
+++ b/examples/multimedia/camera/imagesettings.cpp
@@ -5,11 +5,15 @@
 #include "ui_imagesettings.h"
 
 #include <QCamera>
-#include <QComboBox>
-#include <QDebug>
 #include <QImageCapture>
 #include <QMediaCaptureSession>
 
+#include <QComboBox>
+
+#include <QDebug>
+
+using namespace Qt::StringLiterals;
+
 ImageSettings::ImageSettings(QImageCapture *imageCapture, QWidget *parent)
     : QDialog(parent), ui(new Ui::ImageSettingsUi), imagecapture(imageCapture)
 {
@@ -31,7 +35,7 @@ ImageSettings::ImageSettings(QImageCapture *imageCapture, QWidget *parent)
             imagecapture->captureSession()->camera()->cameraDevice().photoResolutions();
     for (const QSize &resolution : supportedResolutions) {
         ui->imageResolutionBox->addItem(
-                QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
+                u"%1x%2"_s.arg(resolution.width()).arg(resolution.height()),
                 QVariant(resolution));
     }
 
@@ -66,21 +70,15 @@ void ImageSettings::applyImageSettings() const
 
 QVariant ImageSettings::boxValue(const QComboBox *box) const
 {
-    int idx = box->currentIndex();
-    if (idx == -1)
-        return QVariant();
-
-    return box->itemData(idx);
+    const int idx = box->currentIndex();
+    return idx != -1 ? box->itemData(idx) : QVariant{};
 }
 
 void ImageSettings::selectComboBoxItem(QComboBox *box, const QVariant &value)
 {
-    for (int i = 0; i < box->count(); ++i) {
-        if (box->itemData(i) == value) {
-            box->setCurrentIndex(i);
-            break;
-        }
-    }
+    const int idx = box->findData(value);
+    if (idx != -1)
+        box->setCurrentIndex(idx);
 }
 
 #include "moc_imagesettings.cpp"