diff options
author | Michal Klocek <michal.klocek@digia.com> | 2015-01-07 16:55:53 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-13 16:06:33 +0100 |
commit | ecf7772c46db2e5b011cdbb531bc6fd69ba8c76d (patch) | |
tree | d208eaece5c7097cca6cd4a1da33d6640ae86bd5 /tests/auto/geotestplugin | |
parent | bcdc5cc06bd73b060157936f0b6fa40194cadff8 (diff) | |
download | qtlocation-ecf7772c46db2e5b011cdbb531bc6fd69ba8c76d.tar.gz |
Adds mapping manager error handling to qml
When map is created, plugins can report errors in case of
missing required parameters. Expose error message to qml.
Change-Id: I014e55cd4aad5ba15ffd0a15bc1f414c21feacc8
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests/auto/geotestplugin')
-rw-r--r-- | tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp index 185bf44f..d3e45e41 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp @@ -39,6 +39,24 @@ #include <QtPlugin> +namespace +{ + template<class EngineType> + EngineType * createEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) + { + const QString failError = parameters.value(QStringLiteral("error")).toString(); + const QString failErrorString = parameters.value(QStringLiteral("errorString")).toString(); + + if (!failError.isEmpty()) { + *error = QGeoServiceProvider::Error(failError.toInt()); + *errorString = failErrorString; + return 0; + } else { + return new EngineType(parameters, error, errorString); + } + } +} + QGeoServiceProviderFactoryTest::QGeoServiceProviderFactoryTest() { } @@ -51,7 +69,7 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactoryTest::createRoutingManagerEn const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { - return new QGeoRoutingManagerEngineTest(parameters, error, errorString); + return createEngine<QGeoRoutingManagerEngineTest>(parameters, error, errorString); } @@ -59,7 +77,7 @@ QGeoCodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerE const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { - return new QGeoCodingManagerEngineTest(parameters, error, errorString); + return createEngine<QGeoCodingManagerEngineTest>(parameters, error, errorString); } @@ -67,7 +85,7 @@ QGeoMappingManagerEngine* QGeoServiceProviderFactoryTest::createMappingManagerEn const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { - return new QGeoTiledMappingManagerEngineTest(parameters, error, errorString); + return createEngine<QGeoTiledMappingManagerEngineTest>(parameters, error, errorString); } QPlaceManagerEngine* QGeoServiceProviderFactoryTest::createPlaceManagerEngine( |