summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeocodereply_nokia.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/nokia/qgeocodereply_nokia.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/nokia/qgeocodereply_nokia.cpp')
-rw-r--r--src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
index 4995358b..cb76fbca 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
@@ -53,9 +53,9 @@
QT_BEGIN_NAMESPACE
-QGeocodeReplyNokia::QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offset,
+QGeoCodeReplyNokia::QGeoCodeReplyNokia(QNetworkReply *reply, int limit, int offset,
const QGeoShape &viewport, QObject *parent)
- : QGeocodeReply(parent),
+ : QGeoCodeReply(parent),
m_reply(reply)
{
connect(m_reply,
@@ -73,12 +73,12 @@ QGeocodeReplyNokia::QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offs
setViewport(viewport);
}
-QGeocodeReplyNokia::~QGeocodeReplyNokia()
+QGeoCodeReplyNokia::~QGeoCodeReplyNokia()
{
//TODO: possible mem leak -> m_reply->deleteLater() ?
}
-void QGeocodeReplyNokia::abort()
+void QGeoCodeReplyNokia::abort()
{
if (!m_reply)
return;
@@ -89,7 +89,7 @@ void QGeocodeReplyNokia::abort()
m_reply = 0;
}
-void QGeocodeReplyNokia::networkFinished()
+void QGeoCodeReplyNokia::networkFinished()
{
if (!m_reply)
return;
@@ -115,21 +115,21 @@ void QGeocodeReplyNokia::networkFinished()
setLocations(locations);
setFinished(true);
} else {
- setError(QGeocodeReply::ParseError, parser.errorString());
+ setError(QGeoCodeReply::ParseError, parser.errorString());
}
m_reply->deleteLater();
m_reply = 0;
}
-void QGeocodeReplyNokia::networkError(QNetworkReply::NetworkError error)
+void QGeoCodeReplyNokia::networkError(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;