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>

7 files changed, 38 insertions, 38 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;