Incorporate places/nokia plugin into geoservices/nokia plugin.

This brings the usage of the Places API inline with the rest of the
functional groups in QtLocation.

Removes the PlaceManager element.

Change-Id: I6d7259fe7ea1e55dcf97b95025e0c78748e82b9f
Reviewed-on: http://codereview.qt.nokia.com/2245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index a2198402..b856148b 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -100,12 +100,13 @@ public:
         NotSupportedError
     };
 
-    QPlaceManager(QObject *parent = 0);
     ~QPlaceManager();
+
     QString managerName() const;
+    int managerVersion() const;
 
     QPlaceDetailsReply *getPlaceDetails(const QString &placeId) const;
-    QPlaceReply *postRating(const QGeoPlace &place, qreal value);
+    QPlaceReply *postRating(const QString &placeId, qreal value);
 
     QPlaceReviewReply *getReviews(const QGeoPlace &place, const QPlaceQuery &query) const;
 
@@ -138,9 +139,13 @@ Q_SIGNALS:
     void error(QPlaceReply *, QPlaceReply::Error error, const QString &errorString = QString());
 
 private:
+    QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = 0);
+
     Q_DISABLE_COPY(QPlaceManager)
     QPlaceManagerPrivate* d;
     Q_DECLARE_PRIVATE(QPlaceManager)
+
+    friend class QGeoServiceProvider;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPlaceManager::VisibilityScopes);