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 /tests/auto | |
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 'tests/auto')
5 files changed, 17 insertions, 3 deletions
diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp index d6fe0c0c..36b1688b 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp @@ -59,6 +59,11 @@ QString QGeoServiceProviderFactoryTest::providerName() const return "qmlgeo.test.plugin"; } +QStringList QGeoServiceProviderFactoryTest::keys() const +{ + return QStringList() << QLatin1String("qmlgeo.test.plugin"); +} + int QGeoServiceProviderFactoryTest::providerVersion() const { return 3; diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index a8b567a6..b2b5f357 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -50,13 +50,14 @@ QT_USE_NAMESPACE class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); QString providerName() const; int providerVersion() const; + QStringList keys() const; QGeoMappingManagerEngine* createMappingManagerEngine ( diff --git a/tests/auto/positionplugin/plugin.cpp b/tests/auto/positionplugin/plugin.cpp index abd51e02..5307c141 100644 --- a/tests/auto/positionplugin/plugin.cpp +++ b/tests/auto/positionplugin/plugin.cpp @@ -176,12 +176,14 @@ void DummySource::doTimeout() class QGeoPositionInfoSourceFactoryTest : public QObject, public QGeoPositionInfoSourceFactory { Q_OBJECT - Q_INTERFACES(QGeoPositionInfoSourceFactory) + Q_INTERFACES(QGeoPositionInfoSourceFactory:QFactoryInterface) public: QString sourceName() const; int sourceVersion() const; + QStringList keys() const { return QStringList() << QLatin1String("testposition.source"); } + QGeoPositionInfoSource *positionInfoSource(QObject *parent); QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); }; diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp index cf837d10..bd69f373 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp @@ -57,6 +57,11 @@ QString QGeoServiceProviderFactoryTest::providerName() const return "static.geocode.test.plugin"; } +QStringList QGeoServiceProviderFactoryTest::keys() const +{ + return QStringList() << QLatin1String("static.geocode.test.plugin"); +} + int QGeoServiceProviderFactoryTest::providerVersion() const { return 3; diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h index 281942da..9a0acf82 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -50,13 +50,14 @@ QT_USE_NAMESPACE class QGeoServiceProviderFactoryTest: public QObject, public QGeoServiceProviderFactory { Q_OBJECT - Q_INTERFACES(QGeoServiceProviderFactory) + Q_INTERFACES(QGeoServiceProviderFactory:QFactoryInterface) public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); QString providerName() const; int providerVersion() const; + QStringList keys() const; QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; |