summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm/qgeocodereplyosm.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-08-29 11:27:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-03 09:06:50 +0200
commitfc53ebdbd043642aaab0ce39f48d7c05231d10fd (patch)
treeedb5635f9fb1c9252f31434452e05e75d7b9bcb7 /src/plugins/geoservices/osm/qgeocodereplyosm.cpp
parent9f98392aff316bff0b89ac20234234e1e3f060e2 (diff)
downloadqtlocation-fc53ebdbd043642aaab0ce39f48d7c05231d10fd.tar.gz
Fix some name inconsistencies in QtLocation
1. Rename QGeocoding* classes to QGeoCoding*. This emphasizes the QGeo prefix rather than the geocing word. The QML interfaces continues to use the Geocoding* as they don't a prefix as such. 2. Rename QProposedSearchResult to QPlaceProposedSearchResult. The class is place related and should carry the QPlace name prefix Change-Id: I428c7e6368774a9f199db5c113de11649e4a665c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/plugins/geoservices/osm/qgeocodereplyosm.cpp')
-rw-r--r--src/plugins/geoservices/osm/qgeocodereplyosm.cpp14
1 files changed, 7 insertions, 7 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;