diff options
Diffstat (limited to 'src/plugins/geoservices')
14 files changed, 99 insertions, 99 deletions
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index 41f1c73e..7bd20599 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -57,7 +57,7 @@ #include <QtCore/QJsonArray> #include <QtLocation/QPlaceIcon> #include <QtLocation/QPlaceResult> -#include <QtLocation/QProposedSearchResult> +#include <QtLocation/QPlaceProposedSearchResult> #include <QtCore/QDebug> @@ -210,9 +210,9 @@ QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) co return result; } -QProposedSearchResult QPlaceSearchReplyImpl::parseSearchResult(const QJsonObject &item) const +QPlaceProposedSearchResult QPlaceSearchReplyImpl::parseSearchResult(const QJsonObject &item) const { - QProposedSearchResult result; + QPlaceProposedSearchResult result; result.setTitle(item.value(QLatin1String("title")).toString()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h index a7871653..a888ef31 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QPlaceManagerEngineNokiaV2; class QPlaceResult; -class QProposedSearchResult; +class QPlaceProposedSearchResult; class QPlaceSearchReplyImpl : public QPlaceSearchReply { @@ -76,7 +76,7 @@ private slots: private: QPlaceResult parsePlaceResult(const QJsonObject &item) const; - QProposedSearchResult parseSearchResult(const QJsonObject &item) const; + QPlaceProposedSearchResult parseSearchResult(const QJsonObject &item) const; QNetworkReply *m_reply; QPlaceManagerEngineNokiaV2 *m_engine; diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index 4995358b..cb76fbca 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE -QGeocodeReplyNokia::QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offset, +QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, QObject *parent) - : QGeocodeReply(parent), + : QGeoCodeReply(parent), m_reply(reply) { connect(m_reply, @@ -73,12 +73,12 @@ QGeocodeReplyNokia::QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offs setViewport(viewport); } -QGeocodeReplyNokia::~QGeocodeReplyNokia() +QGeoCodeReplyNokia::~QGeoCodeReplyNokia() { //TODO: possible mem leak -> m_reply->deleteLater() ? } -void QGeocodeReplyNokia::abort() +void QGeoCodeReplyNokia::abort() { if (!m_reply) return; @@ -89,7 +89,7 @@ void QGeocodeReplyNokia::abort() m_reply = 0; } -void QGeocodeReplyNokia::networkFinished() +void QGeoCodeReplyNokia::networkFinished() { if (!m_reply) return; @@ -115,21 +115,21 @@ void QGeocodeReplyNokia::networkFinished() setLocations(locations); setFinished(true); } else { - setError(QGeocodeReply::ParseError, parser.errorString()); + setError(QGeoCodeReply::ParseError, parser.errorString()); } m_reply->deleteLater(); m_reply = 0; } -void QGeocodeReplyNokia::networkError(QNetworkReply::NetworkError error) +void QGeoCodeReplyNokia::networkError(QNetworkReply::NetworkError error) { Q_UNUSED(error) if (!m_reply) return; - setError(QGeocodeReply::CommunicationError, m_reply->errorString()); + setError(QGeoCodeReply::CommunicationError, m_reply->errorString()); m_reply->deleteLater(); m_reply = 0; diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h index 38c44a3e..6b72cd40 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h @@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE -class QGeocodeReplyNokia : public QGeocodeReply +class QGeoCodeReplyNokia : public QGeoCodeReply { Q_OBJECT public: - QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, QObject *parent = 0); - ~QGeocodeReplyNokia(); + QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset, const QGeoShape &viewport, QObject *parent = 0); + ~QGeoCodeReplyNokia(); void abort(); diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp index 833e5765..d00f4fb9 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp @@ -61,12 +61,12 @@ QT_BEGIN_NAMESPACE -QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia( +QGeoCodingManagerEngineNokia::QGeoCodingManagerEngineNokia( QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) - : QGeocodingManagerEngine(parameters) + : QGeoCodingManagerEngine(parameters) , m_networkManager(networkManager) , m_uriProvider(new QGeoUriProvider(this, parameters, "geocoding.host", GEOCODING_HOST, GEOCODING_HOST_CN)) { @@ -88,9 +88,9 @@ QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia( *errorString = ""; } -QGeocodingManagerEngineNokia::~QGeocodingManagerEngineNokia() {} +QGeoCodingManagerEngineNokia::~QGeoCodingManagerEngineNokia() {} -QString QGeocodingManagerEngineNokia::getAuthenticationString() const +QString QGeoCodingManagerEngineNokia::getAuthenticationString() const { QString authenticationString; @@ -106,8 +106,8 @@ QString QGeocodingManagerEngineNokia::getAuthenticationString() const } -QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, - const QGeoShape &bounds) +QGeoCodeReply *QGeoCodingManagerEngineNokia::geocode(const QGeoAddress &address, + const QGeoShape &bounds) { QString requestString = "http://"; requestString += m_uriProvider->getCurrentHost(); @@ -175,8 +175,8 @@ QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, return geocode(requestString, bounds); } -QGeocodeReply *QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate, - const QGeoShape &bounds) +QGeoCodeReply *QGeoCodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate, + const QGeoShape &bounds) { QString requestString = "http://"; requestString += m_uriProvider->getCurrentHost(); @@ -195,10 +195,10 @@ QGeocodeReply *QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate return geocode(requestString, bounds); } -QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QString &address, - int limit, - int offset, - const QGeoShape &bounds) +QGeoCodeReply *QGeoCodingManagerEngineNokia::geocode(const QString &address, + int limit, + int offset, + const QGeoShape &bounds) { QString requestString = "http://"; requestString += m_uriProvider->getCurrentHost(); @@ -225,13 +225,13 @@ QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QString &address, return geocode(requestString, bounds, limit, offset); } -QGeocodeReply *QGeocodingManagerEngineNokia::geocode(QString requestString, - const QGeoShape &bounds, - int limit, - int offset) +QGeoCodeReply *QGeoCodingManagerEngineNokia::geocode(QString requestString, + const QGeoShape &bounds, + int limit, + int offset) { QNetworkReply *networkReply = m_networkManager->get(QNetworkRequest(QUrl(requestString))); - QGeocodeReplyNokia *reply = new QGeocodeReplyNokia(networkReply, limit, offset, bounds, this); + QGeoCodeReplyNokia *reply = new QGeoCodeReplyNokia(networkReply, limit, offset, bounds, this); connect(reply, SIGNAL(finished()), @@ -239,14 +239,14 @@ QGeocodeReply *QGeocodingManagerEngineNokia::geocode(QString requestString, SLOT(placesFinished())); connect(reply, - SIGNAL(error(QGeocodeReply::Error, QString)), + SIGNAL(error(QGeoCodeReply::Error, QString)), this, - SLOT(placesError(QGeocodeReply::Error, QString))); + SLOT(placesError(QGeoCodeReply::Error, QString))); return reply; } -QString QGeocodingManagerEngineNokia::trimDouble(double degree, int decimalDigits) +QString QGeoCodingManagerEngineNokia::trimDouble(double degree, int decimalDigits) { QString sDegree = QString::number(degree, 'g', decimalDigits); @@ -258,14 +258,14 @@ QString QGeocodingManagerEngineNokia::trimDouble(double degree, int decimalDigit return QString::number(degree, 'g', decimalDigits + index); } -void QGeocodingManagerEngineNokia::placesFinished() +void QGeoCodingManagerEngineNokia::placesFinished() { - QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); + QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (!reply) return; - if (receivers(SIGNAL(finished(QGeocodeReply*))) == 0) { + if (receivers(SIGNAL(finished(QGeoCodeReply*))) == 0) { reply->deleteLater(); return; } @@ -273,14 +273,14 @@ void QGeocodingManagerEngineNokia::placesFinished() emit finished(reply); } -void QGeocodingManagerEngineNokia::placesError(QGeocodeReply::Error error, const QString &errorString) +void QGeoCodingManagerEngineNokia::placesError(QGeoCodeReply::Error error, const QString &errorString) { - QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); + QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (!reply) return; - if (receivers(SIGNAL(error(QGeocodeReply *, QGeocodeReply::Error, QString))) == 0) { + if (receivers(SIGNAL(error(QGeoCodeReply *, QGeoCodeReply::Error, QString))) == 0) { reply->deleteLater(); return; } @@ -288,7 +288,7 @@ void QGeocodingManagerEngineNokia::placesError(QGeocodeReply::Error error, const emit this->error(reply, error, errorString); } -QString QGeocodingManagerEngineNokia::languageToMarc(QLocale::Language language) +QString QGeoCodingManagerEngineNokia::languageToMarc(QLocale::Language language) { uint offset = 3 * (uint(language)); if (language == QLocale::C || offset + 3 > sizeof(marc_language_code_list)) diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h index 25074a93..6b9bf1e2 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h @@ -61,33 +61,33 @@ QT_BEGIN_NAMESPACE class QGeoNetworkAccessManager; class QGeoUriProvider; -class QGeocodingManagerEngineNokia : public QGeocodingManagerEngine +class QGeoCodingManagerEngineNokia : public QGeoCodingManagerEngine { Q_OBJECT public: - QGeocodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, + QGeoCodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString); - ~QGeocodingManagerEngineNokia(); + ~QGeoCodingManagerEngineNokia(); - QGeocodeReply *geocode(const QGeoAddress &address, + QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds); - QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate, + QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate, const QGeoShape &bounds); - QGeocodeReply *geocode(const QString &searchString, + QGeoCodeReply *geocode(const QString &searchString, int limit, int offset, const QGeoShape &bounds); private Q_SLOTS: void placesFinished(); - void placesError(QGeocodeReply::Error error, const QString &errorString); + void placesError(QGeoCodeReply::Error error, const QString &errorString); private: static QString trimDouble(double degree, int decimalDigits = 10); - QGeocodeReply *geocode(QString requestString, const QGeoShape &bounds, int limit = -1, int offset = 0); + QGeoCodeReply *geocode(QString requestString, const QGeoShape &bounds, int limit = -1, int offset = 0); QString languageToMarc(QLocale::Language language); QString getAuthenticationString() const; diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 7e8e7a6d..6d8967d5 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -113,12 +113,12 @@ namespace } } -QGeocodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine( +QGeoCodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { - return CreateInstanceOf<QGeocodingManagerEngineNokia>(parameters, error, errorString); + return CreateInstanceOf<QGeoCodingManagerEngineNokia>(parameters, error, errorString); } QGeoMappingManagerEngine *QGeoServiceProviderFactoryNokia::createMappingManagerEngine( diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index 503f9f96..dfe75968 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -64,15 +64,15 @@ class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProvid FILE "nokia_plugin.json") public: - QGeocodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, - QGeoServiceProvider::Error *error, - QString *errorString) const; + QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, + QGeoServiceProvider::Error *error, + QString *errorString) const; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, - QGeoServiceProvider::Error *error, - QString *errorString) const; + QGeoServiceProvider::Error *error, + QString *errorString) const; QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, - QGeoServiceProvider::Error *error, - QString *errorString) const; + QGeoServiceProvider::Error *error, + QString *errorString) const; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index 39b5339b..afa48028 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp @@ -51,8 +51,8 @@ QT_BEGIN_NAMESPACE -QGeocodeReplyOsm::QGeocodeReplyOsm(QNetworkReply *reply, QObject *parent) -: QGeocodeReply(parent), m_reply(reply) +QGeoCodeReplyOsm::QGeoCodeReplyOsm(QNetworkReply *reply, QObject *parent) +: QGeoCodeReply(parent), m_reply(reply) { connect(m_reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)), @@ -62,13 +62,13 @@ QGeocodeReplyOsm::QGeocodeReplyOsm(QNetworkReply *reply, QObject *parent) setOffset(0); } -QGeocodeReplyOsm::~QGeocodeReplyOsm() +QGeoCodeReplyOsm::~QGeoCodeReplyOsm() { if (m_reply) m_reply->deleteLater(); } -void QGeocodeReplyOsm::abort() +void QGeoCodeReplyOsm::abort() { if (!m_reply) return; @@ -79,7 +79,7 @@ void QGeocodeReplyOsm::abort() m_reply = 0; } -void QGeocodeReplyOsm::networkReplyFinished() +void QGeoCodeReplyOsm::networkReplyFinished() { if (!m_reply) return; @@ -173,14 +173,14 @@ void QGeocodeReplyOsm::networkReplyFinished() m_reply = 0; } -void QGeocodeReplyOsm::networkReplyError(QNetworkReply::NetworkError error) +void QGeoCodeReplyOsm::networkReplyError(QNetworkReply::NetworkError error) { Q_UNUSED(error) if (!m_reply) return; - setError(QGeocodeReply::CommunicationError, m_reply->errorString()); + setError(QGeoCodeReply::CommunicationError, m_reply->errorString()); m_reply->deleteLater(); m_reply = 0; diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.h b/src/plugins/geoservices/osm/qgeocodereplyosm.h index 669ee40d..d089838b 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.h +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.h @@ -43,17 +43,17 @@ #define QGEOCODEREPLYOSM_H #include <QtNetwork/QNetworkReply> -#include <QtLocation/QGeocodeReply> +#include <QtLocation/QGeoCodeReply> QT_BEGIN_NAMESPACE -class QGeocodeReplyOsm : public QGeocodeReply +class QGeoCodeReplyOsm : public QGeoCodeReply { Q_OBJECT public: - explicit QGeocodeReplyOsm(QNetworkReply *reply, QObject *parent = 0); - ~QGeocodeReplyOsm(); + explicit QGeoCodeReplyOsm(QNetworkReply *reply, QObject *parent = 0); + ~QGeoCodeReplyOsm(); void abort(); diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp index 05bc97dd..08288552 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp @@ -72,10 +72,10 @@ static QString boundingBoxToLtrb(const QGeoRectangle &rect) QString::number(rect.bottomRight().latitude()); } -QGeocodingManagerEngineOsm::QGeocodingManagerEngineOsm(const QVariantMap ¶meters, +QGeoCodingManagerEngineOsm::QGeoCodingManagerEngineOsm(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) -: QGeocodingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this)) +: QGeoCodingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this)) { if (parameters.contains(QStringLiteral("useragent"))) m_userAgent = parameters.value(QStringLiteral("useragent")).toString().toLatin1(); @@ -86,16 +86,16 @@ QGeocodingManagerEngineOsm::QGeocodingManagerEngineOsm(const QVariantMap ¶me errorString->clear(); } -QGeocodingManagerEngineOsm::~QGeocodingManagerEngineOsm() +QGeoCodingManagerEngineOsm::~QGeoCodingManagerEngineOsm() { } -QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QGeoAddress &address, const QGeoShape &bounds) +QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QGeoAddress &address, const QGeoShape &bounds) { return geocode(addressToQuery(address), -1, -1, bounds); } -QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds) +QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds) { Q_UNUSED(offset) @@ -122,16 +122,16 @@ QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QString &address, int l QNetworkReply *reply = m_networkManager->get(request); - QGeocodeReplyOsm *geocodeReply = new QGeocodeReplyOsm(reply, this); + QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, this); connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeocodeReply::Error,QString)), - this, SLOT(replyError(QGeocodeReply::Error,QString))); + connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), + this, SLOT(replyError(QGeoCodeReply::Error,QString))); return geocodeReply; } -QGeocodeReply *QGeocodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &coordinate, +QGeoCodeReply *QGeoCodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoShape &bounds) { Q_UNUSED(bounds) @@ -153,25 +153,25 @@ QGeocodeReply *QGeocodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate & QNetworkReply *reply = m_networkManager->get(request); - QGeocodeReplyOsm *geocodeReply = new QGeocodeReplyOsm(reply, this); + QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, this); connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished())); - connect(geocodeReply, SIGNAL(error(QGeocodeReply::Error,QString)), - this, SLOT(replyError(QGeocodeReply::Error,QString))); + connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)), + this, SLOT(replyError(QGeoCodeReply::Error,QString))); return geocodeReply; } -void QGeocodingManagerEngineOsm::replyFinished() +void QGeoCodingManagerEngineOsm::replyFinished() { - QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); + QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (reply) emit finished(reply); } -void QGeocodingManagerEngineOsm::replyError(QGeocodeReply::Error errorCode, const QString &errorString) +void QGeoCodingManagerEngineOsm::replyError(QGeoCodeReply::Error errorCode, const QString &errorString) { - QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender()); + QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender()); if (reply) emit error(reply, errorCode, errorString); } diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h index 40b4aeae..7961cc2b 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h @@ -43,31 +43,31 @@ #define QGEOCODINGMANAGERENGINEOSM_H #include <QtLocation/QGeoServiceProvider> -#include <QtLocation/QGeocodingManagerEngine> -#include <QtLocation/QGeocodeReply> +#include <QtLocation/QGeoCodingManagerEngine> +#include <QtLocation/QGeoCodeReply> QT_BEGIN_NAMESPACE class QNetworkAccessManager; -class QGeocodingManagerEngineOsm : public QGeocodingManagerEngine +class QGeoCodingManagerEngineOsm : public QGeoCodingManagerEngine { Q_OBJECT public: - QGeocodingManagerEngineOsm(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, + QGeoCodingManagerEngineOsm(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); - ~QGeocodingManagerEngineOsm(); + ~QGeoCodingManagerEngineOsm(); - QGeocodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE; - QGeocodeReply *geocode(const QString &address, int limit, int offset, + QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE; + QGeoCodeReply *geocode(const QString &address, int limit, int offset, const QGeoShape &bounds) Q_DECL_OVERRIDE; - QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate, + QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate, const QGeoShape &bounds) Q_DECL_OVERRIDE; private Q_SLOTS: void replyFinished(); - void replyError(QGeocodeReply::Error errorCode, const QString &errorString); + void replyError(QGeoCodeReply::Error errorCode, const QString &errorString); private: QNetworkAccessManager *m_networkManager; diff --git a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.cpp b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.cpp index 184f38f1..b8e79684 100644 --- a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.cpp +++ b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.cpp @@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE -QGeocodingManagerEngine *QGeoServiceProviderFactoryOsm::createGeocodingManagerEngine( +QGeoCodingManagerEngine *QGeoServiceProviderFactoryOsm::createGeocodingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { - return new QGeocodingManagerEngineOsm(parameters, error, errorString); + return new QGeoCodingManagerEngineOsm(parameters, error, errorString); } QGeoMappingManagerEngine *QGeoServiceProviderFactoryOsm::createMappingManagerEngine( diff --git a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h index 353ae561..f95b451d 100644 --- a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h +++ b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h @@ -55,7 +55,7 @@ class QGeoServiceProviderFactoryOsm: public QObject, public QGeoServiceProviderF FILE "osm_plugin.json") public: - QGeocodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, + QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, |