summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeotiledmap_p_p.h
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2015-04-13 15:27:08 +0200
committerMichal Klocek <michal.klocek@theqtcompany.com>2015-05-05 13:02:55 +0000
commitcbe2583de456f18ddd2e4e5d2da225935aac1475 (patch)
treedf6d26ca3b9868ecf02237df213f4f38ece32dad /src/location/maps/qgeotiledmap_p_p.h
parent59d897d5568fe17965535148842ea9f3238f84d9 (diff)
downloadqtlocation-cbe2583de456f18ddd2e4e5d2da225935aac1475.tar.gz
Cleanup QGeoTileMap code.
This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations * adds Q_DECL_OVERRIDE * removes prefetchTiles() call Change-Id: I3f41cce7fcb0050adb8a5ad90304419b81476955 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/maps/qgeotiledmap_p_p.h')
-rw-r--r--src/location/maps/qgeotiledmap_p_p.h42
1 files changed, 15 insertions, 27 deletions
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index 6980624a..bdd5f9f4 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -47,35 +47,23 @@
// We mean it.
//
-#include <QList>
-#include <QSet>
-#include <QVector>
-#include <QPair>
-#include <QPolygonF>
-#include <QSizeF>
-#include <QMatrix4x4>
-#include <QString>
-#include <QPointer>
-
-#include <QtPositioning/private/qdoublevector3d_p.h>
-#include <QtPositioning/private/qdoublevector2d_p.h>
-
#include "qgeocameradata_p.h"
#include "qgeomaptype_p.h"
+#include <QtPositioning/private/qdoublevector3d_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
+#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
-class QGeoTile;
-class QGeoTileCache;
-class QGeoTileSpec;
-class QGeoMapController;
-class QGeoProjection;
-
class QGeoCameraTiles;
-class QGeoTileRequestManager;
class QGeoMapScene;
-class QGeoTiledMap;
+class QGeoTileCache;
class QGeoTiledMappingManagerEngine;
+class QGeoTiledMap;
+class QGeoTileRequestManager;
+class QGeoTileSpec;
+class QSGNode;
+class QQuickWindow;
class QGeoTiledMapPrivate
{
@@ -102,15 +90,15 @@ public:
QPointer<QGeoTiledMappingManagerEngine> engine() const;
private:
- QGeoTiledMap *map_;
- QGeoTileCache *cache_;
- QPointer<QGeoTiledMappingManagerEngine> engine_;
+ QGeoTiledMap *m_map;
+ QGeoTileCache *m_cache;
+ QPointer<QGeoTiledMappingManagerEngine> m_engine;
- QGeoCameraTiles *cameraTiles_;
- QGeoMapScene *mapScene_;
+ QGeoCameraTiles *m_cameraTiles;
+ QGeoMapScene *m_mapScene;
Q_DISABLE_COPY(QGeoTiledMapPrivate)
public:
- QGeoTileRequestManager *tileRequests_;
+ QGeoTileRequestManager *m_tileRequests;
};
QT_END_NAMESPACE