diff options
| author | David Laing <david.laing@nokia.com> | 2012-01-04 11:52:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 07:05:08 +0100 |
| commit | 7c2dc2cb57e426bbf8a37cfba988df7a964c5e94 (patch) | |
| tree | d484b9167194881918174698d40d8d13af2313ae /src/location/maps/qgeomappingmanagerengine_p.h | |
| parent | c9de94f6e4013744e03f93ece7fa960cf500eb12 (diff) | |
| download | qtlocation-7c2dc2cb57e426bbf8a37cfba988df7a964c5e94.tar.gz | |
Renames the new mapping classes.
Also moves them into src/location/maps.
We still need to take a closer look at which classes are
public and which are private, and then do the associated
file renaming and addition of private header warnings.
Change-Id: Ide0225ad5d5dc23834baaa9f6841646e4c92de39
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomappingmanagerengine_p.h')
| -rw-r--r-- | src/location/maps/qgeomappingmanagerengine_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h index f4a66958..3c73a4ad 100644 --- a/src/location/maps/qgeomappingmanagerengine_p.h +++ b/src/location/maps/qgeomappingmanagerengine_p.h @@ -60,10 +60,10 @@ #include <QMap> #include <QLocale> #include <QTimer> -#include "maptype.h" -#include "tilecache.h" +#include "qgeomaptype.h" +#include "qgeotilecache.h" -class TileSpec; +class QGeoTileSpec; class QGeoTiledMapReply; QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ public: QString managerName; int managerVersion; - QList<MapType> supportedMapTypes; + QList<QGeoMapType> supportedMapTypes; // QList<QGraphicsGeoMap::ConnectivityMode> supportedConnectivityModes; QSize tileSize; qreal minimumZoomLevel; @@ -88,15 +88,15 @@ public: bool supportsTilting; qreal minimumTilt; qreal maximumTilt; - TileCache::CacheAreas cacheHint; + QGeoTileCache::CacheAreas cacheHint; QLocale locale; bool started_; bool initialized; bool stopped_; QTimer *timer_; - QList<TileSpec> queue_; - QHash<TileSpec, QGeoTiledMapReply*> invmap_; + QList<QGeoTileSpec> queue_; + QHash<QGeoTileSpec, QGeoTiledMapReply*> invmap_; private: Q_DISABLE_COPY(QGeoMappingManagerEnginePrivate) |