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, 3 insertions, 0 deletions

diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 8fbe8ee6..ebda46c7 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -57,9 +57,11 @@ class QStringList;
 class QGeoSearchManager;
 class QGeoMappingManager;
 class QGeoRoutingManager;
+class QPlaceManager;
 class QGeoSearchManagerEngine;
 class QGeoMappingManagerEngine;
 class QGeoRoutingManagerEngine;
+class QPlaceManagerEngine;
 class QGeoServiceProviderPrivate;
 
 class Q_LOCATION_EXPORT QGeoServiceProvider
@@ -81,6 +83,7 @@ public:
     QGeoSearchManager* searchManager() const;
     QGeoMappingManager* mappingManager() const;
     QGeoRoutingManager* routingManager() const;
+    QPlaceManager *placeManager() const;
 
     Error error() const;
     QString errorString() const;