diff options
Diffstat (limited to 'src')
14 files changed, 75 insertions, 74 deletions
diff --git a/src/plugins/geoservices/nokia/placesv2/placesv2.pri b/src/plugins/geoservices/nokia/placesv2/placesv2.pri index 73f3fcbd..18c9fe37 100644 --- a/src/plugins/geoservices/nokia/placesv2/placesv2.pri +++ b/src/plugins/geoservices/nokia/placesv2/placesv2.pri @@ -2,20 +2,20 @@ QT *= location network HEADERS += \ qplacemanagerengine_nokiav2.h \ - placesv2/qplacecategoriesreplyimpl.h \ + placesv2/qplacecategoriesreplyhere.h \ placesv2/qplacecontentreplyimpl.h \ placesv2/qplacedetailsreplyimpl.h \ placesv2/qplaceidreplyimpl.h \ - placesv2/qplacesearchreplyimpl.h \ + placesv2/qplacesearchreplyhere.h \ placesv2/qplacesearchsuggestionreplyimpl.h \ placesv2/jsonparserhelpers.h SOURCES += \ qplacemanagerengine_nokiav2.cpp \ - placesv2/qplacecategoriesreplyimpl.cpp \ + placesv2/qplacecategoriesreplyhere.cpp \ placesv2/qplacecontentreplyimpl.cpp \ placesv2/qplacedetailsreplyimpl.cpp \ placesv2/qplaceidreplyimpl.cpp \ - placesv2/qplacesearchreplyimpl.cpp \ + placesv2/qplacesearchreplyhere.cpp \ placesv2/qplacesearchsuggestionreplyimpl.cpp \ placesv2/jsonparserhelpers.cpp diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp index b85056de..5ae0d923 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.cpp @@ -34,26 +34,26 @@ ** ****************************************************************************/ -#include "qplacecategoriesreplyimpl.h" +#include "qplacecategoriesreplyhere.h" QT_BEGIN_NAMESPACE -QPlaceCategoriesReplyImpl::QPlaceCategoriesReplyImpl(QObject *parent) +QPlaceCategoriesReplyHere::QPlaceCategoriesReplyHere(QObject *parent) : QPlaceReply(parent) { } -QPlaceCategoriesReplyImpl::~QPlaceCategoriesReplyImpl() +QPlaceCategoriesReplyHere::~QPlaceCategoriesReplyHere() { } -void QPlaceCategoriesReplyImpl::emitFinished() +void QPlaceCategoriesReplyHere::emitFinished() { setFinished(true); emit finished(); } -void QPlaceCategoriesReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString) +void QPlaceCategoriesReplyHere::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); emit error(error_, errorString); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h index b0738338..4258d390 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyimpl.h +++ b/src/plugins/geoservices/nokia/placesv2/qplacecategoriesreplyhere.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QPLACECATEGORIESREPLYIMPL_H -#define QPLACECATEGORIESREPLYIMPL_H +#ifndef QPLACECATEGORIESREPLYHERE_H +#define QPLACECATEGORIESREPLYHERE_H #include <QtLocation/QPlaceReply> QT_BEGIN_NAMESPACE -class QPlaceCategoriesReplyImpl : public QPlaceReply +class QPlaceCategoriesReplyHere : public QPlaceReply { Q_OBJECT public: - explicit QPlaceCategoriesReplyImpl(QObject *parent = 0); - ~QPlaceCategoriesReplyImpl(); + explicit QPlaceCategoriesReplyHere(QObject *parent = 0); + ~QPlaceCategoriesReplyHere(); void emitFinished(); @@ -57,4 +57,4 @@ private slots: QT_END_NAMESPACE -#endif // QPLACECATEGORIESREPLYIMPL_H +#endif // QPLACECATEGORIESREPLYHERE_H diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp index 90308c24..3a56c927 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qplacesearchreplyimpl.h" +#include "qplacesearchreplyhere.h" #include "jsonparserhelpers.h" #include "../qplacemanagerengine_nokiav2.h" #include "../qgeoerror_messages.h" @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -QPlaceSearchReplyImpl::QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, +QPlaceSearchReplyHere::QPlaceSearchReplyHere(const QPlaceSearchRequest &request, QNetworkReply *reply, QPlaceManagerEngineNokiaV2 *parent) : QPlaceSearchReply(parent), m_reply(reply), m_engine(parent) @@ -67,17 +67,17 @@ QPlaceSearchReplyImpl::QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); } -QPlaceSearchReplyImpl::~QPlaceSearchReplyImpl() +QPlaceSearchReplyHere::~QPlaceSearchReplyHere() { } -void QPlaceSearchReplyImpl::abort() +void QPlaceSearchReplyHere::abort() { if (m_reply) m_reply->abort(); } -void QPlaceSearchReplyImpl::setError(QPlaceReply::Error error_, const QString &errorString) +void QPlaceSearchReplyHere::setError(QPlaceReply::Error error_, const QString &errorString) { QPlaceReply::setError(error_, errorString); emit error(error_, errorString); @@ -85,7 +85,7 @@ void QPlaceSearchReplyImpl::setError(QPlaceReply::Error error_, const QString &e emit finished(); } -void QPlaceSearchReplyImpl::replyFinished() +void QPlaceSearchReplyHere::replyFinished() { if (m_reply->error() != QNetworkReply::NoError) { switch (m_reply->error()) { @@ -148,7 +148,7 @@ void QPlaceSearchReplyImpl::replyFinished() emit finished(); } -QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) const +QPlaceResult QPlaceSearchReplyHere::parsePlaceResult(const QJsonObject &item) const { QPlaceResult result; @@ -210,7 +210,7 @@ QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) co return result; } -QPlaceProposedSearchResult QPlaceSearchReplyImpl::parseSearchResult(const QJsonObject &item) const +QPlaceProposedSearchResult QPlaceSearchReplyHere::parseSearchResult(const QJsonObject &item) const { QPlaceProposedSearchResult result; diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h index 373040d5..a712ab84 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.h +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyhere.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QPLACESEARCHREPLYIMPL_H -#define QPLACESEARCHREPLYIMPL_H +#ifndef QPLACESEARCHREPLYHERE_H +#define QPLACESEARCHREPLYHERE_H #include <QtNetwork/QNetworkReply> #include <QtLocation/QPlaceSearchReply> @@ -46,15 +46,15 @@ class QPlaceManagerEngineNokiaV2; class QPlaceResult; class QPlaceProposedSearchResult; -class QPlaceSearchReplyImpl : public QPlaceSearchReply +class QPlaceSearchReplyHere : public QPlaceSearchReply { Q_OBJECT public: - explicit QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, + explicit QPlaceSearchReplyHere(const QPlaceSearchRequest &request, QNetworkReply *reply, QPlaceManagerEngineNokiaV2 *parent); - ~QPlaceSearchReplyImpl(); + ~QPlaceSearchReplyHere(); void abort(); @@ -72,4 +72,4 @@ private: QT_END_NAMESPACE -#endif // QPLACESEARCHREPLYIMPL_H +#endif // QPLACESEARCHREPLYHERE_H diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index e2e1612c..5a0f3d0d 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -36,10 +36,10 @@ #include "qplacemanagerengine_nokiav2.h" -#include "placesv2/qplacecategoriesreplyimpl.h" +#include "placesv2/qplacecategoriesreplyhere.h" #include "placesv2/qplacecontentreplyimpl.h" #include "placesv2/qplacesearchsuggestionreplyimpl.h" -#include "placesv2/qplacesearchreplyimpl.h" +#include "placesv2/qplacesearchreplyhere.h" #include "placesv2/qplacedetailsreplyimpl.h" #include "placesv2/qplaceidreplyimpl.h" #include "qgeonetworkaccessmanager.h" @@ -352,7 +352,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest || query.searchArea().type() != QGeoShape::UnknownType); if (unsupported) { - QPlaceSearchReplyImpl *reply = new QPlaceSearchReplyImpl(query, 0, this); + QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, 0, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -368,7 +368,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest // searches, which do not need search centers. if (query.recommendationId().isEmpty() && !query.searchContext().isValid()) { if (!addAtForBoundingArea(query.searchArea(), &queryItems)) { - QPlaceSearchReplyImpl *reply = new QPlaceSearchReplyImpl(query, 0, this); + QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, 0, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -414,7 +414,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest QNetworkReply *networkReply = sendRequest(requestUrl); - QPlaceSearchReplyImpl *reply = new QPlaceSearchReplyImpl(query, networkReply, this); + QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, networkReply, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -458,7 +458,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest networkReply = sendRequest(requestUrl); } - QPlaceSearchReplyImpl *reply = new QPlaceSearchReplyImpl(query, networkReply, this); + QPlaceSearchReplyHere *reply = new QPlaceSearchReplyHere(query, networkReply, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -613,7 +613,7 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() m_categoryRequests.insert(id, networkReply); } - QPlaceCategoriesReplyImpl *reply = new QPlaceCategoriesReplyImpl(this); + QPlaceCategoriesReplyHere *reply = new QPlaceCategoriesReplyHere(this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h index caca8d24..fe2e537e 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QPlaceContentReply; class QNetworkReply; class QNetworkAccessManager; -class QPlaceCategoriesReplyImpl; +class QPlaceCategoriesReplyHere; class QGeoNetworkAccessManager; class QGeoUriProvider; @@ -119,7 +119,7 @@ private: QPlaceCategoryTree m_tempTree; QHash<QString, QString> m_restIdToIconHash; - QPointer<QPlaceCategoriesReplyImpl> m_categoryReply; + QPointer<QPlaceCategoriesReplyHere> m_categoryReply; QHash<QString, QNetworkReply *> m_categoryRequests; QString m_appId; diff --git a/src/plugins/geoservices/osm/osm.pro b/src/plugins/geoservices/osm/osm.pro index bfae8284..5bfee3d0 100644 --- a/src/plugins/geoservices/osm/osm.pro +++ b/src/plugins/geoservices/osm/osm.pro @@ -16,8 +16,8 @@ HEADERS += \ qgeoroutingmanagerengineosm.h \ qgeoroutereplyosm.h \ qplacemanagerengineosm.h \ - qplacesearchreplyimpl.h \ - qplacecategoriesreplyimpl.h + qplacesearchreplyosm.h \ + qplacecategoriesreplyosm.h SOURCES += \ qgeoserviceproviderpluginosm.cpp \ @@ -30,8 +30,9 @@ SOURCES += \ qgeoroutingmanagerengineosm.cpp \ qgeoroutereplyosm.cpp \ qplacemanagerengineosm.cpp \ - qplacesearchreplyimpl.cpp \ - qplacecategoriesreplyimpl.cpp + qplacesearchreplyosm.cpp \ + qplacecategoriesreplyosm.cpp + OTHER_FILES += \ osm_plugin.json diff --git a/src/plugins/geoservices/osm/qplacecategoriesreplyimpl.cpp b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp index 1fb9b99e..b8791522 100644 --- a/src/plugins/geoservices/osm/qplacecategoriesreplyimpl.cpp +++ b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp @@ -31,26 +31,26 @@ ** ****************************************************************************/ -#include "qplacecategoriesreplyimpl.h" +#include "qplacecategoriesreplyosm.h" QT_BEGIN_NAMESPACE -QPlaceCategoriesReplyImpl::QPlaceCategoriesReplyImpl(QObject *parent) +QPlaceCategoriesReplyOsm::QPlaceCategoriesReplyOsm(QObject *parent) : QPlaceReply(parent) { } -QPlaceCategoriesReplyImpl::~QPlaceCategoriesReplyImpl() +QPlaceCategoriesReplyOsm::~QPlaceCategoriesReplyOsm() { } -void QPlaceCategoriesReplyImpl::emitFinished() +void QPlaceCategoriesReplyOsm::emitFinished() { setFinished(true); emit finished(); } -void QPlaceCategoriesReplyImpl::setError(QPlaceReply::Error errorCode, const QString &errorString) +void QPlaceCategoriesReplyOsm::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); emit error(errorCode, errorString); diff --git a/src/plugins/geoservices/osm/qplacecategoriesreplyimpl.h b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h index 8572ed2d..dc464f65 100644 --- a/src/plugins/geoservices/osm/qplacecategoriesreplyimpl.h +++ b/src/plugins/geoservices/osm/qplacecategoriesreplyosm.h @@ -31,20 +31,20 @@ ** ****************************************************************************/ -#ifndef QPLACECATEGORIESREPLYIMPL_H -#define QPLACECATEGORIESREPLYIMPL_H +#ifndef QPLACECATEGORIESREPLYOSM_H +#define QPLACECATEGORIESREPLYOSM_H #include <QtLocation/QPlaceReply> QT_BEGIN_NAMESPACE -class QPlaceCategoriesReplyImpl : public QPlaceReply +class QPlaceCategoriesReplyOsm : public QPlaceReply { Q_OBJECT public: - explicit QPlaceCategoriesReplyImpl(QObject *parent = 0); - ~QPlaceCategoriesReplyImpl(); + explicit QPlaceCategoriesReplyOsm(QObject *parent = 0); + ~QPlaceCategoriesReplyOsm(); void emitFinished(); void setError(QPlaceReply::Error errorCode, const QString &errorString); @@ -52,4 +52,4 @@ public: QT_END_NAMESPACE -#endif // QPLACECATEGORIESREPLYIMPL_H +#endif // QPLACECATEGORIESREPLYOSM_H diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp index 1998f77e..647b8467 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp @@ -32,8 +32,8 @@ ****************************************************************************/ #include "qplacemanagerengineosm.h" -#include "qplacesearchreplyimpl.h" -#include "qplacecategoriesreplyimpl.h" +#include "qplacesearchreplyosm.h" +#include "qplacecategoriesreplyosm.h" #include <QtCore/QUrlQuery> #include <QtCore/QXmlStreamReader> @@ -180,7 +180,7 @@ QPlaceSearchReply *QPlaceManagerEngineOsm::search(const QPlaceSearchRequest &req QNetworkReply *networkReply = m_networkManager->get(QNetworkRequest(requestUrl)); - QPlaceSearchReplyImpl *reply = new QPlaceSearchReplyImpl(request, networkReply, this); + QPlaceSearchReplyOsm *reply = new QPlaceSearchReplyOsm(request, networkReply, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -197,7 +197,7 @@ QPlaceReply *QPlaceManagerEngineOsm::initializeCategories() fetchNextCategoryLocale(); } - QPlaceCategoriesReplyImpl *reply = new QPlaceCategoriesReplyImpl(this); + QPlaceCategoriesReplyOsm *reply = new QPlaceCategoriesReplyOsm(this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); connect(reply, SIGNAL(error(QPlaceReply::Error,QString)), this, SLOT(replyError(QPlaceReply::Error,QString))); @@ -310,14 +310,14 @@ void QPlaceManagerEngineOsm::categoryReplyFinished() m_categoryLocales.clear(); } - foreach (QPlaceCategoriesReplyImpl *reply, m_pendingCategoriesReply) + foreach (QPlaceCategoriesReplyOsm *reply, m_pendingCategoriesReply) reply->emitFinished(); m_pendingCategoriesReply.clear(); } void QPlaceManagerEngineOsm::categoryReplyError() { - foreach (QPlaceCategoriesReplyImpl *reply, m_pendingCategoriesReply) + foreach (QPlaceCategoriesReplyOsm *reply, m_pendingCategoriesReply) reply->setError(QPlaceReply::CommunicationError, tr("Network request error")); } diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.h b/src/plugins/geoservices/osm/qplacemanagerengineosm.h index 41d05c09..9a15b493 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.h +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE class QNetworkAccessManager; class QNetworkReply; -class QPlaceCategoriesReplyImpl; +class QPlaceCategoriesReplyOsm; class QPlaceManagerEngineOsm : public QPlaceManagerEngine { @@ -78,7 +78,7 @@ private: QList<QLocale> m_locales; QNetworkReply *m_categoriesReply; - QList<QPlaceCategoriesReplyImpl *> m_pendingCategoriesReply; + QList<QPlaceCategoriesReplyOsm *> m_pendingCategoriesReply; QHash<QString, QPlaceCategory> m_categories; QHash<QString, QStringList> m_subcategories; diff --git a/src/plugins/geoservices/osm/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp index 6926e699..b1555870 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include "qplacesearchreplyimpl.h" +#include "qplacesearchreplyosm.h" #include "qplacemanagerengineosm.h" #include <QtCore/QJsonDocument> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -QPlaceSearchReplyImpl::QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, +QPlaceSearchReplyOsm::QPlaceSearchReplyOsm(const QPlaceSearchRequest &request, QNetworkReply *reply, QPlaceManagerEngineOsm *parent) : QPlaceSearchReply(parent), m_reply(reply) { @@ -60,17 +60,17 @@ QPlaceSearchReplyImpl::QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished())); } -QPlaceSearchReplyImpl::~QPlaceSearchReplyImpl() +QPlaceSearchReplyOsm::~QPlaceSearchReplyOsm() { } -void QPlaceSearchReplyImpl::abort() +void QPlaceSearchReplyOsm::abort() { if (m_reply) m_reply->abort(); } -void QPlaceSearchReplyImpl::setError(QPlaceReply::Error errorCode, const QString &errorString) +void QPlaceSearchReplyOsm::setError(QPlaceReply::Error errorCode, const QString &errorString) { QPlaceReply::setError(errorCode, errorString); emit error(errorCode, errorString); @@ -91,7 +91,7 @@ static QGeoRectangle parseBoundingBox(const QJsonArray &coordinates) return QGeoRectangle(QGeoCoordinate(top, left), QGeoCoordinate(bottom, right)); } -void QPlaceSearchReplyImpl::replyFinished() +void QPlaceSearchReplyOsm::replyFinished() { QNetworkReply *reply = m_reply; m_reply->deleteLater(); @@ -157,7 +157,7 @@ void QPlaceSearchReplyImpl::replyFinished() emit finished(); } -QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) const +QPlaceResult QPlaceSearchReplyOsm::parsePlaceResult(const QJsonObject &item) const { QPlace place; diff --git a/src/plugins/geoservices/osm/qplacesearchreplyimpl.h b/src/plugins/geoservices/osm/qplacesearchreplyosm.h index 735f1ece..3594a095 100644 --- a/src/plugins/geoservices/osm/qplacesearchreplyimpl.h +++ b/src/plugins/geoservices/osm/qplacesearchreplyosm.h @@ -31,8 +31,8 @@ ** ****************************************************************************/ -#ifndef QPLACESEARCHREPLYIMPL_H -#define QPLACESEARCHREPLYIMPL_H +#ifndef QPLACESEARCHREPLYOSM_H +#define QPLACESEARCHREPLYOSM_H #include <QtLocation/QPlaceSearchReply> @@ -42,14 +42,14 @@ class QNetworkReply; class QPlaceManagerEngineOsm; class QPlaceResult; -class QPlaceSearchReplyImpl : public QPlaceSearchReply +class QPlaceSearchReplyOsm : public QPlaceSearchReply { Q_OBJECT public: - QPlaceSearchReplyImpl(const QPlaceSearchRequest &request, QNetworkReply *reply, + QPlaceSearchReplyOsm(const QPlaceSearchRequest &request, QNetworkReply *reply, QPlaceManagerEngineOsm *parent); - ~QPlaceSearchReplyImpl(); + ~QPlaceSearchReplyOsm(); void abort(); @@ -65,4 +65,4 @@ private: QT_END_NAMESPACE -#endif // QPLACESEARCHREPLYIMPL_H +#endif // QPLACESEARCHREPLYOSM_H |