diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-19 12:31:44 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-23 14:37:07 +0200 |
| commit | 0250b243d1d43d904622433bf632b249c21e7323 (patch) | |
| tree | 94ba2a07c5e8ba8b2c7fe983a0b97ef96c1b5ae2 /src/multimedia | |
| parent | c018d5affdfca9c94a9797894c4092db53b7b101 (diff) | |
Make QMediaServicePrivate as QObjectPrivate
Currently QMediaService contains d_ptr, which is not QObjectPrivate,
but QMediaService is QObject.
Task-number: QTBUG-77630
Change-Id: I1db0fd188bcc1a196e6f981b4410a6a1f57e88d5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qmediaservice.cpp | 9 | ||||
| -rw-r--r-- | src/multimedia/qmediaservice.h | 4 | ||||
| -rw-r--r-- | src/multimedia/qmediaservice_p.h | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp index 4d6b3c039..52f5fdee3 100644 --- a/src/multimedia/qmediaservice.cpp +++ b/src/multimedia/qmediaservice.cpp @@ -87,20 +87,16 @@ QT_BEGIN_NAMESPACE */ QMediaService::QMediaService(QObject *parent) - : QObject(parent) - , d_ptr(new QMediaServicePrivate) + : QObject(*new QMediaServicePrivate, parent) { - d_ptr->q_ptr = this; } /*! \internal */ QMediaService::QMediaService(QMediaServicePrivate &dd, QObject *parent) - : QObject(parent) - , d_ptr(&dd) + : QObject(dd, parent) { - d_ptr->q_ptr = this; } /*! @@ -109,7 +105,6 @@ QMediaService::QMediaService(QMediaServicePrivate &dd, QObject *parent) QMediaService::~QMediaService() { - delete d_ptr; } /*! diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h index 9e653b2d8..019b86693 100644 --- a/src/multimedia/qmediaservice.h +++ b/src/multimedia/qmediaservice.h @@ -74,7 +74,9 @@ protected: QMediaService(QObject* parent); QMediaService(QMediaServicePrivate &dd, QObject *parent); - QMediaServicePrivate *d_ptr; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QMediaServicePrivate *d_ptr_deprecated; +#endif private: Q_DECLARE_PRIVATE(QMediaService) diff --git a/src/multimedia/qmediaservice_p.h b/src/multimedia/qmediaservice_p.h index 8c18ab1df..a9dbd5d29 100644 --- a/src/multimedia/qmediaservice_p.h +++ b/src/multimedia/qmediaservice_p.h @@ -51,18 +51,19 @@ // We mean it. // +#include "private/qobject_p.h" + QT_BEGIN_NAMESPACE class QAudioDeviceControl; -class QMediaServicePrivate +class QMediaServicePrivate : public QObjectPrivate { + Q_DECLARE_PUBLIC(QMediaService) public: - QMediaServicePrivate(): q_ptr(0) {} + QMediaServicePrivate() {} virtual ~QMediaServicePrivate() {} - - QMediaService *q_ptr; }; QT_END_NAMESPACE |