diff options
| author | Alex Wilson <alex.wilson@nokia.com> | 2012-02-28 13:05:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-05 04:22:24 +0100 |
| commit | 0287bfee05840511c12100f06f9142e3e2b8f7d5 (patch) | |
| tree | f5386e27a4b012877d37ab0b99dfc1d5a08705c5 /src/location/maps/qgeoserviceproviderfactory.h | |
| parent | c1d56bdae90f79d466769aa7a357d78a4f2ca6c7 (diff) | |
| download | qtlocation-0287bfee05840511c12100f06f9142e3e2b8f7d5.tar.gz | |
New plugin API changes, centralized geoservice feature detection
This change adapts geoservice plugins to use the new Qt5 plugin API,
performing boolean feature detection all through the JSON blobs
rather than methods on factories or managers.
As a result of this centralisation, it was also necessary to rework
the QML API for the Plugin element a little. Some additional changes
were made to the declarative places plugin to prevent it crashing
due to plugins becoming available later than they did previously.
Task-number: QTBUG-24331
Change-Id: I26149987344b67091480449103ab1712c869b2a5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/location/maps/qgeoserviceproviderfactory.h')
| -rw-r--r-- | src/location/maps/qgeoserviceproviderfactory.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 362349e2..7e93d0b4 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -47,22 +47,16 @@ #include <QtPlugin> #include <QMap> #include <QString> -#include <QFactoryInterface> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE - - -class Q_LOCATION_EXPORT QGeoServiceProviderFactory : public QFactoryInterface +class Q_LOCATION_EXPORT QGeoServiceProviderFactory { public: virtual ~QGeoServiceProviderFactory() {} - virtual QString providerName() const = 0; - virtual int providerVersion() const = 0; - virtual QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; @@ -77,8 +71,8 @@ public: QString *errorString) const; }; -#define QT_GEOSERVICE_BACKEND_INTERFACE "com.nokia.qt.geoservice.serviceproviderfactory/1.0" -Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, QT_GEOSERVICE_BACKEND_INTERFACE); +Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, + "org.qt-project.qt.geoservice.serviceproviderfactory/5.0"); QT_END_NAMESPACE |