diff options
Diffstat (limited to 'src/multimedia/qmediaobject.cpp')
-rw-r--r-- | src/multimedia/qmediaobject.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index a12cab404..a26433c8e 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -113,7 +113,6 @@ void QMediaObjectPrivate::_q_availabilityChanged() QMediaObject::~QMediaObject() { - delete d_ptr; } /*! @@ -230,15 +229,11 @@ void QMediaObject::unbind(QObject *object) constructor is protected. */ -QMediaObject::QMediaObject(QObject *parent, QMediaService *service): - QObject(parent), - d_ptr(new QMediaObjectPrivate) - +QMediaObject::QMediaObject(QObject *parent, QMediaService *service) + : QObject(*new QMediaObjectPrivate, parent) { Q_D(QMediaObject); - d->q_ptr = this; - d->notifyTimer = new QTimer(this); d->notifyTimer->setInterval(1000); connect(d->notifyTimer, SIGNAL(timeout()), SLOT(_q_notify())); @@ -252,13 +247,10 @@ QMediaObject::QMediaObject(QObject *parent, QMediaService *service): \internal */ -QMediaObject::QMediaObject(QMediaObjectPrivate &dd, QObject *parent, - QMediaService *service): - QObject(parent), - d_ptr(&dd) +QMediaObject::QMediaObject(QMediaObjectPrivate &dd, QObject *parent, QMediaService *service) + : QObject(dd, parent) { Q_D(QMediaObject); - d->q_ptr = this; d->notifyTimer = new QTimer(this); d->notifyTimer->setInterval(1000); @@ -430,7 +422,6 @@ void QMediaObject::setupControls() Signal emitted when the availability of the service has changed to \a availability. */ - -#include "moc_qmediaobject.cpp" QT_END_NAMESPACE +#include "moc_qmediaobject.cpp" |