slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use QPointer instead of QWeakPointer to track QObjects.

Browse Source 
The latter is to be deprecated.

Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Stephen Kelly
2012-06-06 11:39:59 +02:00
committed by Qt by Nokia
parent 487010e579
commit b93032a7df
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -46,6 +46,7 @@
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <QtCore/qsharedpointer.h> #include <QtCore/qsharedpointer.h>
#include <QtQuick/qquickitem.h> #include <QtQuick/qquickitem.h>
#include <QtCore/qpointer.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -125,9 +126,9 @@ private:
SourceType m_sourceType; SourceType m_sourceType;
QWeakPointer<QObject> m_source; QPointer<QObject> m_source;
QWeakPointer<QMediaObject> m_mediaObject; QPointer<QMediaObject> m_mediaObject;
QWeakPointer<QMediaService> m_service; QPointer<QMediaService> m_service;
FillMode m_fillMode; FillMode m_fillMode;
QSize m_nativeSize; QSize m_nativeSize;

5
src/multimedia/audio/qaudioprobe.cpp
View File

@@ -69,13 +69,14 @@
#include "qmediaservice.h" #include "qmediaservice.h"
#include "qmediarecorder.h" #include "qmediarecorder.h"
#include "qsharedpointer.h" #include "qsharedpointer.h"
#include "qpointer.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAudioProbePrivate { class QAudioProbePrivate {
public: public:
QWeakPointer<QMediaObject> source; QPointer<QMediaObject> source;
QWeakPointer<QMediaAudioProbeControl> probee; QPointer<QMediaAudioProbeControl> probee;
}; };
/*! /*!

4
src/multimedia/playback/qmediacontent.cpp
View File

@@ -41,7 +41,7 @@
#include <QtCore/qurl.h> #include <QtCore/qurl.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/QWeakPointer> #include <QtCore/QPointer>
#include <qmediaplaylist.h> #include <qmediaplaylist.h>
#include "qmediacontent.h" #include "qmediacontent.h"
@@ -100,7 +100,7 @@ public:
QMediaResourceList resources; QMediaResourceList resources;
QWeakPointer<QMediaPlaylist> playlist; QPointer<QMediaPlaylist> playlist;
bool isPlaylistOwned; bool isPlaylistOwned;
private: private:
QMediaContentPrivate& operator=(const QMediaContentPrivate &other); QMediaContentPrivate& operator=(const QMediaContentPrivate &other);

5
src/multimedia/video/qvideoprobe.cpp
View File

@@ -73,13 +73,14 @@
#include "qmediaservice.h" #include "qmediaservice.h"
#include "qmediarecorder.h" #include "qmediarecorder.h"
#include "qsharedpointer.h" #include "qsharedpointer.h"
#include "qpointer.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QVideoProbePrivate { class QVideoProbePrivate {
public: public:
QWeakPointer<QMediaObject> source; QPointer<QMediaObject> source;
QWeakPointer<QMediaVideoProbeControl> probee; QPointer<QMediaVideoProbeControl> probee;
}; };
/*! /*!

9
src/multimedia/video/qvideosurfaceoutput_p.h
View File

@@ -45,6 +45,7 @@
#include <qmediabindableinterface.h> #include <qmediabindableinterface.h>
#include <QtCore/qsharedpointer.h> #include <QtCore/qsharedpointer.h>
#include <QtCore/qpointer.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER
@@ -72,10 +73,10 @@ protected:
bool setMediaObject(QMediaObject *object); bool setMediaObject(QMediaObject *object);
private: private:
QWeakPointer<QAbstractVideoSurface> m_surface; QPointer<QAbstractVideoSurface> m_surface;
QWeakPointer<QVideoRendererControl> m_control; QPointer<QVideoRendererControl> m_control;
QWeakPointer<QMediaService> m_service; QPointer<QMediaService> m_service;
QWeakPointer<QMediaObject> m_object; QPointer<QMediaObject> m_object;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

4
tests/auto/unit/qmediacontent/tst_qmediacontent.cpp
View File

@@ -181,7 +181,7 @@ void tst_QMediaContent::testPlaylist()
QVERIFY(!media.playlist()); QVERIFY(!media.playlist());
{ {
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist); QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true); media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true);
QVERIFY(media.canonicalUrl().isValid()); QVERIFY(media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data()); QCOMPARE(media.playlist(), playlist.data());
@@ -200,7 +200,7 @@ void tst_QMediaContent::testPlaylist()
} }
{ {
QWeakPointer<QMediaPlaylist> playlist(new QMediaPlaylist); QPointer<QMediaPlaylist> playlist(new QMediaPlaylist);
media = QMediaContent(playlist.data(), QUrl(), false); media = QMediaContent(playlist.data(), QUrl(), false);
QVERIFY(!media.canonicalUrl().isValid()); QVERIFY(!media.canonicalUrl().isValid());
QCOMPARE(media.playlist(), playlist.data()); QCOMPARE(media.playlist(), playlist.data());