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>

4 files changed, 35 insertions, 35 deletions

diff --git a/src/location/places/places.pri b/src/location/places/places.pri
index 4c3a0667..1a3796fc 100644
--- a/src/location/places/places.pri
+++ b/src/location/places/places.pri
@@ -19,7 +19,7 @@ PUBLIC_HEADERS += \
 #result
     places/qplacesearchresult.h \
     places/qplaceresult.h \
-    places/qproposedsearchresult.h \
+    places/qplaceproposedsearchresult.h \
 #request classes
     places/qplacecontentrequest.h \
     places/qplacematchrequest.h \
@@ -47,7 +47,7 @@ PRIVATE_HEADERS += \
     places/qplaceimage_p.h \
     places/qplaceratings_p.h \
     places/qplaceresult_p.h \
-    places/qproposedsearchresult_p.h \
+    places/qplaceproposedsearchresult_p.h \
     places/qplacereview_p.h \
     places/qplacesupplier_p.h \
     places/qplacesearchresult_p.h \
@@ -76,7 +76,7 @@ SOURCES += \
 #result
     places/qplacesearchresult.cpp \
     places/qplaceresult.cpp \
-    places/qproposedsearchresult.cpp \
+    places/qplaceproposedsearchresult.cpp \
 #request classes
     places/qplacecontentrequest.cpp \
     places/qplacematchrequest.cpp \
diff --git a/src/location/places/qproposedsearchresult.cpp b/src/location/places/qplaceproposedsearchresult.cpp
index 94581b89..d2aaf5bb 100644
--- a/src/location/places/qproposedsearchresult.cpp
+++ b/src/location/places/qplaceproposedsearchresult.cpp
@@ -39,38 +39,38 @@
 **
 ****************************************************************************/
 
-#include "qproposedsearchresult.h"
-#include "qproposedsearchresult_p.h"
+#include "qplaceproposedsearchresult.h"
+#include "qplaceproposedsearchresult_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QProposedSearchResultPrivate::QProposedSearchResultPrivate()
+QPlaceProposedSearchResultPrivate::QPlaceProposedSearchResultPrivate()
 {
 }
 
-QProposedSearchResultPrivate::QProposedSearchResultPrivate(const QProposedSearchResultPrivate &other)
+QPlaceProposedSearchResultPrivate::QPlaceProposedSearchResultPrivate(const QPlaceProposedSearchResultPrivate &other)
 :   QPlaceSearchResultPrivate(other), searchRequest(other.searchRequest)
 {
 }
 
-QProposedSearchResultPrivate::~QProposedSearchResultPrivate()
+QPlaceProposedSearchResultPrivate::~QPlaceProposedSearchResultPrivate()
 {
 }
 
-bool QProposedSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) const
+bool QPlaceProposedSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) const
 {
-    const QProposedSearchResultPrivate *od = static_cast<const QProposedSearchResultPrivate *>(other);
+    const QPlaceProposedSearchResultPrivate *od = static_cast<const QPlaceProposedSearchResultPrivate *>(other);
     return QPlaceSearchResultPrivate::compare(other) && searchRequest == od->searchRequest;
 }
 
 /*!
-    \class QProposedSearchResult
+    \class QPlaceProposedSearchResult
     \inmodule QtLocation
     \ingroup QtLocation-places
     \ingroup QtLocation-places-data
     \since Qt Location 5.2
 
-    \brief The QProposedSearchResult class represents a search result containing a proposed search.
+    \brief The QPlaceProposedSearchResult class represents a search result containing a proposed search.
 
     \sa QPlaceSearchResult
 */
@@ -78,43 +78,43 @@ bool QProposedSearchResultPrivate::compare(const QPlaceSearchResultPrivate *othe
 /*!
     Constructs a new proposed search result.
 */
-QProposedSearchResult::QProposedSearchResult()
-:   QPlaceSearchResult(new QProposedSearchResultPrivate)
+QPlaceProposedSearchResult::QPlaceProposedSearchResult()
+:   QPlaceSearchResult(new QPlaceProposedSearchResultPrivate)
 {
 }
 
 /*!
-    \fn QProposedSearchResult::QProposedSearchResult(const QPlaceSearchRequest &other)
+    \fn QPlaceProposedSearchResult::QPlaceProposedSearchResult(const QPlaceSearchRequest &other)
 
     Contructs a copy of \a other if possible, otherwise constructs a default proposed search
     result.
 */
-Q_IMPLEMENT_SEARCHRESULT_COPY_CTOR(QProposedSearchResult)
+Q_IMPLEMENT_SEARCHRESULT_COPY_CTOR(QPlaceProposedSearchResult)
 
-Q_IMPLEMENT_SEARCHRESULT_D_FUNC(QProposedSearchResult)
+Q_IMPLEMENT_SEARCHRESULT_D_FUNC(QPlaceProposedSearchResult)
 
 /*!
     Destroys the proposed search result.
 */
-QProposedSearchResult::~QProposedSearchResult()
+QPlaceProposedSearchResult::~QPlaceProposedSearchResult()
 {
 }
 
 /*!
     Returns a place search request that can be used to perform an additional proposed search.
 */
-QPlaceSearchRequest QProposedSearchResult::searchRequest() const
+QPlaceSearchRequest QPlaceProposedSearchResult::searchRequest() const
 {
-    Q_D(const QProposedSearchResult);
+    Q_D(const QPlaceProposedSearchResult);
     return d->searchRequest;
 }
 
 /*!
     Sets the proposed search request to \a request.
 */
-void QProposedSearchResult::setSearchRequest(const QPlaceSearchRequest &request)
+void QPlaceProposedSearchResult::setSearchRequest(const QPlaceSearchRequest &request)
 {
-    Q_D(QProposedSearchResult);
+    Q_D(QPlaceProposedSearchResult);
     d->searchRequest = request;
 }
 
diff --git a/src/location/places/qproposedsearchresult.h b/src/location/places/qplaceproposedsearchresult.h
index 8c937324..ff957b86 100644
--- a/src/location/places/qproposedsearchresult.h
+++ b/src/location/places/qplaceproposedsearchresult.h
@@ -46,29 +46,29 @@
 
 QT_BEGIN_NAMESPACE
 
-class QProposedSearchResultPrivate;
+class QPlaceProposedSearchResultPrivate;
 
-class Q_LOCATION_EXPORT QProposedSearchResult : public QPlaceSearchResult
+class Q_LOCATION_EXPORT QPlaceProposedSearchResult : public QPlaceSearchResult
 {
 public:
-    QProposedSearchResult();
+    QPlaceProposedSearchResult();
 
 #ifdef Q_QDOC
-    QProposedSearchResult(const QPlaceSearchRequest &other);
+    QPlaceProposedSearchResult(const QPlaceSearchRequest &other);
 #else
-    Q_DECLARE_SEARCHRESULT_COPY_CTOR(QProposedSearchResult)
+    Q_DECLARE_SEARCHRESULT_COPY_CTOR(QPlaceProposedSearchResult)
 #endif
 
-    ~QProposedSearchResult();
+    ~QPlaceProposedSearchResult();
 
     QPlaceSearchRequest searchRequest() const;
     void setSearchRequest(const QPlaceSearchRequest &request);
 
 private:
-    Q_DECLARE_SEARCHRESULT_D_FUNC(QProposedSearchResult)
+    Q_DECLARE_SEARCHRESULT_D_FUNC(QPlaceProposedSearchResult)
 };
 
-Q_DECLARE_TYPEINFO(QProposedSearchResult, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPlaceProposedSearchResult, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/location/places/qproposedsearchresult_p.h b/src/location/places/qplaceproposedsearchresult_p.h
index 37df3447..2241341b 100644
--- a/src/location/places/qproposedsearchresult_p.h
+++ b/src/location/places/qplaceproposedsearchresult_p.h
@@ -46,17 +46,17 @@
 
 QT_BEGIN_NAMESPACE
 
-class QProposedSearchResultPrivate : public QPlaceSearchResultPrivate
+class QPlaceProposedSearchResultPrivate : public QPlaceSearchResultPrivate
 {
 public:
-    QProposedSearchResultPrivate();
-    QProposedSearchResultPrivate(const QProposedSearchResultPrivate &other);
+    QPlaceProposedSearchResultPrivate();
+    QPlaceProposedSearchResultPrivate(const QPlaceProposedSearchResultPrivate &other);
 
-    ~QProposedSearchResultPrivate();
+    ~QPlaceProposedSearchResultPrivate();
 
     bool compare(const QPlaceSearchResultPrivate *other) const Q_DECL_OVERRIDE;
 
-    Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QProposedSearchResult, QPlaceSearchResult::ProposedSearchResult)
+    Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceProposedSearchResult, QPlaceSearchResult::ProposedSearchResult)
 
     QPlaceSearchRequest searchRequest;
 };