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>

3 files changed, 22 insertions, 20 deletions

diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index 49ce3215..c1c17b1b 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -52,11 +52,11 @@
 
 QT_USE_NAMESPACE
 
-class GeocodeReplyTest :public QGeocodeReply
+class GeocodeReplyTest : public QGeoCodeReply
 {
     Q_OBJECT
 public:
-    GeocodeReplyTest(QObject *parent=0):QGeocodeReply (parent) {}
+    GeocodeReplyTest(QObject *parent = 0) : QGeoCodeReply(parent) {}
 
     void  callAddLocation ( const QGeoLocation & location ) {addLocation(location);}
     void  callSetError ( Error error, const QString & errorString ) {setError(error, errorString);}
@@ -68,52 +68,52 @@ public:
 
 };
 
-class QGeocodingManagerEngineTest: public QGeocodingManagerEngine
+class QGeoCodingManagerEngineTest: public QGeoCodingManagerEngine
 
 {
 Q_OBJECT
 public:
-    QGeocodingManagerEngineTest(const QMap<QString, QVariant> &parameters,
-        QGeoServiceProvider::Error *error, QString *errorString) :
-        QGeocodingManagerEngine(parameters)
+    QGeoCodingManagerEngineTest(const QMap<QString, QVariant> &parameters,
+                                QGeoServiceProvider::Error *error, QString *errorString) :
+                                QGeoCodingManagerEngine(parameters)
     {
         Q_UNUSED(error)
         Q_UNUSED(errorString)
         setLocale(QLocale(QLocale::German, QLocale::Germany));
     }
 
-    QGeocodeReply*  geocode ( const QString & searchString, int limit, int offset, const QGeoShape &bounds )
+    QGeoCodeReply* geocode(const QString &searchString, int limit, int offset, const QGeoShape &bounds)
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetLimit(limit);
         geocodereply->callSetOffset(offset);
         geocodereply->callSetViewport(bounds);
-        geocodereply->callSetError(QGeocodeReply::NoError,searchString);
+        geocodereply->callSetError(QGeoCodeReply::NoError,searchString);
         geocodereply->callSetFinished(true);
         emit(this->finished(geocodereply));
 
-        return static_cast<QGeocodeReply*>(geocodereply);
+        return static_cast<QGeoCodeReply*>(geocodereply);
     }
 
-    QGeocodeReply*  geocode ( const QGeoAddress & address, const QGeoShape &bounds )
+    QGeoCodeReply* geocode (const QGeoAddress &address, const QGeoShape &bounds)
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetViewport(bounds);
-        geocodereply->callSetError(QGeocodeReply::NoError,address.city());
+        geocodereply->callSetError(QGeoCodeReply::NoError,address.city());
         geocodereply->callSetFinished(true);
         emit(this->finished(geocodereply));
 
-        return static_cast<QGeocodeReply*>(geocodereply);
+        return static_cast<QGeoCodeReply*>(geocodereply);
     }
 
-    QGeocodeReply*  reverseGeocode ( const QGeoCoordinate & coordinate, const QGeoShape &bounds )
+    QGeoCodeReply* reverseGeocode(const QGeoCoordinate &coordinate, const QGeoShape &bounds)
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetViewport(bounds);
-        geocodereply->callSetError(QGeocodeReply::NoError,coordinate.toString());
+        geocodereply->callSetError(QGeoCodeReply::NoError,coordinate.toString());
         geocodereply->callSetFinished(true);
         emit(this->finished(geocodereply));
-        return static_cast<QGeocodeReply*>(geocodereply);
+        return static_cast<QGeoCodeReply*>(geocodereply);
     }
 };
 
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp
index 218cc906..d16ba32e 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp
+++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp
@@ -52,8 +52,9 @@ QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest()
 {
 }
 
-QGeocodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerEngine(const QMap<
-    QString, QVariant> &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
+QGeoCodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerEngine(
+                const QMap<QString, QVariant> &parameters, QGeoServiceProvider::Error *error,
+                QString *errorString) const
 {
-    return new QGeocodingManagerEngineTest(parameters, error, errorString);
+    return new QGeoCodingManagerEngineTest(parameters, error, errorString);
 }
diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h
index ecb59cc7..c49e90bb 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h
@@ -58,8 +58,9 @@ public:
     QGeoServiceProviderFactoryTest();
     ~QGeoServiceProviderFactoryTest();
 
-    QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
-        QGeoServiceProvider::Error *error, QString *errorString) const;
+    QGeoCodingManagerEngine* createGeocodingManagerEngine(
+                const QMap<QString, QVariant> &parameters,
+                QGeoServiceProvider::Error *error, QString *errorString) const;
 };
 
 #endif