Remove QGeoMapData class.

Since QGeoMap class does not have any subclasses, there is no
need for keeping the bridge in form of QGeoMapData.
This commit basically renames QGeoMapData to be QGeoMap.

Change-Id: I6eb2f56f7ea83663034f4a8297e8e8f7f185d6a9
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 97 insertions, 0 deletions

diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
new file mode 100644
index 00000000..18f5ba43
--- /dev/null
+++ b/src/location/maps/qgeomap_p_p.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QGEOMAP_P_P_H
+#define QGEOMAP_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qgeocameradata_p.h"
+#include "qgeomaptype_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QGeoMappingManagerEngine;
+class QGeoMap;
+class QGeoMapController;
+
+class QGeoMapPrivate
+{
+public:
+    QGeoMapPrivate(QGeoMappingManagerEngine *engine, QGeoMap *parent);
+    virtual ~QGeoMapPrivate();
+
+    QGeoMappingManagerEngine *engine() const;
+
+    QGeoMapController *mapController();
+
+    void setCameraData(const QGeoCameraData &cameraData);
+    QGeoCameraData cameraData() const;
+
+    void resize(int width, int height);
+    int width() const;
+    int height() const;
+    double aspectRatio() const;
+
+    const QGeoMapType activeMapType() const;
+    void setActiveMapType(const QGeoMapType &mapType);
+    QString pluginString();
+
+private:
+    int m_width;
+    int m_height;
+    double m_aspectRatio;
+
+    QGeoMap *m_map;
+    QGeoMappingManagerEngine *m_engine;
+    QString m_pluginString;
+    QGeoMapController *m_controller;
+
+    QGeoCameraData m_cameraData;
+    QGeoMapType m_activeMapType;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOMAP_P_P_H