Remove left overs from QGraphicsGeoMap removal

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

5 files changed, 0 insertions, 68 deletions

diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index 3a318fbc..90aff85d 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -65,24 +65,6 @@ QT_BEGIN_NAMESPACE
 
     \brief The QGeoMappingManager class provides support for displaying
     and interacting with maps.
-
-    A QGeoMappingManager instance can create QGeoMapData instances with
-    createMapData(). The QGeoMapData instances can be used to contain and
-    manage information concerning what a particular QGraphicsGeoMap is viewing.
-
-    The functions in this class will typically not be used by clients of this
-    API, as the most common uses will only need to obtain a QGeoMappingManager
-    instance and associate it with a QGraphicsGeoMap instance:
-    \code
-        QGeoServiceProvider serviceProvider("nokia");
-        QGeoMappingManager *manager = serviceProvider.mappingManager();
-        QGraphicsGeoMap *geoMap = new QGraphicsGeoMap(manager);
-    \endcode
-
-    This could have been simplified by having the plugin return a
-    QGraphicsGeoMap instance instead, but this approach allows users to
-    subclass QGraphicsGeoMap in order to override the standard event handlers
-    and implement custom map behaviours.
 */
 
 /*!
@@ -310,14 +292,6 @@ QList<QGeoMapType> QGeoMappingManager::supportedMapTypes() const
     return d_ptr->engine->supportedMapTypes();
 }
 
-///*!
-//    Returns a list of the connectivity modes supported by this manager.
-//*/
-//QList<QGraphicsGeoMap::ConnectivityMode> QGeoMappingManager::supportedConnectivityModes() const
-//{
-//    return d_ptr->engine->supportedConnectivityModes();
-//}
-
 /*!
     Returns the length of the edge of the tiles returned by this manager.
 
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index ce9e8c60..fe6f74b3 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -90,7 +90,6 @@ public:
                             const QSet<QGeoTileSpec> &tilesRemoved);
 
     QList<QGeoMapType> supportedMapTypes() const;
- //    QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() const;
 
     int tileSize() const;
 
diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index 91518446..d424c8e2 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -58,16 +58,6 @@ QT_BEGIN_NAMESPACE
     \brief The QGeoMappingManagerEngine class provides an interface and convenience methods
     to implementors of QGeoServiceProvider plugins who want to provide support for displaying
     and interacting with maps.
-
-    Subclasses of QGeoMappingManagerEngine need to provide an implementations
-    of createMapData(). The QGeoMapData instances returned by createMapData()
-    can be used to contain and manage information concerning what a particular
-    QGraphicsGeoMap is viewing.
-
-    Most of the other functions configure the reported capabilities of the engine.
-    It is important that these functions are called before createMapData() or any of the
-    capability reporting functions are used to prevent incorrect or
-    inconsistent behaviour.
 */
 
 /*!
@@ -325,31 +315,6 @@ void QGeoMappingManagerEngine::setSupportedMapTypes(const QList<QGeoMapType> &su
     d->supportedMapTypes = supportedMapTypes;
 }
 
-///*!
-//    Returns a list of the connectivity modes supported by this engine.
-//*/
-//QList<QGraphicsGeoMap::ConnectivityMode> QGeoMappingManagerEngine::supportedConnectivityModes() const
-//{
-//    Q_D(const QGeoMappingManagerEngine);
-//    return d->supportedConnectivityModes;
-//}
-
-///*!
-//    Sets the list of connectivity modes supported by this engine to \a connectivityModes.
-
-//    Subclasses of QGeoMappingManagerEngine should use this function to ensure
-//    that supportedConnectivityModes() provides accurate information.
-
-//    If createMapData does not specify a connectivity mode the first mode from
-//    \a connectivityModes will be used, or QGraphicsGeoMap::NoConnectivity will
-//    be used if \a connectivityModes is empty.
-//*/
-//void QGeoMappingManagerEngine::setSupportedConnectivityModes(const QList<QGraphicsGeoMap::ConnectivityMode> &connectivityModes)
-//{
-//    Q_D(QGeoMappingManagerEngine);
-//    d->supportedConnectivityModes = connectivityModes;
-//}
-
 void QGeoMappingManagerEngine::setTileSize(int tileSize)
 {
     Q_D(QGeoMappingManagerEngine);
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 43cc4928..71cd526a 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -60,7 +60,6 @@ class QLocale;
 class QGeoBoundingBox;
 class QGeoCameraCapabilities;
 class QGeoCoordinate;
-class QGeoMapData;
 class QGeoMappingManagerPrivate;
 class QGeoMapRequestOptions;
 
@@ -83,7 +82,6 @@ public:
     int managerVersion() const;
 
     QList<QGeoMapType> supportedMapTypes() const;
-//    QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes() const;
 
     int tileSize() const;
 
@@ -116,7 +114,6 @@ protected:
     QGeoMappingManagerEngine(QGeoMappingManagerEnginePrivate *dd, QObject *parent = 0);
 
     void setSupportedMapTypes(const QList<QGeoMapType> &supportedMapTypes);
-//    void setSupportedConnectivityModes(const QList<QGraphicsGeoMap::ConnectivityMode> &connectivityModes);
 
     void setTileSize(int tileSize);
 
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 2de9db6f..d3c3f98e 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -53,8 +53,6 @@
 // We mean it.
 //
 
-//#include "qgraphicsgeomap.h"
-
 #include <QSize>
 #include <QList>
 #include <QMap>
@@ -81,7 +79,6 @@ public:
     int managerVersion;
 
     QList<QGeoMapType> supportedMapTypes;
-//    QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes;
     int tileSize;
     QGeoCameraCapabilities cameraCapabilities_;
     QGeoMappingManager::CacheAreas cacheHint;