diff options
Diffstat (limited to 'src/plugins/geoservices/osm')
6 files changed, 39 insertions, 39 deletions
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, |