Use QPointer instead of QWeakPointer to track QObjects.

The latter is to be deprecated.

Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

5 files changed, 17 insertions, 13 deletions

diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index 39cb549b7..42ebd1955 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtQuick/qquickitem.h>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,9 +126,9 @@ private:
 
     SourceType m_sourceType;
 
-    QWeakPointer<QObject> m_source;
-    QWeakPointer<QMediaObject> m_mediaObject;
-    QWeakPointer<QMediaService> m_service;
+    QPointer<QObject> m_source;
+    QPointer<QMediaObject> m_mediaObject;
+    QPointer<QMediaService> m_service;
 
     FillMode m_fillMode;
     QSize m_nativeSize;
diff --git a/src/multimedia/audio/qaudioprobe.cpp b/src/multimedia/audio/qaudioprobe.cpp
index 8e7aed4a0..5bc645a44 100644
--- a/src/multimedia/audio/qaudioprobe.cpp
+++ b/src/multimedia/audio/qaudioprobe.cpp
@@ -69,13 +69,14 @@
 #include "qmediaservice.h"
 #include "qmediarecorder.h"
 #include "qsharedpointer.h"
+#include "qpointer.h"
 
 QT_BEGIN_NAMESPACE
 
 class QAudioProbePrivate {
 public:
-    QWeakPointer<QMediaObject> source;
-    QWeakPointer<QMediaAudioProbeControl> probee;
+    QPointer<QMediaObject> source;
+    QPointer<QMediaAudioProbeControl> probee;
 };
 
 /*!
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index 641c7a485..ad2e2f6ac 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -41,7 +41,7 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/QWeakPointer>
+#include <QtCore/QPointer>
 
 #include <qmediaplaylist.h>
 #include "qmediacontent.h"
@@ -100,7 +100,7 @@ public:
 
     QMediaResourceList resources;
 
-    QWeakPointer<QMediaPlaylist> playlist;
+    QPointer<QMediaPlaylist> playlist;
     bool isPlaylistOwned;
 private:
     QMediaContentPrivate& operator=(const QMediaContentPrivate &other);
diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp
index 0417a233e..ff1b8b23e 100644
--- a/src/multimedia/video/qvideoprobe.cpp
+++ b/src/multimedia/video/qvideoprobe.cpp
@@ -73,13 +73,14 @@
 #include "qmediaservice.h"
 #include "qmediarecorder.h"
 #include "qsharedpointer.h"
+#include "qpointer.h"
 
 QT_BEGIN_NAMESPACE
 
 class QVideoProbePrivate {
 public:
-    QWeakPointer<QMediaObject> source;
-    QWeakPointer<QMediaVideoProbeControl> probee;
+    QPointer<QMediaObject> source;
+    QPointer<QMediaVideoProbeControl> probee;
 };
 
 /*!
diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h
index 92e165641..6a5d0f7ab 100644
--- a/src/multimedia/video/qvideosurfaceoutput_p.h
+++ b/src/multimedia/video/qvideosurfaceoutput_p.h
@@ -45,6 +45,7 @@
 #include <qmediabindableinterface.h>
 
 #include <QtCore/qsharedpointer.h>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_HEADER
 
@@ -72,10 +73,10 @@ protected:
     bool setMediaObject(QMediaObject *object);
 
 private:
-    QWeakPointer<QAbstractVideoSurface> m_surface;
-    QWeakPointer<QVideoRendererControl> m_control;
-    QWeakPointer<QMediaService> m_service;
-    QWeakPointer<QMediaObject> m_object;
+    QPointer<QAbstractVideoSurface> m_surface;
+    QPointer<QVideoRendererControl> m_control;
+    QPointer<QMediaService> m_service;
+    QPointer<QMediaObject> m_object;
 };
 
 QT_END_NAMESPACE