summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-11 13:02:48 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-11 13:02:48 (GMT)
commit1dbc21b5f27ce88898b264ebd804f4793cc91a51 (patch)
tree313411526ee9835d42c935f136c620f8f5056402
parentb658c69cb6ac6facec27da447d68d81811cffae2 (diff)
Remove unused includes
-rw-r--r--examples/cpp/reverse-geocoding/main.cpp1
-rw-r--r--src/lib/marble/GeoGraphicsScene.cpp2
-rw-r--r--src/lib/marble/MarbleMap.cpp1
-rw-r--r--src/lib/marble/RemoveItemEditWidget.cpp1
-rw-r--r--src/lib/marble/SearchRunnerManager.cpp1
-rw-r--r--src/lib/marble/SphericalScanlineTextureMapper.cpp1
-rw-r--r--src/lib/marble/TileLoader.cpp1
-rw-r--r--src/lib/marble/TreeViewDecoratorModel.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataDocument.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataOverlay.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataResourceMap.h2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp1
-rw-r--r--src/plugins/runner/geouri/GeoUriRunner.cpp1
-rw-r--r--src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp2
-rw-r--r--src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/tests/TestTrack.cpp1
-rw-r--r--src/plugins/runner/hostip/HostipRunner.cpp2
-rw-r--r--src/plugins/runner/kml/KmlParser.cpp1
-rw-r--r--src/plugins/runner/latlon/LatLonRunner.cpp1
-rw-r--r--src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp1
-rw-r--r--src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp1
-rw-r--r--src/plugins/runner/monav/MonavPlugin.cpp1
-rw-r--r--src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp1
-rw-r--r--src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp1
-rw-r--r--tests/TestCamera.cpp2
-rw-r--r--tests/TestGxTimeSpan.cpp1
-rw-r--r--tests/TestGxTimeStamp.cpp1
-rw-r--r--tests/TestLatLonQuad.cpp1
-rw-r--r--tests/TestModel.cpp1
-rw-r--r--tests/TestTimeSpan.cpp1
-rw-r--r--tests/TestTimeStamp.cpp1
-rw-r--r--tests/TestTour.cpp1
-rw-r--r--tools/osm-addresses/OsmParser.cpp2
-rw-r--r--tools/poly2kml/main.cpp1
-rw-r--r--tools/vectorosm-tilecreator/WayChunk.cpp1
61 files changed, 4 insertions, 69 deletions
diff --git a/examples/cpp/reverse-geocoding/main.cpp b/examples/cpp/reverse-geocoding/main.cpp
index 0e07094..9d3a7b8 100644
--- a/examples/cpp/reverse-geocoding/main.cpp
+++ b/examples/cpp/reverse-geocoding/main.cpp
@@ -14,7 +14,6 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
#include <marble/ReverseGeocodingRunnerManager.h>
-#include <marble/GeoDataPlacemark.h>
using namespace Marble;
diff --git a/src/lib/marble/GeoGraphicsScene.cpp b/src/lib/marble/GeoGraphicsScene.cpp
index 584ae84..0150f27 100644
--- a/src/lib/marble/GeoGraphicsScene.cpp
+++ b/src/lib/marble/GeoGraphicsScene.cpp
@@ -11,9 +11,7 @@
#include "GeoGraphicsScene.h"
#include "GeoDataFeature.h"
-#include "GeoDataGroundOverlay.h"
#include "GeoDataLatLonAltBox.h"
-#include "GeoDataPhotoOverlay.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
index 7de325f..1fc4500 100644
--- a/src/lib/marble/MarbleMap.cpp
+++ b/src/lib/marble/MarbleMap.cpp
@@ -51,7 +51,6 @@
#include "GeoSceneTextureTileDataset.h"
#include "GeoSceneZoom.h"
#include "GeoDataDocument.h"
-#include "GeoDataPlacemark.h"
#include "GeoDataFeature.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
diff --git a/src/lib/marble/RemoveItemEditWidget.cpp b/src/lib/marble/RemoveItemEditWidget.cpp
index 00a79be..e4e3bf4 100644
--- a/src/lib/marble/RemoveItemEditWidget.cpp
+++ b/src/lib/marble/RemoveItemEditWidget.cpp
@@ -16,7 +16,6 @@
#include "RemoveItemEditWidget.h"
#include "MarbleWidget.h"
#include "geodata/data/GeoDataAnimatedUpdate.h"
-#include "geodata/data/GeoDataFeature.h"
#include "GeoDataTypes.h"
#include "GeoDataUpdate.h"
#include "GeoDataDelete.h"
diff --git a/src/lib/marble/SearchRunnerManager.cpp b/src/lib/marble/SearchRunnerManager.cpp
index a9921cf..d09c974 100644
--- a/src/lib/marble/SearchRunnerManager.cpp
+++ b/src/lib/marble/SearchRunnerManager.cpp
@@ -17,7 +17,6 @@
#include "MarbleModel.h"
#include "MarbleMath.h"
#include "Planet.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "PluginManager.h"
#include "ParseRunnerPlugin.h"
diff --git a/src/lib/marble/SphericalScanlineTextureMapper.cpp b/src/lib/marble/SphericalScanlineTextureMapper.cpp
index 754d412..d2f99d4 100644
--- a/src/lib/marble/SphericalScanlineTextureMapper.cpp
+++ b/src/lib/marble/SphericalScanlineTextureMapper.cpp
@@ -20,7 +20,6 @@
#include "MarbleGlobal.h"
#include "GeoPainter.h"
#include "GeoDataPolygon.h"
-#include "GeoDataDocument.h"
#include "MarbleDebug.h"
#include "Quaternion.h"
#include "ScanlineTextureMapperContext.h"
diff --git a/src/lib/marble/TileLoader.cpp b/src/lib/marble/TileLoader.cpp
index 9410eb0..35fb650 100644
--- a/src/lib/marble/TileLoader.cpp
+++ b/src/lib/marble/TileLoader.cpp
@@ -31,7 +31,6 @@
#include "GeoSceneTypes.h"
#include "GeoSceneVectorTileDataset.h"
#include "GeoDataDocument.h"
-#include "GeoDataContainer.h"
#include "HttpDownloadManager.h"
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/src/lib/marble/TreeViewDecoratorModel.cpp b/src/lib/marble/TreeViewDecoratorModel.cpp
index 0c01da9..3701dd9 100644
--- a/src/lib/marble/TreeViewDecoratorModel.cpp
+++ b/src/lib/marble/TreeViewDecoratorModel.cpp
@@ -16,7 +16,6 @@
#include "GeoDataStyle.h"
#include "GeoDataListStyle.h"
#include "GeoDataItemIcon.h"
-#include "GeoDataTour.h"
#include "MarblePlacemarkModel.h"
#include <QImage>
diff --git a/src/lib/marble/geodata/data/GeoDataDocument.cpp b/src/lib/marble/geodata/data/GeoDataDocument.cpp
index 1101bbb..d7546a3 100644
--- a/src/lib/marble/geodata/data/GeoDataDocument.cpp
+++ b/src/lib/marble/geodata/data/GeoDataDocument.cpp
@@ -23,7 +23,6 @@
#include "GeoDataDocument.h"
#include "GeoDataDocument_p.h"
-#include "GeoDataFolder.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataNetworkLinkControl.h"
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.cpp b/src/lib/marble/geodata/data/GeoDataFeature.cpp
index bff478b..e52a25c 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/marble/geodata/data/GeoDataFeature.cpp
@@ -24,7 +24,6 @@
#include "GeoDataContainer.h"
#include "GeoDataDocument.h"
-#include "GeoDataFolder.h"
#include "GeoDataRegion.h"
#include "GeoDataCamera.h"
diff --git a/src/lib/marble/geodata/data/GeoDataOverlay.cpp b/src/lib/marble/geodata/data/GeoDataOverlay.cpp
index b97f773..bdd80ec 100644
--- a/src/lib/marble/geodata/data/GeoDataOverlay.cpp
+++ b/src/lib/marble/geodata/data/GeoDataOverlay.cpp
@@ -11,8 +11,6 @@
#include "GeoDataOverlay.h"
#include "GeoDataOverlay_p.h"
-#include "GeoDataDocument.h"
-
namespace Marble {
GeoDataOverlay::GeoDataOverlay()
diff --git a/src/lib/marble/geodata/data/GeoDataResourceMap.h b/src/lib/marble/geodata/data/GeoDataResourceMap.h
index 05f2a68..01507f3 100644
--- a/src/lib/marble/geodata/data/GeoDataResourceMap.h
+++ b/src/lib/marble/geodata/data/GeoDataResourceMap.h
@@ -11,7 +11,7 @@
#ifndef GEODATARESOURCEMAP_H
#define GEODATARESOURCEMAP_H
-#include "GeoDataDocument.h"
+#include "GeoDocument.h"
#include "MarbleGlobal.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
index f298064..3f8dc19 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCameraTagHandler.cpp
@@ -16,7 +16,7 @@
#include "KmlObjectTagHandler.h"
#include "GeoDataCamera.h"
#include "GeoParser.h"
-#include "GeoDataContainer.h"
+#include "GeoDataFeature.h"
#include "GeoDataFlyTo.h"
namespace Marble
diff --git a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
index 6201909..3218c5e 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlColorModeTagHandler.cpp
@@ -24,7 +24,6 @@
#include "MarbleDebug.h"
#include "KmlElementDictionary.h"
#include "GeoDataColorStyle.h"
-#include "GeoDataFeature.h"
#include "GeoParser.h"
namespace Marble
diff --git a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
index 02afe35..091abb0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlCoordinatesTagHandler.cpp
@@ -33,7 +33,6 @@
#include "GeoDataLineString.h"
#include "GeoDataLinearRing.h"
#include "GeoDataMultiGeometry.h"
-#include "GeoDataPhotoOverlay.h"
#include "GeoDataLatLonQuad.h"
#include "GeoParser.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
index 6d276fe..89e2fa8 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlDocumentTagHandler.cpp
@@ -26,7 +26,6 @@
#include "KmlElementDictionary.h"
#include "KmlObjectTagHandler.h"
#include "GeoDataDocument.h"
-#include "GeoDataFolder.h"
#include "GeoDataParser.h"
namespace Marble
diff --git a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
index c1ed854..764dec7 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlItemIconTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GeoDataListStyle.h"
#include "GeoDataItemIcon.h"
-#include "GeoDataContainer.h"
#include "GeoDataParser.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
index f64ead8..5d3294e 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinkTagHandler.cpp
@@ -16,7 +16,6 @@
#include "KmlObjectTagHandler.h"
#include "GeoDataLink.h"
#include "GeoDataNetworkLink.h"
-#include "GeoDataDocument.h"
#include "GeoDataModel.h"
#include "GeoDataParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
index 1c191d6..2cf1cb1 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLookAtTagHandler.cpp
@@ -14,7 +14,7 @@
#include "KmlElementDictionary.h"
#include "GeoDataLookAt.h"
#include "GeoParser.h"
-#include "GeoDataContainer.h"
+#include "GeoDataFeature.h"
#include "GeoDataFlyTo.h"
namespace Marble
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
index a4d2a22..d333aad 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMarblePlacemarkTagHandler.cpp
@@ -29,7 +29,6 @@
#include "GeoParser.h"
#include "GeoDataPlacemark.h"
#include "GeoDataContainer.h"
-#include "GeoDataDocument.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
index a3f0073..e8c02b2 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNetworkLinkTagHandler.cpp
@@ -12,7 +12,6 @@
#include "GeoDataNetworkLink.h"
#include "GeoDataContainer.h"
-#include "GeoDataFolder.h"
#include "GeoDataDocument.h"
#include "GeoDataParser.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
index 35b3017..903e31a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp
@@ -26,7 +26,6 @@
#include "KmlElementDictionary.h"
#include "KmlObjectTagHandler.h"
#include "GeoDataContainer.h"
-#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataDocument.h"
#include "GeoDataParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
index c0bc256..7de61c0 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSnippetTagHandler.cpp
@@ -11,7 +11,7 @@
#include "KmlSnippetTagHandler.h"
#include "KmlElementDictionary.h"
-#include "GeoDataNetworkLinkControl.h"
+#include "GeoDataFeature.h"
#include "GeoDataParser.h"
#include "GeoDataSnippet.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp
index e67ab5b..8819d61 100644
--- a/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlLinkTagWriter.cpp
@@ -10,7 +10,6 @@
#include "KmlLinkTagWriter.h"
-#include "GeoDataNetworkLink.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/plugins/runner/geouri/GeoUriRunner.cpp b/src/plugins/runner/geouri/GeoUriRunner.cpp
index 8892555..236f659 100644
--- a/src/plugins/runner/geouri/GeoUriRunner.cpp
+++ b/src/plugins/runner/geouri/GeoUriRunner.cpp
@@ -9,7 +9,6 @@
#include "GeoUriRunner.h"
-#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataCoordinates.h"
#include "GeoUriParser.h"
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
index ada3132..c2c9fea 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
@@ -16,7 +16,6 @@
#include "routing/RouteRequest.h"
#include "routing/instructions/WaypointParser.h"
#include "routing/instructions/InstructionTransformation.h"
-#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
index 1cdbb8e..5ff6a6c 100644
--- a/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXTrackPointExtensionTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPoint.h"
#include "GeoDataTrack.h"
#include "GeoDataExtendedData.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
index 719f643..6858644 100644
--- a/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXcmtTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
// type is used in wpt, rte and trk to provide some sort of keyword, like "Geocache/traditional cache",
diff --git a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
index 98e9fce..2156625 100644
--- a/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXdescTagHandler.cpp
@@ -15,10 +15,8 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
-#include "GeoDataFolder.h"
namespace Marble
{
diff --git a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
index d4caa02..cfe3e0a 100644
--- a/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXeleTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPoint.h"
#include "GeoDataTrack.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
index 69e97e1..dc6bb52 100644
--- a/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXextensionsTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPoint.h"
#include "GeoDataTrack.h"
#include "GeoDataExtendedData.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
index 28d7108..b94cd01 100644
--- a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
#include "GeoDataTrack.h"
#include "GeoDataSimpleArrayData.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
index bcc29e6..ea86976 100644
--- a/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXlinkTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
index 15566fc..1e6b89a 100644
--- a/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXnameTagHandler.cpp
@@ -23,10 +23,8 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
-#include "GeoDataFolder.h"
namespace Marble
{
diff --git a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
index ab4c698..fed9aa1 100644
--- a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
@@ -24,7 +24,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
#include "GeoDataDocument.h"
-#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
#include "GeoDataLineString.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
index f0209b9..44bc4cc 100644
--- a/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXrteptTagHandler.cpp
@@ -26,7 +26,6 @@
#include "GeoDataLineString.h"
#include "GeoDataCoordinates.h"
#include "GeoDataPlacemark.h"
-#include "GeoDataFolder.h"
#include "GeoDataStyle.h"
namespace Marble
diff --git a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
index 6213e14..e7326ca 100644
--- a/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtimeTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPoint.h"
#include "GeoDataTrack.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
index ea9a5bd..c9acf04 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
@@ -23,7 +23,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
#include "GeoDataMultiGeometry.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
index a26d1c1..942996c 100644
--- a/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtypeTagHandler.cpp
@@ -14,10 +14,8 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
-#include "GeoDataFolder.h"
namespace Marble
{
diff --git a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
index 1388177..be8219c 100644
--- a/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXurlTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
index 1b38387..96737d8 100644
--- a/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXurlnameTagHandler.cpp
@@ -14,7 +14,6 @@
#include "GPXElementDictionary.h"
#include "GeoParser.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
diff --git a/src/plugins/runner/gpx/tests/TestTrack.cpp b/src/plugins/runner/gpx/tests/TestTrack.cpp
index 58efd0a..aa7ede3 100644
--- a/src/plugins/runner/gpx/tests/TestTrack.cpp
+++ b/src/plugins/runner/gpx/tests/TestTrack.cpp
@@ -18,7 +18,6 @@
#include <GeoDataDocument.h>
#include <GeoDataPlacemark.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include <GeoDataTrack.h>
#include <GeoDataExtendedData.h>
#include <GeoDataSimpleArrayData.h>
diff --git a/src/plugins/runner/hostip/HostipRunner.cpp b/src/plugins/runner/hostip/HostipRunner.cpp
index 72de826..0de45a3 100644
--- a/src/plugins/runner/hostip/HostipRunner.cpp
+++ b/src/plugins/runner/hostip/HostipRunner.cpp
@@ -10,8 +10,6 @@
#include "HostipRunner.h"
#include "MarbleDebug.h"
-#include "GeoDataDocument.h"
-#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include <QString>
diff --git a/src/plugins/runner/kml/KmlParser.cpp b/src/plugins/runner/kml/KmlParser.cpp
index f16c30e..1973dd7 100644
--- a/src/plugins/runner/kml/KmlParser.cpp
+++ b/src/plugins/runner/kml/KmlParser.cpp
@@ -9,7 +9,6 @@
#include "KmlParser.h"
#include "KmlElementDictionary.h"
-#include "GeoDataDocument.h"
namespace Marble {
diff --git a/src/plugins/runner/latlon/LatLonRunner.cpp b/src/plugins/runner/latlon/LatLonRunner.cpp
index 51719be..169ae60 100644
--- a/src/plugins/runner/latlon/LatLonRunner.cpp
+++ b/src/plugins/runner/latlon/LatLonRunner.cpp
@@ -9,7 +9,6 @@
#include "LatLonRunner.h"
-#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataCoordinates.h"
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
index 0d5d896..998854e 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -13,7 +13,6 @@
#include "DatabaseQuery.h"
#include "MarbleDebug.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
diff --git a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
index 8cb6333..be221c6 100644
--- a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
+++ b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
@@ -13,7 +13,6 @@
#include "MarbleModel.h"
#include "MarblePlacemarkModel.h"
-#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataCoordinates.h"
#include "GeoDataLatLonAltBox.h"
diff --git a/src/plugins/runner/monav/MonavPlugin.cpp b/src/plugins/runner/monav/MonavPlugin.cpp
index 411df92..eac575c 100644
--- a/src/plugins/runner/monav/MonavPlugin.cpp
+++ b/src/plugins/runner/monav/MonavPlugin.cpp
@@ -19,7 +19,6 @@
#include "MarbleDirs.h"
#include "MarbleDebug.h"
#include "GeoDataLatLonBox.h"
-#include "GeoDataDocument.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
#include "routing/RouteRequest.h"
diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
index 360b9a8..d86e3ed 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
@@ -12,7 +12,6 @@
#include "MarbleDebug.h"
#include "MarbleLocale.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
#include "GeoDataData.h"
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index 33d80cf..c1491d7 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -12,7 +12,6 @@
#include "MarbleDebug.h"
#include "MarbleLocale.h"
-#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
#include "GeoDataData.h"
diff --git a/tests/TestCamera.cpp b/tests/TestCamera.cpp
index 3b6d948..ab4a876 100644
--- a/tests/TestCamera.cpp
+++ b/tests/TestCamera.cpp
@@ -11,9 +11,7 @@
#include <QObject>
#include <GeoDataDocument.h>
-#include <GeoDataTour.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include <GeoDataCamera.h>
#include "TestUtils.h"
diff --git a/tests/TestGxTimeSpan.cpp b/tests/TestGxTimeSpan.cpp
index 8ce280e..c16db8b 100644
--- a/tests/TestGxTimeSpan.cpp
+++ b/tests/TestGxTimeSpan.cpp
@@ -14,7 +14,6 @@
#include <GeoDataTimeSpan.h>
#include <GeoDataTimeStamp.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include "TestUtils.h"
#include <GeoDataLookAt.h>
#include <GeoDataCamera.h>
diff --git a/tests/TestGxTimeStamp.cpp b/tests/TestGxTimeStamp.cpp
index e03fe5c..0079cab 100644
--- a/tests/TestGxTimeStamp.cpp
+++ b/tests/TestGxTimeStamp.cpp
@@ -15,7 +15,6 @@
#include <GeoDataTimeStamp.h>
#include <GeoDataCamera.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include "TestUtils.h"
using namespace Marble;
diff --git a/tests/TestLatLonQuad.cpp b/tests/TestLatLonQuad.cpp
index bcd085b..b7dd11b 100644
--- a/tests/TestLatLonQuad.cpp
+++ b/tests/TestLatLonQuad.cpp
@@ -12,7 +12,6 @@
#include "TestUtils.h"
#include <GeoDataDocument.h>
-#include <GeoDataFolder.h>
#include <MarbleDebug.h>
#include <GeoDataGroundOverlay.h>
#include <GeoDataLatLonQuad.h>
diff --git a/tests/TestModel.cpp b/tests/TestModel.cpp
index 3de06fe..0512ad0 100644
--- a/tests/TestModel.cpp
+++ b/tests/TestModel.cpp
@@ -16,7 +16,6 @@
#include <GeoDataOrientation.h>
#include <GeoDataScale.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include <GeoDataModel.h>
#include <GeoDataLink.h>
#include <GeoDataLocation.h>
diff --git a/tests/TestTimeSpan.cpp b/tests/TestTimeSpan.cpp
index 271ebad..86e4af7 100644
--- a/tests/TestTimeSpan.cpp
+++ b/tests/TestTimeSpan.cpp
@@ -16,7 +16,6 @@
#include <GeoDataTimeStamp.h>
#include <GeoDataCamera.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include "TestUtils.h"
using namespace Marble;
diff --git a/tests/TestTimeStamp.cpp b/tests/TestTimeStamp.cpp
index a2af6af..bf93eb3 100644
--- a/tests/TestTimeStamp.cpp
+++ b/tests/TestTimeStamp.cpp
@@ -15,7 +15,6 @@
#include <GeoDataTimeStamp.h>
#include <GeoDataCamera.h>
#include <MarbleDebug.h>
-#include <GeoDataFolder.h>
#include "TestUtils.h"
using namespace Marble;
diff --git a/tests/TestTour.cpp b/tests/TestTour.cpp
index 4eafdc0..3bcda47 100644
--- a/tests/TestTour.cpp
+++ b/tests/TestTour.cpp
@@ -16,7 +16,6 @@
#include <GeoDataTourControl.h>
#include <MarbleDebug.h>
#include <GeoDataFolder.h>
-#include <GeoDataScreenOverlay.h>
#include <GeoDataAnimatedUpdate.h>
#include <QObject>
diff --git a/tools/osm-addresses/OsmParser.cpp b/tools/osm-addresses/OsmParser.cpp
index f747a87..1b30a1a 100644
--- a/tools/osm-addresses/OsmParser.cpp
+++ b/tools/osm-addresses/OsmParser.cpp
@@ -16,13 +16,11 @@
#include "GeoDataLineString.h"
#include "GeoDataPolygon.h"
#include "GeoDataDocument.h"
-#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataMultiGeometry.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataLineStyle.h"
-#include "GeoDataFeature.h"
#include "geodata/writer/GeoDataDocumentWriter.h"
#include <GeoDataExtendedData.h>
#include <GeoDataData.h>
diff --git a/tools/poly2kml/main.cpp b/tools/poly2kml/main.cpp
index 724de52..b897dcf 100644
--- a/tools/poly2kml/main.cpp
+++ b/tools/poly2kml/main.cpp
@@ -18,7 +18,6 @@
#include "geodata/data/GeoDataLineString.h"
#include "geodata/data/GeoDataLinearRing.h"
#include "geodata/data/GeoDataDocument.h"
-#include "geodata/data/GeoDataFolder.h"
#include "geodata/data/GeoDataPlacemark.h"
#include "geodata/data/GeoDataMultiGeometry.h"
#include "geodata/data/GeoDataStyle.h"
diff --git a/tools/vectorosm-tilecreator/WayChunk.cpp b/tools/vectorosm-tilecreator/WayChunk.cpp
index 69399e1..5199905 100644
--- a/tools/vectorosm-tilecreator/WayChunk.cpp
+++ b/tools/vectorosm-tilecreator/WayChunk.cpp
@@ -14,7 +14,6 @@
#include "WayChunk.h"
#include "GeoDataCoordinates.h"
-#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataLineString.h"
#include "OsmPlacemarkData.h"