diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-06-06 11:32:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 06:56:51 +0200 |
| commit | 7585b1853431838b55930cbe3c8d39ce5e4416ea (patch) | |
| tree | a77799090af3c045e5beaa30409f4b42c87d2464 /src/plugins/geoservices/nokia | |
| parent | 5e8bdd51c889403db99d0dbad908b6e862252a70 (diff) | |
| download | qtlocation-7585b1853431838b55930cbe3c8d39ce5e4416ea.tar.gz | |
Use QPointer instead of QWeakPointer.
The latter is to be deprecated.
Change-Id: Ibba791706fd1c5f0057d95c01bf7414df0c44f83
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeouriprovider.h | 1 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.h b/src/plugins/geoservices/nokia/qgeouriprovider.h index b77927cd..453b45bc 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.h +++ b/src/plugins/geoservices/nokia/qgeouriprovider.h @@ -49,6 +49,7 @@ #define QGEO_MOBILE_COUNTRY_TRACKER_H #include <QObject> +#include <QPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h index 64c71ff6..ca375ebe 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h @@ -49,7 +49,7 @@ #ifndef QPLACEMANAGERENGINE_NOKIAV2_H #define QPLACEMANAGERENGINE_NOKIAV2_H -#include <QtCore/QWeakPointer> +#include <QtCore/QPointer> #include <QtNetwork/QNetworkReply> #include <QtLocation/QPlaceManagerEngine> #include <QtLocation/QGeoServiceProvider> @@ -132,7 +132,7 @@ private: QPlaceCategoryTree m_tempTree; QHash<QString, QString> m_restIdToIconHash; - QWeakPointer<QPlaceCategoriesReplyImpl> m_categoryReply; + QPointer<QPlaceCategoriesReplyImpl> m_categoryReply; QHash<QString, QNetworkReply *> m_categoryRequests; QString m_appId; |