summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-03-27 10:37:35 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-03-30 06:51:15 +0000
commita4b307499337e724c4e338a587d665e0f5ad52d3 (patch)
tree423183a1675978bfad47cd518f95131f4e6e2fff /src/plugins/geoservices/osm/qplacemanagerengineosm.cpp
parentc8316825b9961bbf1c5677c192c708bef2ef7e06 (diff)
downloadqtlocation-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/qplacemanagerengineosm.cpp')
-rw-r--r--src/plugins/geoservices/osm/qplacemanagerengineosm.cpp12
1 files changed, 6 insertions, 6 deletions
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"));
}