diff options
| author | Vladimir Bezkorovainyi <vladimir.bezkorovainyi@nokia.com> | 2012-05-30 18:13:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 17:57:34 +0200 |
| commit | 1c356029e308283c4c305dda855a094cf16e19ef (patch) | |
| tree | 028cc1e9aef5f0dcb0a2966b065b854428df44b1 /src/plugins/geoservices/nokia/placesv2 | |
| parent | f72688998639d168444eec32f0b5ec04320369bb (diff) | |
| download | qtlocation-1c356029e308283c4c305dda855a094cf16e19ef.tar.gz | |
Move hard-codded messages into separate file and declare constants for them.
Change-Id: I35a2a5ca9d4c4dc20e291051666bb88f4264ab33
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia/placesv2')
5 files changed, 15 insertions, 5 deletions
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp index 2266ae56..1617d438 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp @@ -49,7 +49,9 @@ #include "jsonparserhelpers.h" #include "qplacecontentreplyimpl.h" #include "../qplacemanagerengine_nokiav2.h" +#include "../qgeoerror_messages.h" +#include <QCoreApplication> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> @@ -94,7 +96,7 @@ void QPlaceContentReplyImpl::replyFinished() { QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); if (!document.isObject()) { - setError(ParseError, tr("Error parsing response.")); + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); return; } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index 0f76b891..3fe94aee 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -49,7 +49,9 @@ #include "qplacedetailsreplyimpl.h" #include "jsonparserhelpers.h" #include "../qplacemanagerengine_nokiav2.h" +#include "../qgeoerror_messages.h" +#include <QCoreApplication> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> @@ -133,7 +135,7 @@ void QPlaceDetailsReplyImpl::replyFinished() { QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); if (!document.isObject()) { - setError(ParseError, tr("Error parsing response.")); + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); return; } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp index 3f24f937..cfbb6da9 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp @@ -49,7 +49,9 @@ #include "qplacerecommendationreplyimpl.h" #include "jsonparserhelpers.h" #include "../qplacemanagerengine_nokiav2.h" +#include "../qgeoerror_messages.h" +#include <QCoreApplication> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> @@ -94,7 +96,7 @@ void QPlaceRecommendationReplyImpl::replyFinished() { QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); if (!document.isObject()) { - setError(ParseError, tr("Error parsing response.")); + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); emit error(error(), errorString()); return; } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index 3c29cdc1..b4d6c2e5 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -49,7 +49,9 @@ #include "qplacesearchreplyimpl.h" #include "jsonparserhelpers.h" #include "../qplacemanagerengine_nokiav2.h" +#include "../qgeoerror_messages.h" +#include <QCoreApplication> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> @@ -95,7 +97,7 @@ void QPlaceSearchReplyImpl::replyFinished() { QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); if (!document.isObject()) { - setError(ParseError, tr("Error parsing response.")); + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); emit error(error(), errorString()); return; } diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp index ce4cd3b2..37820e3a 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchsuggestionreplyimpl.cpp @@ -47,7 +47,9 @@ ****************************************************************************/ #include "qplacesearchsuggestionreplyimpl.h" +#include "../qgeoerror_messages.h" +#include <QCoreApplication> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> @@ -90,7 +92,7 @@ void QPlaceSearchSuggestionReplyImpl::replyFinished() { QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); if (!document.isObject()) { - setError(ParseError, tr("Error parsing response.")); + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); emit error(error(), errorString()); return; } |