Remove Maps from public C++ API.

The preliminary C++ Maps API was exposed to provide an interface
between the QML plugin and the geo services plugins.  Mark it as
private API for now as it is likely to change when the full C++ API is
developed.

Mapping functionality is currently only available through QML.

Change-Id: Id16e0f1a2165c70192047dffa40e69ab1f29ba69
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

1 files changed, 48 insertions, 11 deletions

diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index df61fb0d..2b04a0e7 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOMAPPINGMANAGER_P_H
-#define QGEOMAPPINGMANAGER_P_H
+#ifndef QGEOMAPPINGMANAGER_H
+#define QGEOMAPPINGMANAGER_H
 
 //
 //  W A R N I N G
@@ -53,26 +53,63 @@
 // We mean it.
 //
 
+#include <QObject>
 #include <QSize>
-#include <QList>
-#include <QHash>
-#include <QSet>
-#include <QThread>
+#include <QPair>
+#include <QtLocation/qlocationglobal.h>
+#include "qgeomaptype_p.h"
+
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QGeoMappingManagerPrivate
+class QGeoMap;
+class QLocale;
+class QGeoBoundingBox;
+class QGeoCoordinate;
+class QGeoMappingManagerPrivate;
+class QGeoMapRequestOptions;
+class QGeoMappingManagerEngine;
+class QGeoCameraCapabilities;
+
+
+class Q_LOCATION_EXPORT QGeoMappingManager : public QObject
 {
+    Q_OBJECT
+
 public:
-    QGeoMappingManagerPrivate();
-    ~QGeoMappingManagerPrivate();
+    ~QGeoMappingManager();
+
+    QString managerName() const;
+    int managerVersion() const;
+
+    QGeoMap *createMap(QObject *parent);
+
+    QList<QGeoMapType> supportedMapTypes() const;
 
-    QGeoMappingManagerEngine *engine;
+    bool isInitialized() const;
+
+    QGeoCameraCapabilities cameraCapabilities() const;
+
+    void setLocale(const QLocale &locale);
+    QLocale locale() const;
+
+Q_SIGNALS:
+    void initialized();
+
+protected:
+    QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = 0);
 
 private:
-    Q_DISABLE_COPY(QGeoMappingManagerPrivate)
+    QGeoMappingManagerPrivate *d_ptr;
+    Q_DISABLE_COPY(QGeoMappingManager)
+
+    friend class QGeoServiceProvider;
+    friend class QGeoServiceProviderPrivate;
 };
 
 QT_END_NAMESPACE
 
+QT_END_HEADER
+
 #endif