summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-13 22:40:02 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-14 15:48:59 (GMT)
commit387d8fe88537aa856f0835ab4adfb8742c5bb3dc (patch)
treec45206a8c396aca02fb5cda2b8a159eacc4f4199
parent32872cf4da95c1c7e567c3f343a4e271bff5e906 (diff)
Remove unneeded includes from TileId.h
-rw-r--r--src/lib/marble/MarbleMap.cpp1
-rw-r--r--src/lib/marble/ServerLayout.cpp1
-rw-r--r--src/lib/marble/StackedTileLoader.h2
-rw-r--r--src/lib/marble/TileId.cpp2
-rw-r--r--src/lib/marble/TileId.h5
-rw-r--r--src/lib/marble/VectorTileModel.h2
6 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
index cbba7d1..c8e3e90 100644
--- a/src/lib/marble/MarbleMap.cpp
+++ b/src/lib/marble/MarbleMap.cpp
@@ -48,6 +48,7 @@
#include "GeoSceneSettings.h"
#include "GeoSceneVector.h"
#include "GeoSceneVectorTileDataset.h"
+#include "GeoSceneTextureTileDataset.h"
#include "GeoSceneZoom.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/ServerLayout.cpp b/src/lib/marble/ServerLayout.cpp
index 91839da..fa6c2ec 100644
--- a/src/lib/marble/ServerLayout.cpp
+++ b/src/lib/marble/ServerLayout.cpp
@@ -12,6 +12,7 @@
#include "ServerLayout.h"
#include "GeoSceneTileDataset.h"
+#include "GeoDataLatLonBox.h"
#include "MarbleGlobal.h"
#include "TileId.h"
diff --git a/src/lib/marble/StackedTileLoader.h b/src/lib/marble/StackedTileLoader.h
index 631a140..163a498 100644
--- a/src/lib/marble/StackedTileLoader.h
+++ b/src/lib/marble/StackedTileLoader.h
@@ -27,7 +27,7 @@
#include <QObject>
-#include "GeoSceneTileDataset.h"
+#include "GeoSceneTextureTileDataset.h"
#include "TileId.h"
#include "RenderState.h"
diff --git a/src/lib/marble/TileId.cpp b/src/lib/marble/TileId.cpp
index d408d7f..a494288 100644
--- a/src/lib/marble/TileId.cpp
+++ b/src/lib/marble/TileId.cpp
@@ -13,6 +13,8 @@
#include "TileId.h"
#include "MarbleMath.h"
+#include "GeoDataLatLonBox.h"
+#include "GeoSceneTileDataset.h"
#include <QDebug>
diff --git a/src/lib/marble/TileId.h b/src/lib/marble/TileId.h
index ce94078..04fcab0 100644
--- a/src/lib/marble/TileId.h
+++ b/src/lib/marble/TileId.h
@@ -13,9 +13,6 @@
#define MARBLE_TILEID_H
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataLatLonBox.h"
-#include "GeoSceneTextureTileDataset.h"
#include <QHash>
@@ -24,6 +21,8 @@ class QString;
namespace Marble
{
class GeoDataCoordinates;
+class GeoSceneTileDataset;
+class GeoDataLatLonBox;
class MARBLE_EXPORT TileId
{
diff --git a/src/lib/marble/VectorTileModel.h b/src/lib/marble/VectorTileModel.h
index 4d9e26d..45951af 100644
--- a/src/lib/marble/VectorTileModel.h
+++ b/src/lib/marble/VectorTileModel.h
@@ -18,6 +18,7 @@
#include <QMap>
#include "TileId.h"
+#include "GeoDataLatLonBox.h"
class QThreadPool;
@@ -25,7 +26,6 @@ namespace Marble
{
class GeoDataDocument;
-class GeoDataLatLonBox;
class GeoDataTreeModel;
class GeoSceneVectorTileDataset;
class GeoDataObject;