summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/camera.h
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimediawidgets/camera/camera.h')
-rw-r--r--examples/multimediawidgets/camera/camera.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 11a4d0e44..d06c770f6 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -54,6 +54,7 @@
#include <QCamera>
#include <QCameraImageCapture>
#include <QMediaRecorder>
+#include <QScopedPointer>
#include <QMainWindow>
@@ -66,8 +67,7 @@ class Camera : public QMainWindow
Q_OBJECT
public:
- explicit Camera(QWidget *parent = nullptr);
- ~Camera();
+ Camera();
private slots:
void setCamera(const QCameraInfo &cameraInfo);
@@ -117,16 +117,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