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>

1 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
index 05bc97dd..08288552 100644
--- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp
@@ -72,10 +72,10 @@ static QString boundingBoxToLtrb(const QGeoRectangle &rect)
            QString::number(rect.bottomRight().latitude());
 }
 
-QGeocodingManagerEngineOsm::QGeocodingManagerEngineOsm(const QVariantMap &parameters,
+QGeoCodingManagerEngineOsm::QGeoCodingManagerEngineOsm(const QVariantMap &parameters,
                                                        QGeoServiceProvider::Error *error,
                                                        QString *errorString)
-:   QGeocodingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this))
+:   QGeoCodingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this))
 {
     if (parameters.contains(QStringLiteral("useragent")))
         m_userAgent = parameters.value(QStringLiteral("useragent")).toString().toLatin1();
@@ -86,16 +86,16 @@ QGeocodingManagerEngineOsm::QGeocodingManagerEngineOsm(const QVariantMap &parame
     errorString->clear();
 }
 
-QGeocodingManagerEngineOsm::~QGeocodingManagerEngineOsm()
+QGeoCodingManagerEngineOsm::~QGeoCodingManagerEngineOsm()
 {
 }
 
-QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QGeoAddress &address, const QGeoShape &bounds)
+QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QGeoAddress &address, const QGeoShape &bounds)
 {
     return geocode(addressToQuery(address), -1, -1, bounds);
 }
 
-QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds)
+QGeoCodeReply *QGeoCodingManagerEngineOsm::geocode(const QString &address, int limit, int offset, const QGeoShape &bounds)
 {
     Q_UNUSED(offset)
 
@@ -122,16 +122,16 @@ QGeocodeReply *QGeocodingManagerEngineOsm::geocode(const QString &address, int l
 
     QNetworkReply *reply = m_networkManager->get(request);
 
-    QGeocodeReplyOsm *geocodeReply = new QGeocodeReplyOsm(reply, this);
+    QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, this);
 
     connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished()));
-    connect(geocodeReply, SIGNAL(error(QGeocodeReply::Error,QString)),
-            this, SLOT(replyError(QGeocodeReply::Error,QString)));
+    connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)),
+            this, SLOT(replyError(QGeoCodeReply::Error,QString)));
 
     return geocodeReply;
 }
 
-QGeocodeReply *QGeocodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &coordinate,
+QGeoCodeReply *QGeoCodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &coordinate,
                                                           const QGeoShape &bounds)
 {
     Q_UNUSED(bounds)
@@ -153,25 +153,25 @@ QGeocodeReply *QGeocodingManagerEngineOsm::reverseGeocode(const QGeoCoordinate &
 
     QNetworkReply *reply = m_networkManager->get(request);
 
-    QGeocodeReplyOsm *geocodeReply = new QGeocodeReplyOsm(reply, this);
+    QGeoCodeReplyOsm *geocodeReply = new QGeoCodeReplyOsm(reply, this);
 
     connect(geocodeReply, SIGNAL(finished()), this, SLOT(replyFinished()));
-    connect(geocodeReply, SIGNAL(error(QGeocodeReply::Error,QString)),
-            this, SLOT(replyError(QGeocodeReply::Error,QString)));
+    connect(geocodeReply, SIGNAL(error(QGeoCodeReply::Error,QString)),
+            this, SLOT(replyError(QGeoCodeReply::Error,QString)));
 
     return geocodeReply;
 }
 
-void QGeocodingManagerEngineOsm::replyFinished()
+void QGeoCodingManagerEngineOsm::replyFinished()
 {
-    QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
+    QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender());
     if (reply)
         emit finished(reply);
 }
 
-void QGeocodingManagerEngineOsm::replyError(QGeocodeReply::Error errorCode, const QString &errorString)
+void QGeoCodingManagerEngineOsm::replyError(QGeoCodeReply::Error errorCode, const QString &errorString)
 {
-    QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
+    QGeoCodeReply *reply = qobject_cast<QGeoCodeReply *>(sender());
     if (reply)
         emit error(reply, errorCode, errorString);
 }