summaryrefslogtreecommitdiffstats
path: root/examples/camera/imagesettings.cpp
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-11-20 15:20:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-21 10:25:02 +0100
commit9f4d6e824c1b75642150f448f8a359dbc95fb955 (patch)
tree33c5434c768ad1fefc0c238e421abb7e44d8264f /examples/camera/imagesettings.cpp
parent294fa9c5df5546a96364a8f3c47f969951d2cf32 (diff)
QtMultimedia: examples/camera coding style
Also unconditionally include code for Qt >= 4.7 Change-Id: Ic8b9d009a54f9e0fe7e9477c75c125ad09a485ee Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'examples/camera/imagesettings.cpp')
-rw-r--r--examples/camera/imagesettings.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp
index 080802191..566a1260b 100644
--- a/examples/camera/imagesettings.cpp
+++ b/examples/camera/imagesettings.cpp
@@ -41,11 +41,10 @@
#include "imagesettings.h"
#include "ui_imagesettings.h"
-#include <QtWidgets/qcombobox.h>
-#include <QtCore/qdebug.h>
-#include <qcameraimagecapture.h>
-#include <qmediaservice.h>
-
+#include <QComboBox>
+#include <QDebug>
+#include <QCameraImageCapture>
+#include <QMediaService>
ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) :
@@ -117,7 +116,7 @@ QVariant ImageSettings::boxValue(const QComboBox *box) const
void ImageSettings::selectComboBoxItem(QComboBox *box, const QVariant &value)
{
- for (int i=0; i<box->count(); i++) {
+ for (int i = 0; i < box->count(); ++i) {
if (box->itemData(i) == value) {
box->setCurrentIndex(i);
break;