diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-27 10:37:35 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-30 06:51:15 +0000 |
commit | a4b307499337e724c4e338a587d665e0f5ad52d3 (patch) | |
tree | 423183a1675978bfad47cd518f95131f4e6e2fff /src/plugins/geoservices/osm | |
parent | c8316825b9961bbf1c5677c192c708bef2ef7e06 (diff) | |
download | qtlocation-a4b307499337e724c4e338a587d665e0f5ad52d3.tar.gz |
Avoid symbol clash between here and osm plugin
This is of relevance for static Qt builds
Task-number: QTBUG-43681
Task-number: QTBUG-45214
Change-Id: Iea9b4a7cad055dc47265bb51fe2654af80e356b7
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/plugins/geoservices/osm')
-rw-r--r-- | src/plugins/geoservices/osm/osm.pro | 9 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacecategoriesreplyosm.cpp (renamed from src/plugins/geoservices/osm/qplacecategoriesreplyimpl.cpp) | 10 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacecategoriesreplyosm.h (renamed from src/plugins/geoservices/osm/qplacecategoriesreplyimpl.h) | 12 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacemanagerengineosm.cpp | 12 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacemanagerengineosm.h | 4 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacesearchreplyosm.cpp (renamed from src/plugins/geoservices/osm/qplacesearchreplyimpl.cpp) | 14 | ||||
-rw-r--r-- | src/plugins/geoservices/osm/qplacesearchreplyosm.h (renamed from src/plugins/geoservices/osm/qplacesearchreplyimpl.h) | 12 |
7 files changed, 37 insertions, 36 deletions
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 |