From f1661fdd81b81269d2f663efda6f5b240c5ac83d Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 18 Sep 2017 15:29:32 +0200
Subject: Modernize the Camera example

Changed style of members.
Applied QScopedPointer.

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

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

diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 45a73176c..4e5829cd5 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -44,6 +44,7 @@
 #include <QCamera>
 #include <QCameraImageCapture>
 #include <QMediaRecorder>
+#include <QScopedPointer>
 
 #include <QMainWindow>
 
@@ -56,8 +57,7 @@ class Camera : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit Camera(QWidget *parent = nullptr);
-    ~Camera();
+    Camera();
 
 private slots:
     void setCamera(const QCameraInfo &cameraInfo);
@@ -107,16 +107,16 @@ protected:
 private:
     Ui::Camera *ui;
 
-    QCamera *camera = nullptr;
-    QCameraImageCapture *imageCapture = nullptr;
-    QMediaRecorder* mediaRecorder = nullptr;
+    QScopedPointer<QCamera> m_camera;
+    QScopedPointer<QCameraImageCapture> m_imageCapture;
+    QScopedPointer<QMediaRecorder> m_mediaRecorder;
 
-    QImageEncoderSettings imageSettings;
-    QAudioEncoderSettings audioSettings;
-    QVideoEncoderSettings videoSettings;
-    QString videoContainerFormat;
-    bool isCapturingImage = false;
-    bool applicationExiting = false;
+    QImageEncoderSettings m_imageSettings;
+    QAudioEncoderSettings m_audioSettings;
+    QVideoEncoderSettings m_videoSettings;
+    QString m_videoContainerFormat;
+    bool m_isCapturingImage = false;
+    bool m_applicationExiting = false;
 };
 
 #endif
-- 
cgit v1.2.3