diff options
| author | alex <alex.blasche@nokia.com> | 2011-11-10 13:35:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 06:45:49 +0100 |
| commit | 18e0a28cb0bd9bfc407d9203b72fea0612135109 (patch) | |
| tree | d063ef42125fdded21b740054a8fadfe519f1bee /src/plugins/geoservices | |
| parent | bc10fb18aed2356d02cf8dd95a45d38eb7ae2858 (diff) | |
| download | qtlocation-18e0a28cb0bd9bfc407d9203b72fea0612135109.tar.gz | |
Remove qmobilitypluginsearch.h
We use QFactoryLoader from now on. This doubles up the keys() and
providerName() methods on the two factory interfaces but this will be
fixed by a separate change.
Change-Id: I5f2cee40f44e0760d40f87ebd53d2ca15cfc2ec5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins/geoservices')
4 files changed, 15 insertions, 2 deletions
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 27f3de0d..4daba791 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -67,6 +67,11 @@ QString QGeoServiceProviderFactoryNokia::providerName() const return "nokia"; } +QStringList QGeoServiceProviderFactoryNokia::keys() const +{ + return QStringList() << QLatin1String("nokia"); +} + int QGeoServiceProviderFactoryNokia::providerVersion() const { return 1; diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index 2dddbe13..ac4e83be 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -57,13 +57,14 @@ QT_BEGIN_NAMESPACE class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryNokia(); ~QGeoServiceProviderFactoryNokia(); QString providerName() const; int providerVersion() const; + QStringList keys() const; QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp index 6bad46c1..5bb88ad4 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp +++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp @@ -57,6 +57,11 @@ QString QGeoServiceProviderFactoryJsonDb::providerName() const return QLatin1String("nokia_places_jsondb"); } +QStringList QGeoServiceProviderFactoryJsonDb::keys() const +{ + return QStringList() << QLatin1String("nokia_places_jsondb"); +} + int QGeoServiceProviderFactoryJsonDb::providerVersion() const { return 1; diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h index 4d1fc945..2408f3be 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h +++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h @@ -50,7 +50,7 @@ QT_USE_NAMESPACE class QGeoServiceProviderFactoryJsonDb : public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryJsonDb(); ~QGeoServiceProviderFactoryJsonDb(); @@ -58,6 +58,8 @@ public: QString providerName() const; int providerVersion() const; + QStringList keys() const; + QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; |