summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2016-08-25 10:39:17 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2016-12-01 13:45:36 +0000
commit423d96a446cdacfe77722bd0cd3375022b2931f5 (patch)
tree68bae8e27794c22321db6915d10c4242160f970b /src/imports
parent720d637494f3cc6493a2b5f2a3405d9fb4ed464c (diff)
downloadqtlocation-423d96a446cdacfe77722bd0cd3375022b2931f5.tar.gz
Removing m_serviceProvider from QDeclarativeGeoMap
m_serviceProvider appears not to be used anymore. Removing it from the class members. Change-Id: I05de7dee5549b87efbf375fce4ed8a4830284164 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/qdeclarativegeomap.cpp9
-rw-r--r--src/imports/location/qdeclarativegeomap_p.h1
2 files changed, 4 insertions, 6 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 6d831f24..fe8675c0 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -158,7 +158,6 @@ static const qreal EARTH_MEAN_RADIUS = 6371007.2;
QDeclarativeGeoMap::QDeclarativeGeoMap(QQuickItem *parent)
: QQuickItem(parent),
m_plugin(0),
- m_serviceProvider(0),
m_mappingManager(0),
m_activeMapType(0),
m_gestureArea(new QQuickGeoMapGestureArea(this)),
@@ -331,11 +330,11 @@ void QDeclarativeGeoMap::initialize()
*/
void QDeclarativeGeoMap::pluginReady()
{
- m_serviceProvider = m_plugin->sharedGeoServiceProvider();
- m_mappingManager = m_serviceProvider->mappingManager();
+ QGeoServiceProvider *provider = m_plugin->sharedGeoServiceProvider();
+ m_mappingManager = provider->mappingManager();
- if (m_serviceProvider->error() != QGeoServiceProvider::NoError) {
- setError(m_serviceProvider->error(), m_serviceProvider->errorString());
+ if (provider->error() != QGeoServiceProvider::NoError) {
+ setError(provider->error(), provider->errorString());
return;
}
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h
index 262314ed..468046d1 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/imports/location/qdeclarativegeomap_p.h
@@ -183,7 +183,6 @@ private:
private:
QDeclarativeGeoServiceProvider *m_plugin;
- QGeoServiceProvider *m_serviceProvider;
QGeoMappingManager *m_mappingManager;
QDeclarativeGeoMapType *m_activeMapType;
QList<QDeclarativeGeoMapType *> m_supportedMapTypes;