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_p.h b/src/location/maps/qgeoserviceprovider_p.h
index 3d564481..bb194e09 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -80,14 +80,17 @@ public:
     QGeoSearchManager *searchManager;
     QGeoRoutingManager *routingManager;
     QGeoMappingManager *mappingManager;
+    QPlaceManager *placeManager;
 
     QGeoServiceProvider::Error searchError;
     QGeoServiceProvider::Error routingError;
     QGeoServiceProvider::Error mappingError;
+    QGeoServiceProvider::Error placeError;
 
     QString searchErrorString;
     QString routingErrorString;
     QString mappingErrorString;
+    QString placeErrorString;
 
     QGeoServiceProvider::Error error;
     QString errorString;