diff options
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/camera/qcamerafocus.h | 4 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.h | 4 |
4 files changed, 10 insertions, 14 deletions
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index e73a8ea46..775e49b63 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -325,8 +325,6 @@ class QCameraFocusPrivate : public QMediaObjectPrivate public: void initControls(); - QCameraFocus *q_ptr; - QCamera *camera; QCameraFocusControl *focusControl; @@ -373,12 +371,11 @@ void QCameraFocusPrivate::initControls() Construct a QCameraFocus for \a camera. */ -QCameraFocus::QCameraFocus(QCamera *camera): - QObject(camera), d_ptr(new QCameraFocusPrivate) +QCameraFocus::QCameraFocus(QCamera *camera) + : QObject(*new QCameraFocusPrivate, camera) { Q_D(QCameraFocus); d->camera = camera; - d->q_ptr = this; d->initControls(); } @@ -389,7 +386,6 @@ QCameraFocus::QCameraFocus(QCamera *camera): QCameraFocus::~QCameraFocus() { - delete d_ptr; } /*! diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 024f504e9..a5d7725e3 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -162,7 +162,9 @@ private: Q_DISABLE_COPY(QCameraFocus) Q_DECLARE_PRIVATE(QCameraFocus) - QCameraFocusPrivate *d_ptr; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QCameraFocusPrivate *d_ptr_deprecated; +#endif }; Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraFocus::FocusModes) diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index c2cefeae7..0328f4a56 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -114,8 +114,6 @@ class QCameraImageProcessingPrivate : public QMediaObjectPrivate public: void initControls(); - QCameraImageProcessing *q_ptr; - QCamera *camera; QCameraImageProcessingControl *imageControl; bool available; @@ -140,12 +138,11 @@ void QCameraImageProcessingPrivate::initControls() Construct a QCameraImageProcessing for \a camera. */ -QCameraImageProcessing::QCameraImageProcessing(QCamera *camera): - QObject(camera), d_ptr(new QCameraImageProcessingPrivate) +QCameraImageProcessing::QCameraImageProcessing(QCamera *camera) + : QObject(*new QCameraImageProcessingPrivate, camera) { Q_D(QCameraImageProcessing); d->camera = camera; - d->q_ptr = this; d->initControls(); } @@ -156,7 +153,6 @@ QCameraImageProcessing::QCameraImageProcessing(QCamera *camera): QCameraImageProcessing::~QCameraImageProcessing() { - delete d_ptr; } diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index e4ad00ff8..f76daf85e 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -126,7 +126,9 @@ private: Q_DISABLE_COPY(QCameraImageProcessing) Q_DECLARE_PRIVATE(QCameraImageProcessing) - QCameraImageProcessingPrivate *d_ptr; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QCameraImageProcessingPrivate *d_ptr_deprecated; +#endif }; QT_END_NAMESPACE |