diff options
Diffstat (limited to 'src/multimedia/camera/qcameraimageprocessing.cpp')
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index c2cefeae7..af6c22391 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; } @@ -400,6 +396,6 @@ bool QCameraImageProcessing::isColorFilterSupported(QCameraImageProcessing::Colo } +QT_END_NAMESPACE #include "moc_qcameraimageprocessing.cpp" -QT_END_NAMESPACE |