Use QPointer instead of QWeakPointer to track QObjects.

Change-Id: Ie3dbdbc99430e54e897b0683adc68ee52079a863
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

5 files changed, 9 insertions, 8 deletions

diff --git a/src/gallery/qgalleryabstractrequest_p.h b/src/gallery/qgalleryabstractrequest_p.h
index 5b50e20..2ecab41 100644
--- a/src/gallery/qgalleryabstractrequest_p.h
+++ b/src/gallery/qgalleryabstractrequest_p.h
@@ -59,6 +59,7 @@
 #include <qgalleryabstractresponse.h>
 
 #include <QtCore/qsharedpointer.h>
+#include <QtCore/qpointer.h>
 
 QT_ADDON_GALLERY_BEGIN_NAMESPACE
 
@@ -88,7 +89,7 @@ public:
     void _q_progressChanged(int current, int maximum);
 
     QGalleryAbstractRequest *q_ptr;
-    QWeakPointer<QAbstractGallery> gallery;
+    QPointer<QAbstractGallery> gallery;
     QScopedPointer<QGalleryAbstractResponse> response;
     QGalleryAbstractRequest::RequestType type;
     QGalleryAbstractRequest::State state;
diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.h b/src/imports/gallery/qdeclarativegalleryquerymodel.h
index ebd3470..2d944d1 100644
--- a/src/imports/gallery/qdeclarativegalleryquerymodel.h
+++ b/src/imports/gallery/qdeclarativegalleryquerymodel.h
@@ -193,7 +193,7 @@ protected:
     bool event(QEvent *event);
 
     QGalleryQueryRequest m_request;
-    QWeakPointer<QDeclarativeGalleryFilterBase> m_filter;
+    QPointer<QDeclarativeGalleryFilterBase> m_filter;
     QGalleryResultSet *m_resultSet;
     QVector<QPair<int, QString> > m_propertyNames;
     Status m_status;
diff --git a/tests/auto/qdeclarativedocumentgalleryitem/tst_qdeclarativedocumentgalleryitem.cpp b/tests/auto/qdeclarativedocumentgalleryitem/tst_qdeclarativedocumentgalleryitem.cpp
index 6dcda9a..0a05d36 100644
--- a/tests/auto/qdeclarativedocumentgalleryitem/tst_qdeclarativedocumentgalleryitem.cpp
+++ b/tests/auto/qdeclarativedocumentgalleryitem/tst_qdeclarativedocumentgalleryitem.cpp
@@ -213,8 +213,8 @@ private:
     QString m_errorString;
     QHash<QString, QVariant> m_metaData;
     QStringList m_blacklist;
-    QWeakPointer<QGalleryItemRequest> m_request;
-    QWeakPointer<QtGalleryTestResponse> m_response;
+    QPointer<QGalleryItemRequest> m_request;
+    QPointer<QtGalleryTestResponse> m_response;
 };
 
 class tst_QDeclarativeDocumentGalleryItem : public QObject
diff --git a/tests/auto/qdeclarativedocumentgallerymodel/tst_qdeclarativedocumentgallerymodel.cpp b/tests/auto/qdeclarativedocumentgallerymodel/tst_qdeclarativedocumentgallerymodel.cpp
index 78de47b..e99bc3d 100644
--- a/tests/auto/qdeclarativedocumentgallerymodel/tst_qdeclarativedocumentgallerymodel.cpp
+++ b/tests/auto/qdeclarativedocumentgallerymodel/tst_qdeclarativedocumentgallerymodel.cpp
@@ -242,8 +242,8 @@ private:
     QGalleryAbstractRequest::State m_state;
     int m_error;
     QString m_errorString;
-    QWeakPointer<QGalleryQueryRequest> m_request;
-    QWeakPointer<QtTestResultSet> m_response;
+    QPointer<QGalleryQueryRequest> m_request;
+    QPointer<QtTestResultSet> m_response;
 };
 
 class tst_QDeclarativeDocumentGalleryModel : public QObject
diff --git a/tests/auto/qdeclarativedocumentgallerytype/tst_qdeclarativedocumentgallerytype.cpp b/tests/auto/qdeclarativedocumentgallerytype/tst_qdeclarativedocumentgallerytype.cpp
index 7d9d363..66ae1c1 100644
--- a/tests/auto/qdeclarativedocumentgallerytype/tst_qdeclarativedocumentgallerytype.cpp
+++ b/tests/auto/qdeclarativedocumentgallerytype/tst_qdeclarativedocumentgallerytype.cpp
@@ -209,8 +209,8 @@ private:
     QString m_errorString;
     QHash<QString, QVariant> m_metaData;
     QStringList m_blacklist;
-    QWeakPointer<QGalleryTypeRequest> m_request;
-    QWeakPointer<QtGalleryTestResponse> m_response;
+    QPointer<QGalleryTypeRequest> m_request;
+    QPointer<QtGalleryTestResponse> m_response;
 };
 
 class tst_QDeclarativeDocumentGalleryType : public QObject