From f76300ede0472e2fdbb80322295d306b7662b71d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 18 Aug 2016 16:57:26 +0200
Subject: [PATCH] mapbox: Deduplicate error message
Introduce helper function for translated message.
Change-Id: I3249e148cb3472a2f7418771a70860b0673a8dc9
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
.../mapbox/qgeoserviceproviderpluginmapbox.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
index 4bc8d7b95..835f9d04d 100644
--- a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.cpp
@@ -52,6 +52,12 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapbox::createGeocodingManage
return 0;
}
+static inline QString msgAccessTokenParameter()
+{
+ return QGeoServiceProviderFactoryMapbox::tr("Mapbox plugin requires a 'mapbox.access_token' parameter.\n"
+ "Please visit https://www.mapbox.com");
+}
+
QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapbox::createMappingManagerEngine(
const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const
{
@@ -61,8 +67,7 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapbox::createMappingManager
return new QGeoTiledMappingManagerEngineMapbox(parameters, error, errorString);
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
- *errorString = tr("Mapbox plugin requires a 'mapbox.access_token' parameter.\n"
- "Please visit https://www.mapbox.com");
+ *errorString = msgAccessTokenParameter();
return 0;
}
}
@@ -76,8 +81,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryMapbox::createRoutingManager
return new QGeoRoutingManagerEngineMapbox(parameters, error, errorString);
} else {
*error = QGeoServiceProvider::MissingRequiredParameterError;
- *errorString = tr("Mapbox plugin requires 'mapbox.access_token' parameters.\n"
- "Please visit https://www.mapbox.com");
+ *errorString = msgAccessTokenParameter();
return 0;
}
}
--
GitLab