diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-19 11:19:06 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-08-23 14:37:10 +0200 |
| commit | b62171062be100186a71d00610c15a0b07d07c72 (patch) | |
| tree | a8c0be5f3035f734a46721bcc9171224c742d19e /src/multimedia/qmediaobject_p.h | |
| parent | 0250b243d1d43d904622433bf632b249c21e7323 (diff) | |
Make QMediaObjectPrivate as QObjectPrivate
Since QMediaObject is QObject, and it uses d_ptr,
it is sane to move QMediaObjectPrivate to QObjectPrivate
and use standard way of using private impl.
NOTE : If some users inherit from QMediaObjectPrivate in their code,
they probably initialize and delete d_ptr manually
which would cause a crash now.
But using QMediaObjectPrivate without QMediaObject should be considered
as incorrect usage.
Task-number: QTBUG-77630
Change-Id: I147e3b3dc67a8c2765b28f752db196b4d7fca224
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/multimedia/qmediaobject_p.h')
| -rw-r--r-- | src/multimedia/qmediaobject_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/qmediaobject_p.h b/src/multimedia/qmediaobject_p.h index 85caf9a50..5067fa6d1 100644 --- a/src/multimedia/qmediaobject_p.h +++ b/src/multimedia/qmediaobject_p.h @@ -56,6 +56,7 @@ #include <QtCore/qtimer.h> #include "qmediaobject.h" +#include "private/qobject_p.h" QT_BEGIN_NAMESPACE @@ -68,12 +69,12 @@ class QMediaAvailabilityControl; friend class Class; -class QMediaObjectPrivate +class QMediaObjectPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QMediaObject) public: - QMediaObjectPrivate() : service(nullptr), metaDataControl(nullptr), availabilityControl(nullptr), notifyTimer(nullptr), q_ptr(nullptr) {} + QMediaObjectPrivate() : service(nullptr), metaDataControl(nullptr), availabilityControl(nullptr), notifyTimer(nullptr) {} virtual ~QMediaObjectPrivate() {} void _q_notify(); @@ -85,8 +86,6 @@ public: QTimer* notifyTimer; QSet<int> notifyProperties; - - QMediaObject *q_ptr; }; QT_END_NAMESPACE |