From e8e9f40ebc0d822fe639bed75d185800ff16b452 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 23 Jun 2017 15:18:22 +0200
Subject: Camera example: Brush up to C++11

Use Qt 5 signal/slot syntax, range based for, member initialization.
Add message for captured images and fix some minor issues.

Task-number: QTBUG-60627
Change-Id: I1011fc95d928a9d2edaad16120acb0dc41f987d9
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
 examples/multimediawidgets/camera/camera.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples/multimediawidgets/camera/camera.h')

diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 3db1347b6..45a73176c 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -56,7 +56,7 @@ class Camera : public QMainWindow
     Q_OBJECT
 
 public:
-    Camera(QWidget *parent = 0);
+    explicit Camera(QWidget *parent = nullptr);
     ~Camera();
 
 private slots:
@@ -107,16 +107,16 @@ protected:
 private:
     Ui::Camera *ui;
 
-    QCamera *camera;
-    QCameraImageCapture *imageCapture;
-    QMediaRecorder* mediaRecorder;
+    QCamera *camera = nullptr;
+    QCameraImageCapture *imageCapture = nullptr;
+    QMediaRecorder* mediaRecorder = nullptr;
 
     QImageEncoderSettings imageSettings;
     QAudioEncoderSettings audioSettings;
     QVideoEncoderSettings videoSettings;
     QString videoContainerFormat;
-    bool isCapturingImage;
-    bool applicationExiting;
+    bool isCapturingImage = false;
+    bool applicationExiting = false;
 };
 
 #endif
-- 
cgit v1.2.3