summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-21 01:22:59 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-21 02:03:07 (GMT)
commit56c850054debe68a920d94fe712af2f69867d071 (patch)
treea932597ae1310ad4f119c852582de5a3a5a3ec19
parent735cc620419da6f9eec99bbfa72181c7590d133d (diff)
Big cleanup of Marble classes includes in headers of libmarblewidget
-rw-r--r--examples/cpp/marble-game/ClickOnThat.cpp4
-rw-r--r--examples/cpp/marble-game/CountryByShape.cpp1
-rw-r--r--examples/cpp/squad-interpolation/squad-interpolation.cpp2
-rw-r--r--examples/cpp/tour-preview/tour-preview.cpp1
-rw-r--r--src/apps/marble-kde/marble_part.cpp1
-rw-r--r--src/apps/marble-kde/marble_part.h2
-rw-r--r--src/apps/marble-qt/QtMainWindow.cpp2
-rw-r--r--src/apps/marble-ui/ControlView.cpp1
-rw-r--r--src/lib/marble/AnimatedUpdateTrack.cpp2
-rw-r--r--src/lib/marble/AnimatedUpdateTrack.h9
-rw-r--r--src/lib/marble/AutoNavigation.h3
-rw-r--r--src/lib/marble/BookmarkManager.cpp1
-rw-r--r--src/lib/marble/BookmarkManagerDialog.cpp2
-rw-r--r--src/lib/marble/BranchFilterProxyModel.cpp2
-rw-r--r--src/lib/marble/BranchFilterProxyModel.h4
-rw-r--r--src/lib/marble/DownloadRegion.cpp1
-rw-r--r--src/lib/marble/DownloadRegion.h3
-rw-r--r--src/lib/marble/DownloadRegionDialog.cpp1
-rw-r--r--src/lib/marble/DownloadRegionDialog.h4
-rw-r--r--src/lib/marble/EditBookmarkDialog.cpp3
-rw-r--r--src/lib/marble/EditBookmarkDialog.h5
-rw-r--r--src/lib/marble/EditPlacemarkDialog.cpp2
-rw-r--r--src/lib/marble/ElevationModel.h2
-rw-r--r--src/lib/marble/EquirectScanlineTextureMapper.h1
-rw-r--r--src/lib/marble/FileLoader.cpp1
-rw-r--r--src/lib/marble/FileLoader.h3
-rw-r--r--src/lib/marble/FileViewWidget.cpp1
-rw-r--r--src/lib/marble/FileViewWidget.h2
-rw-r--r--src/lib/marble/FlyToEditWidget.cpp1
-rw-r--r--src/lib/marble/GeoDataTreeModel.cpp4
-rw-r--r--src/lib/marble/GeoGraphicsScene.cpp2
-rw-r--r--src/lib/marble/GeoPainter.cpp1
-rw-r--r--src/lib/marble/GoToDialog.cpp2
-rw-r--r--src/lib/marble/GoToDialog.h2
-rw-r--r--src/lib/marble/HttpDownloadManager.h1
-rw-r--r--src/lib/marble/LayerInterface.cpp2
-rw-r--r--src/lib/marble/LayerInterface.h5
-rw-r--r--src/lib/marble/LayerManager.h3
-rw-r--r--src/lib/marble/MapWizard.h1
-rw-r--r--src/lib/marble/MarbleAbstractPresenter.cpp3
-rw-r--r--src/lib/marble/MarbleAbstractPresenter.h2
-rw-r--r--src/lib/marble/MarbleInputHandler.h2
-rw-r--r--src/lib/marble/MarbleLegendBrowser.cpp1
-rw-r--r--src/lib/marble/MarbleMap.cpp2
-rw-r--r--src/lib/marble/MarbleMap.h3
-rw-r--r--src/lib/marble/MarbleModel.cpp1
-rw-r--r--src/lib/marble/MarbleModel.h3
-rw-r--r--src/lib/marble/MarblePhysics.cpp1
-rw-r--r--src/lib/marble/MarblePhysics.h5
-rw-r--r--src/lib/marble/MarblePlacemarkModel.cpp4
-rw-r--r--src/lib/marble/MarblePlacemarkModel.h5
-rw-r--r--src/lib/marble/MarbleWidget.cpp2
-rw-r--r--src/lib/marble/MarbleWidget.h4
-rw-r--r--src/lib/marble/MarbleWidgetPopupMenu.cpp4
-rw-r--r--src/lib/marble/MercatorScanlineTextureMapper.h2
-rw-r--r--src/lib/marble/MergedLayerDecorator.cpp1
-rw-r--r--src/lib/marble/MergedLayerDecorator.h2
-rw-r--r--src/lib/marble/ParsingRunnerManager.h1
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp3
-rw-r--r--src/lib/marble/PlacemarkPositionProviderPlugin.h1
-rw-r--r--src/lib/marble/PlaybackAnimatedUpdateItem.cpp4
-rw-r--r--src/lib/marble/PlaybackFlyToItem.cpp1
-rw-r--r--src/lib/marble/PlaybackFlyToItem.h5
-rw-r--r--src/lib/marble/PlaybackWaitItem.cpp2
-rw-r--r--src/lib/marble/PlaybackWaitItem.h4
-rw-r--r--src/lib/marble/PositionProviderPluginInterface.h4
-rw-r--r--src/lib/marble/PositionTracking.cpp3
-rw-r--r--src/lib/marble/PositionTracking.h1
-rw-r--r--src/lib/marble/RemoveItemEditWidget.cpp2
-rw-r--r--src/lib/marble/RenderPlugin.cpp1
-rw-r--r--src/lib/marble/RouteSimulationPositionProviderPlugin.cpp1
-rw-r--r--src/lib/marble/RouteSimulationPositionProviderPlugin.h1
-rw-r--r--src/lib/marble/RoutingRunner.cpp1
-rw-r--r--src/lib/marble/RoutingRunner.h2
-rw-r--r--src/lib/marble/SearchInputWidget.cpp1
-rw-r--r--src/lib/marble/SearchRunner.h3
-rw-r--r--src/lib/marble/SearchWidget.cpp3
-rw-r--r--src/lib/marble/SerialTrack.h5
-rw-r--r--src/lib/marble/SoundTrack.cpp2
-rw-r--r--src/lib/marble/SoundTrack.h6
-rw-r--r--src/lib/marble/StackedTileLoader.h2
-rw-r--r--src/lib/marble/StyleBuilder.cpp5
-rw-r--r--src/lib/marble/StyleBuilder.h1
-rw-r--r--src/lib/marble/TextureColorizer.cpp2
-rw-r--r--src/lib/marble/TextureColorizer.h2
-rw-r--r--src/lib/marble/TextureMapperInterface.h2
-rw-r--r--src/lib/marble/TextureTile.h2
-rw-r--r--src/lib/marble/TileLoader.cpp1
-rw-r--r--src/lib/marble/TileLoader.h4
-rw-r--r--src/lib/marble/TileScalingTextureMapper.h2
-rw-r--r--src/lib/marble/TourItemDelegate.cpp5
-rw-r--r--src/lib/marble/TourPlayback.cpp4
-rw-r--r--src/lib/marble/TourWidget.cpp8
-rw-r--r--src/lib/marble/TreeViewDecoratorModel.cpp2
-rw-r--r--src/lib/marble/ViewportParams.cpp1
-rw-r--r--src/lib/marble/ViewportParams.h6
-rw-r--r--src/lib/marble/VisiblePlacemark.cpp2
-rw-r--r--src/lib/marble/cloudsync/BookmarkSyncManager.cpp1
-rw-r--r--src/lib/marble/cloudsync/BookmarkSyncManager.h1
-rw-r--r--src/lib/marble/cloudsync/CloudRouteModel.cpp2
-rw-r--r--src/lib/marble/cloudsync/CloudRouteModel.h4
-rw-r--r--src/lib/marble/cloudsync/CloudRoutesDialog.cpp1
-rw-r--r--src/lib/marble/cloudsync/CloudRoutesDialog.h5
-rw-r--r--src/lib/marble/cloudsync/ConflictDialog.h6
-rw-r--r--src/lib/marble/cloudsync/MergeItem.h2
-rw-r--r--src/lib/marble/cloudsync/OwncloudSyncBackend.cpp2
-rw-r--r--src/lib/marble/cloudsync/OwncloudSyncBackend.h4
-rw-r--r--src/lib/marble/cloudsync/RouteItemDelegate.cpp2
-rw-r--r--src/lib/marble/cloudsync/RouteItemDelegate.h3
-rw-r--r--src/lib/marble/cloudsync/RouteSyncManager.cpp2
-rw-r--r--src/lib/marble/declarative/DeclarativeDataPlugin.cpp2
-rw-r--r--src/lib/marble/declarative/MarbleQuickItem.cpp2
-rw-r--r--src/lib/marble/declarative/MarbleQuickItem.h5
-rw-r--r--src/lib/marble/declarative/Navigation.cpp2
-rw-r--r--src/lib/marble/declarative/Navigation.h1
-rw-r--r--src/lib/marble/declarative/Placemark.h3
-rw-r--r--src/lib/marble/declarative/Routing.cpp1
-rw-r--r--src/lib/marble/declarative/Routing.h1
-rw-r--r--src/lib/marble/declarative/SearchBackend.cpp2
-rw-r--r--src/lib/marble/declarative/SearchBackend.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataAbstractView.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataAbstractView.h7
-rw-r--r--src/lib/marble/geodata/data/GeoDataAlias.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataCamera.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataCamera_p.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataContainer.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataDocument.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataExtendedData.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature_p.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFlyTo.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataGeometry.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataGroundOverlay.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLatLonAltBox.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLineString.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataListStyle.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataListStyle.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLocation.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataLookAt.cpp3
-rw-r--r--src/lib/marble/geodata/data/GeoDataLookAt_p.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataModel.cpp5
-rw-r--r--src/lib/marble/geodata/data/GeoDataModel.h12
-rw-r--r--src/lib/marble/geodata/data/GeoDataNetworkLink.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataNetworkLink.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataOrientation.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp3
-rw-r--r--src/lib/marble/geodata/data/GeoDataPhotoOverlay.h6
-rw-r--r--src/lib/marble/geodata/data/GeoDataPlacemark.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataPlacemark.h10
-rw-r--r--src/lib/marble/geodata/data/GeoDataPlacemark_p.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataPolygon.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataPolygon_p.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataRegion.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataRegion.h5
-rw-r--r--src/lib/marble/geodata/data/GeoDataRegion_p.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataResourceMap.cpp2
-rw-r--r--src/lib/marble/geodata/data/GeoDataResourceMap.h4
-rw-r--r--src/lib/marble/geodata/data/GeoDataScale.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataSchema.cpp4
-rw-r--r--src/lib/marble/geodata/data/GeoDataSchema.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataSchemaData.cpp4
-rw-r--r--src/lib/marble/geodata/data/GeoDataSchemaData.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataStyle.cpp6
-rw-r--r--src/lib/marble/geodata/data/GeoDataStyle.h12
-rw-r--r--src/lib/marble/geodata/data/GeoDataStyleMap.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataTimeSpan.h3
-rw-r--r--src/lib/marble/geodata/data/GeoDataTimeStamp.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataTour.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataTrack.h2
-rw-r--r--src/lib/marble/geodata/data/GeoDataUpdate.cpp4
-rw-r--r--src/lib/marble/geodata/data/GeoDataUpdate.h6
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp2
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h2
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp1
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h1
-rw-r--r--src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp4
-rw-r--r--src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp2
-rw-r--r--src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h4
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h3
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h1
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp2
-rw-r--r--src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp1
-rw-r--r--src/lib/marble/geodata/parser/GeoTagHandler.h1
-rw-r--r--src/lib/marble/geodata/scene/GeoSceneTileDataset.h1
-rw-r--r--src/lib/marble/geodata/writer/GeoDataDocumentWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writer/GeoDataDocumentWriter.h3
-rw-r--r--src/lib/marble/geodata/writer/GeoTagWriter.h1
-rw-r--r--src/lib/marble/geodata/writer/GeoWriterBackend.h5
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp5
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp3
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h6
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp6
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h2
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp1
-rw-r--r--src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp3
-rw-r--r--src/lib/marble/graphicsview/BillboardGraphicsItem.h3
-rw-r--r--src/lib/marble/graphicsview/GeoGraphicsItem_p.h1
-rw-r--r--src/lib/marble/graphicsview/ScreenGraphicsItem.h2
-rw-r--r--src/lib/marble/layers/FogLayer.cpp1
-rw-r--r--src/lib/marble/layers/FogLayer.h2
-rw-r--r--src/lib/marble/layers/GeometryLayer.cpp5
-rw-r--r--src/lib/marble/layers/GroundLayer.cpp1
-rw-r--r--src/lib/marble/layers/MarbleSplashLayer.cpp1
-rw-r--r--src/lib/marble/layers/MarbleSplashLayer.h1
-rw-r--r--src/lib/marble/layers/PlacemarkLayer.cpp1
-rw-r--r--src/lib/marble/layers/PlacemarkLayer.h1
-rw-r--r--src/lib/marble/layers/PopupLayer.cpp1
-rw-r--r--src/lib/marble/layers/VectorTileLayer.cpp2
-rw-r--r--src/lib/marble/layers/VectorTileLayer.h10
-rw-r--r--src/lib/marble/osm/OsmObjectManager.cpp2
-rw-r--r--src/lib/marble/osm/OsmObjectManager.h1
-rw-r--r--src/lib/marble/osm/OsmPlacemarkData.h3
-rw-r--r--src/lib/marble/osm/OsmRelationManagerWidget.h1
-rw-r--r--src/lib/marble/osm/OsmTagEditorWidget.h2
-rw-r--r--src/lib/marble/osm/OsmTagEditorWidget_p.cpp2
-rw-r--r--src/lib/marble/projections/AbstractProjection.cpp1
-rw-r--r--src/lib/marble/projections/AbstractProjection.h2
-rw-r--r--src/lib/marble/projections/AzimuthalProjection.cpp1
-rw-r--r--src/lib/marble/projections/CylindricalProjection.cpp1
-rw-r--r--src/lib/marble/projections/EquirectProjection.cpp1
-rw-r--r--src/lib/marble/projections/MercatorProjection.cpp1
-rw-r--r--src/lib/marble/routing/AlternativeRoutesModel.cpp2
-rw-r--r--src/lib/marble/routing/AlternativeRoutesModel.h3
-rw-r--r--src/lib/marble/routing/RouteRequest.h2
-rw-r--r--src/lib/marble/routing/RouteSegment.cpp1
-rw-r--r--src/lib/marble/routing/RoutingInputWidget.cpp3
-rw-r--r--src/lib/marble/routing/RoutingInputWidget.h4
-rw-r--r--src/lib/marble/routing/RoutingLayer.cpp1
-rw-r--r--src/lib/marble/routing/RoutingLayer.h6
-rw-r--r--src/lib/marble/routing/RoutingManager.cpp1
-rw-r--r--src/lib/marble/routing/RoutingManager.h2
-rw-r--r--src/lib/marble/routing/RoutingModel.cpp1
-rw-r--r--src/lib/marble/routing/RoutingModel.h4
-rw-r--r--src/lib/marble/routing/RoutingWidget.cpp7
-rw-r--r--src/lib/marble/routing/RoutingWidget.h3
-rw-r--r--src/lib/marble/routing/VoiceNavigationModel.cpp2
-rw-r--r--src/lib/marble/routing/VoiceNavigationModel.h5
-rw-r--r--src/lib/marble/routing/instructions/RoutingInstruction.cpp1
-rw-r--r--src/plasmarunner/plasmarunner.cpp1
-rw-r--r--src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h2
-rw-r--r--src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h2
-rw-r--r--src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp3
-rw-r--r--src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp3
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.cpp6
-rw-r--r--src/plugins/render/annotate/AnnotatePlugin.h2
-rw-r--r--src/plugins/render/annotate/AreaAnnotation.cpp2
-rw-r--r--src/plugins/render/annotate/EditGroundOverlayDialog.cpp2
-rw-r--r--src/plugins/render/annotate/EditGroundOverlayDialog.h6
-rw-r--r--src/plugins/render/annotate/EditPolygonDialog.cpp5
-rw-r--r--src/plugins/render/annotate/EditPolygonDialog.h6
-rw-r--r--src/plugins/render/annotate/EditPolylineDialog.cpp2
-rw-r--r--src/plugins/render/annotate/GroundOverlayFrame.cpp4
-rw-r--r--src/plugins/render/annotate/GroundOverlayFrame.h5
-rw-r--r--src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp1
-rw-r--r--src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp1
-rw-r--r--src/plugins/render/annotate/MergingPolylineNodesAnimation.h2
-rw-r--r--src/plugins/render/annotate/NodeItemDelegate.cpp3
-rw-r--r--src/plugins/render/annotate/NodeItemDelegate.h3
-rw-r--r--src/plugins/render/annotate/NodeModel.h3
-rw-r--r--src/plugins/render/annotate/PlacemarkTextAnnotation.cpp2
-rw-r--r--src/plugins/render/annotate/SceneGraphicsItem.cpp1
-rw-r--r--src/plugins/render/aprs/AprsObject.h4
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.cpp1
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h1
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp1
-rw-r--r--src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h3
-rw-r--r--src/plugins/render/gpsinfo/GpsInfo.cpp1
-rw-r--r--src/plugins/render/license/License.h2
-rw-r--r--src/plugins/render/mapscale/MapScaleFloatItem.cpp1
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.cpp1
-rw-r--r--src/plugins/render/measure/MeasureToolPlugin.h2
-rw-r--r--src/plugins/render/opendesktop/OpenDesktopItem.h5
-rw-r--r--src/plugins/render/opendesktop/OpenDesktopModel.cpp1
-rw-r--r--src/plugins/render/opendesktop/OpenDesktopModel.h3
-rw-r--r--src/plugins/render/positionmarker/PositionMarker.cpp1
-rw-r--r--src/plugins/render/routing/AudioOutput.cpp1
-rw-r--r--src/plugins/render/routing/AudioOutput.h3
-rw-r--r--src/plugins/render/routing/RoutingPlugin.cpp2
-rw-r--r--src/plugins/render/satellites/SatellitesMSCItem.h1
-rw-r--r--src/plugins/render/satellites/SatellitesModel.cpp3
-rw-r--r--src/plugins/render/satellites/SatellitesTLEItem.cpp2
-rw-r--r--src/plugins/render/satellites/SatellitesTLEItem.h5
-rw-r--r--src/plugins/render/satellites/TrackerPluginItem.h3
-rw-r--r--src/plugins/render/stars/StarsPlugin.h2
-rw-r--r--src/plugins/render/weather/BBCItemGetter.h1
-rw-r--r--src/plugins/render/weather/WeatherItem.h4
-rw-r--r--src/plugins/render/weather/WeatherModel.h3
-rw-r--r--src/plugins/render/weather/WeatherPlugin.cpp1
-rw-r--r--src/plugins/runner/cache/CacheRunner.cpp1
-rw-r--r--src/plugins/runner/cyclestreets/CycleStreetsRunner.cpp2
-rw-r--r--src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp1
-rw-r--r--src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp2
-rw-r--r--src/plugins/runner/gpsbabel/GpsbabelRunner.h3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp3
-rw-r--r--src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp1
-rw-r--r--src/plugins/runner/gpx/tests/TestTrack.cpp1
-rw-r--r--src/plugins/runner/json/JsonParser.cpp2
-rw-r--r--src/plugins/runner/json/JsonParser.h4
-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/mapquest/MapQuestRunner.cpp2
-rw-r--r--src/plugins/runner/monav/MonavMap.cpp2
-rw-r--r--src/plugins/runner/monav/MonavRunner.cpp1
-rw-r--r--src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp1
-rw-r--r--src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp2
-rw-r--r--src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h1
-rw-r--r--src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp3
-rw-r--r--src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.cpp2
-rw-r--r--src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h3
-rw-r--r--src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp1
-rw-r--r--src/plugins/runner/osm/OsmNode.cpp1
-rw-r--r--src/plugins/runner/osm/OsmNode.h3
-rw-r--r--src/plugins/runner/osm/OsmParser.cpp1
-rw-r--r--src/plugins/runner/osm/OsmRelation.cpp2
-rw-r--r--src/plugins/runner/osm/OsmRelation.h3
-rw-r--r--src/plugins/runner/osm/OsmWay.cpp1
-rw-r--r--src/plugins/runner/osm/OsmWay.h3
-rw-r--r--src/plugins/runner/osm/translators/O5mWriter.cpp1
-rw-r--r--src/plugins/runner/osm/translators/O5mWriter.h3
-rw-r--r--src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h2
-rw-r--r--src/plugins/runner/osm/writers/OsmNodeTagWriter.cpp1
-rw-r--r--src/plugins/runner/osm/writers/OsmNodeTagWriter.h3
-rw-r--r--src/plugins/runner/osm/writers/OsmObjectAttributeWriter.cpp1
-rw-r--r--src/plugins/runner/osm/writers/OsmObjectAttributeWriter.h4
-rw-r--r--src/plugins/runner/osm/writers/OsmRelationTagWriter.cpp2
-rw-r--r--src/plugins/runner/osm/writers/OsmTagTagWriter.h2
-rw-r--r--src/plugins/runner/osm/writers/OsmWayTagWriter.cpp1
-rw-r--r--src/plugins/runner/pn2/Pn2Runner.cpp3
-rw-r--r--src/plugins/runner/pnt/PntRunner.cpp1
-rw-r--r--src/plugins/runner/routino/RoutinoRunner.cpp2
-rw-r--r--src/plugins/runner/shp/ShpRunner.cpp3
-rw-r--r--src/plugins/runner/yours/YoursRunner.cpp1
-rw-r--r--src/thumbnailer/thumbnailer.h5
-rw-r--r--tests/PlacemarkPositionProviderPluginTest.cpp1
-rw-r--r--tests/PositionTrackingTest.cpp1
-rw-r--r--tests/TestEquality.cpp2
-rw-r--r--tests/TestFeatureDetach.cpp1
-rw-r--r--tests/TestGeoDataPack.cpp1
-rw-r--r--tests/TestGeometryDetach.cpp1
-rw-r--r--tests/TestGxTimeSpan.cpp2
-rw-r--r--tests/TestListStyle.cpp1
-rw-r--r--tests/TestModel.cpp3
-rw-r--r--tests/TestNetworkLink.cpp1
-rw-r--r--tests/TestTimeSpan.cpp1
-rw-r--r--tests/TestTour.cpp1
-rw-r--r--tools/kml2cache/kml2cache.cpp1
-rw-r--r--tools/osm-addresses/OsmParser.cpp4
-rw-r--r--tools/osm-addresses/OsmParser.h5
-rw-r--r--tools/osm-addresses/xml/XmlParser.h3
-rw-r--r--tools/poly2kml/main.cpp1
-rw-r--r--tools/shp2pn2/shp2pn2.cpp3
-rw-r--r--tools/vectorosm-tilecreator/BaseFilter.h2
-rw-r--r--tools/vectorosm-tilecreator/NodeReducer.cpp1
-rw-r--r--tools/vectorosm-tilecreator/NodeReducer.h1
-rw-r--r--tools/vectorosm-tilecreator/VectorClipper.cpp3
-rw-r--r--tools/vectorosm-tilecreator/WayChunk.h1
-rw-r--r--tools/vectorosm-tilecreator/WayConcatenator.cpp2
-rw-r--r--tools/vectorosm-tilecreator/main.cpp3
393 files changed, 629 insertions, 302 deletions
diff --git a/examples/cpp/marble-game/ClickOnThat.cpp b/examples/cpp/marble-game/ClickOnThat.cpp
index 6531423..488a3bf 100644
--- a/examples/cpp/marble-game/ClickOnThat.cpp
+++ b/examples/cpp/marble-game/ClickOnThat.cpp
@@ -31,6 +31,10 @@
#include <marble/GeoDataStyle.h>
#include <marble/GeoDataStyleMap.h>
#include <marble/GeoDataIconStyle.h>
+#include <marble/GeoDataLinearRing.h>
+#include <marble/GeoDataPoint.h>
+#include <marble/GeoDataPolygon.h>
+#include <marble/GeoDataMultiGeometry.h>
#include <marble/GeoDataTypes.h>
diff --git a/examples/cpp/marble-game/CountryByShape.cpp b/examples/cpp/marble-game/CountryByShape.cpp
index a88250a..f853947 100644
--- a/examples/cpp/marble-game/CountryByShape.cpp
+++ b/examples/cpp/marble-game/CountryByShape.cpp
@@ -34,6 +34,7 @@
#include <marble/GeoDataMultiGeometry.h>
#include <marble/GeoDataPoint.h>
#include <marble/GeoDataCoordinates.h>
+#include <marble/GeoDataLatLonAltBox.h>
namespace Marble
{
diff --git a/examples/cpp/squad-interpolation/squad-interpolation.cpp b/examples/cpp/squad-interpolation/squad-interpolation.cpp
index ae5393c..77cbf3d 100644
--- a/examples/cpp/squad-interpolation/squad-interpolation.cpp
+++ b/examples/cpp/squad-interpolation/squad-interpolation.cpp
@@ -12,11 +12,13 @@
#include <marble/MarbleWidget.h>
#include <marble/MarbleGlobal.h>
+#include <marble/GeoDataLatLonAltBox.h>
#include <marble/GeoDataDocument.h>
#include <marble/GeoDataPlacemark.h>
#include <marble/GeoDataLineString.h>
#include <marble/GeoDataTreeModel.h>
#include <marble/MarblePlacemarkModel.h>
+#include <marble/GeoDataLinearRing.h>
#include <marble/GeoDataTypes.h>
#include <marble/MarbleMath.h>
#include <marble/ViewportParams.h>
diff --git a/examples/cpp/tour-preview/tour-preview.cpp b/examples/cpp/tour-preview/tour-preview.cpp
index de317c8..ae45c6f 100644
--- a/examples/cpp/tour-preview/tour-preview.cpp
+++ b/examples/cpp/tour-preview/tour-preview.cpp
@@ -33,6 +33,7 @@
#include <QApplication>
#include <QThread>
+#include <QDebug>
#include <cstdio>
diff --git a/src/apps/marble-kde/marble_part.cpp b/src/apps/marble-kde/marble_part.cpp
index b312c0e..c25f369 100644
--- a/src/apps/marble-kde/marble_part.cpp
+++ b/src/apps/marble-kde/marble_part.cpp
@@ -87,6 +87,7 @@
#include "cloudsync/BookmarkSyncManager.h"
#include "MovieCaptureDialog.h"
#include "cloudsync/RouteSyncManager.h"
+#include "cloudsync/CloudSyncManager.h"
// Marble non-library classes
#include "ControlView.h"
diff --git a/src/apps/marble-kde/marble_part.h b/src/apps/marble-kde/marble_part.h
index bea57d9..ae9e890 100644
--- a/src/apps/marble-kde/marble_part.h
+++ b/src/apps/marble-kde/marble_part.h
@@ -17,7 +17,6 @@
#include <kparts/readonlypart.h>
#include <QHash>
#include "MarbleGlobal.h"
-#include "cloudsync/CloudSyncManager.h"
#include <krecentfilesaction.h>
#include <QDomNode>
@@ -43,7 +42,6 @@ namespace Marble
class MovieCaptureDialog;
class ControlView;
class DownloadRegionDialog;
-class RoutingProfilesWidget;
class SunControlWidget;
class TimeControlWidget;
class GeoDataFolder;
diff --git a/src/apps/marble-qt/QtMainWindow.cpp b/src/apps/marble-qt/QtMainWindow.cpp
index 22b0dea..df568f9 100644
--- a/src/apps/marble-qt/QtMainWindow.cpp
+++ b/src/apps/marble-qt/QtMainWindow.cpp
@@ -59,6 +59,7 @@
#include "NewBookmarkFolderDialog.h"
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
+#include "GeoDataLookAt.h"
#include "GeoDataCoordinates.h"
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
@@ -82,6 +83,7 @@
#include "cloudsync/RouteSyncManager.h"
#include "MovieCaptureDialog.h"
#include "DataMigration.h"
+#include "TileCoordsPyramid.h"
namespace
{
diff --git a/src/apps/marble-ui/ControlView.cpp b/src/apps/marble-ui/ControlView.cpp
index 909caf0..9c3f7d8 100644
--- a/src/apps/marble-ui/ControlView.cpp
+++ b/src/apps/marble-ui/ControlView.cpp
@@ -41,6 +41,7 @@
#include "MarbleDBusInterface.h"
#endif
+#include "GeoDataLatLonAltBox.h"
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
#include "GeoUriParser.h"
diff --git a/src/lib/marble/AnimatedUpdateTrack.cpp b/src/lib/marble/AnimatedUpdateTrack.cpp
index d5a4b94..38a4a7b 100644
--- a/src/lib/marble/AnimatedUpdateTrack.cpp
+++ b/src/lib/marble/AnimatedUpdateTrack.cpp
@@ -10,6 +10,8 @@
#include "AnimatedUpdateTrack.h"
+#include "PlaybackAnimatedUpdateItem.h"
+
namespace Marble
{
diff --git a/src/lib/marble/AnimatedUpdateTrack.h b/src/lib/marble/AnimatedUpdateTrack.h
index befd3ee..6efee6b 100644
--- a/src/lib/marble/AnimatedUpdateTrack.h
+++ b/src/lib/marble/AnimatedUpdateTrack.h
@@ -11,14 +11,17 @@
#ifndef ANIMATEDUPDATETRACK_H
#define ANIMATEDUPDATETRACK_H
-#include "PlaybackAnimatedUpdateItem.h"
-#include "GeoDataPlacemark.h"
-
#include <QDateTime>
#include <QTimer>
namespace Marble
{
+
+class GeoDataFeature;
+class GeoDataContainer;
+class GeoDataPlacemark;
+class PlaybackAnimatedUpdateItem;
+
class AnimatedUpdateTrack : public QObject
{
Q_OBJECT
diff --git a/src/lib/marble/AutoNavigation.h b/src/lib/marble/AutoNavigation.h
index a418e7d..14d7adb 100644
--- a/src/lib/marble/AutoNavigation.h
+++ b/src/lib/marble/AutoNavigation.h
@@ -12,7 +12,7 @@
#define MARBLE_AUTONAVIGATION_H
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
+#include "MarbleGlobal.h"
#include <QObject>
@@ -21,7 +21,6 @@ namespace Marble
class GeoDataCoordinates;
class MarbleModel;
-class PositionTracking;
class ViewportParams;
class MARBLE_EXPORT AutoNavigation : public QObject
diff --git a/src/lib/marble/BookmarkManager.cpp b/src/lib/marble/BookmarkManager.cpp
index 81f8409..c1740e7 100644
--- a/src/lib/marble/BookmarkManager.cpp
+++ b/src/lib/marble/BookmarkManager.cpp
@@ -18,6 +18,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataTreeModel.h"
#include "GeoDataDocumentWriter.h"
+#include "GeoDataIconStyle.h"
#include "KmlElementDictionary.h"
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/src/lib/marble/BookmarkManagerDialog.cpp b/src/lib/marble/BookmarkManagerDialog.cpp
index 6c220e3..8351694 100644
--- a/src/lib/marble/BookmarkManagerDialog.cpp
+++ b/src/lib/marble/BookmarkManagerDialog.cpp
@@ -17,11 +17,13 @@
#include "FileManager.h"
#include "GeoDataCoordinates.h"
#include "GeoDataDocument.h"
+#include "GeoDataLookAt.h"
#include "GeoDataExtendedData.h"
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include "GeoDataTreeModel.h"
#include "GeoDataTypes.h"
#include "GeoDataDocumentWriter.h"
diff --git a/src/lib/marble/BranchFilterProxyModel.cpp b/src/lib/marble/BranchFilterProxyModel.cpp
index d77304a..b7eff4e 100644
--- a/src/lib/marble/BranchFilterProxyModel.cpp
+++ b/src/lib/marble/BranchFilterProxyModel.cpp
@@ -12,6 +12,8 @@
#include "GeoDataTypes.h"
#include "MarblePlacemarkModel.h"
+#include "GeoDataTreeModel.h"
+#include "GeoDataObject.h"
namespace Marble
{
diff --git a/src/lib/marble/BranchFilterProxyModel.h b/src/lib/marble/BranchFilterProxyModel.h
index 1b0dd4a..f3a395c 100644
--- a/src/lib/marble/BranchFilterProxyModel.h
+++ b/src/lib/marble/BranchFilterProxyModel.h
@@ -11,13 +11,13 @@
#ifndef BRANCHFILTERPROXYMODEL_H
#define BRANCHFILTERPROXYMODEL_H
-#include "GeoDataTreeModel.h"
-
#include <QSortFilterProxyModel>
namespace Marble
{
+class GeoDataTreeModel;
+
class BranchFilterProxyModel : public QSortFilterProxyModel
{
public:
diff --git a/src/lib/marble/DownloadRegion.cpp b/src/lib/marble/DownloadRegion.cpp
index b296da4..d36075f 100644
--- a/src/lib/marble/DownloadRegion.cpp
+++ b/src/lib/marble/DownloadRegion.cpp
@@ -17,6 +17,7 @@
#include "TextureLayer.h"
#include "GeoDataLatLonAltBox.h"
#include "GeoDataLineString.h"
+#include "TileCoordsPyramid.h"
namespace Marble {
diff --git a/src/lib/marble/DownloadRegion.h b/src/lib/marble/DownloadRegion.h
index f26114b..8ea8263 100644
--- a/src/lib/marble/DownloadRegion.h
+++ b/src/lib/marble/DownloadRegion.h
@@ -14,7 +14,6 @@
#include <QObject>
#include <QVector>
-#include "TileCoordsPyramid.h"
#include "marble_export.h"
namespace Marble
@@ -22,8 +21,8 @@ namespace Marble
class DownloadRegionPrivate;
class GeoDataLatLonAltBox;
class GeoDataLineString;
+class TileCoordsPyramid;
class MarbleModel;
-class ViewportParams;
class TextureLayer;
class MARBLE_EXPORT DownloadRegion : public QObject
diff --git a/src/lib/marble/DownloadRegionDialog.cpp b/src/lib/marble/DownloadRegionDialog.cpp
index 31ffd13..eea35c2 100644
--- a/src/lib/marble/DownloadRegionDialog.cpp
+++ b/src/lib/marble/DownloadRegionDialog.cpp
@@ -33,6 +33,7 @@
#include "LatLonBoxWidget.h"
#include "TextureLayer.h"
#include "TileId.h"
+#include "TileCoordsPyramid.h"
#include "TileLevelRangeWidget.h"
#include "TileLoaderHelper.h"
#include "routing/RoutingManager.h"
diff --git a/src/lib/marble/DownloadRegionDialog.h b/src/lib/marble/DownloadRegionDialog.h
index 32d0d25..479b9e9 100644
--- a/src/lib/marble/DownloadRegionDialog.h
+++ b/src/lib/marble/DownloadRegionDialog.h
@@ -17,14 +17,14 @@
#include <QDialog>
#include <QVector>
-#include "TileCoordsPyramid.h"
#include "marble_export.h"
namespace Marble
{
class GeoDataLatLonAltBox;
+class TileCoordsPyramid;
class MarbleWidget;
-class ViewportParams;
+
class MARBLE_EXPORT DownloadRegionDialog: public QDialog
{
Q_OBJECT
diff --git a/src/lib/marble/EditBookmarkDialog.cpp b/src/lib/marble/EditBookmarkDialog.cpp
index 9f4c87a..c081053 100644
--- a/src/lib/marble/EditBookmarkDialog.cpp
+++ b/src/lib/marble/EditBookmarkDialog.cpp
@@ -14,13 +14,16 @@
#include "ui_EditBookmarkDialog.h"
#include "BookmarkManager.h"
+#include "GeoDataLookAt.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include "GeoDataFolder.h"
#include "GeoDataCoordinates.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "MarbleDirs.h"
#include "MarbleModel.h"
#include "MarbleWidget.h"
diff --git a/src/lib/marble/EditBookmarkDialog.h b/src/lib/marble/EditBookmarkDialog.h
index b46898a..6a7f107 100644
--- a/src/lib/marble/EditBookmarkDialog.h
+++ b/src/lib/marble/EditBookmarkDialog.h
@@ -15,8 +15,6 @@
#include <QDialog>
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataPlacemark.h"
/** @todo FIXME after freeze: Rename to AddBookmarkDialog*/
@@ -26,7 +24,8 @@ namespace Marble
class EditBookmarkDialogPrivate;
class BookmarkManager;
class GeoDataFolder;
-class GeoDataLookAt;
+class GeoDataCoordinates;
+class GeoDataPlacemark;
class MarbleWidget;
class MARBLE_EXPORT EditBookmarkDialog : public QDialog
diff --git a/src/lib/marble/EditPlacemarkDialog.cpp b/src/lib/marble/EditPlacemarkDialog.cpp
index f1a639b..a7027f6 100644
--- a/src/lib/marble/EditPlacemarkDialog.cpp
+++ b/src/lib/marble/EditPlacemarkDialog.cpp
@@ -22,6 +22,8 @@
// Marble
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
#include "GeoDataPlacemark.h"
#include "MarbleWidget.h"
#include "MarbleLocale.h"
diff --git a/src/lib/marble/ElevationModel.h b/src/lib/marble/ElevationModel.h
index a351279..deab9c8 100644
--- a/src/lib/marble/ElevationModel.h
+++ b/src/lib/marble/ElevationModel.h
@@ -12,7 +12,6 @@
#ifndef MARBLE_ELEVATIONMODEL_H
#define MARBLE_ELEVATIONMODEL_H
-#include "GeoDataCoordinates.h"
#include "marble_export.h"
#include <QObject>
@@ -21,6 +20,7 @@ class QImage;
namespace Marble
{
+class GeoDataCoordinates;
namespace {
unsigned int const invalidElevationData = 32768;
diff --git a/src/lib/marble/EquirectScanlineTextureMapper.h b/src/lib/marble/EquirectScanlineTextureMapper.h
index cfe6e48..6702d26 100644
--- a/src/lib/marble/EquirectScanlineTextureMapper.h
+++ b/src/lib/marble/EquirectScanlineTextureMapper.h
@@ -24,6 +24,7 @@
namespace Marble
{
+class StackedTileLoader;
class EquirectScanlineTextureMapper : public TextureMapperInterface
{
diff --git a/src/lib/marble/FileLoader.cpp b/src/lib/marble/FileLoader.cpp
index f479f86..b038877 100644
--- a/src/lib/marble/FileLoader.cpp
+++ b/src/lib/marble/FileLoader.cpp
@@ -21,6 +21,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataPolyStyle.h"
#include "GeoDataLineStyle.h"
diff --git a/src/lib/marble/FileLoader.h b/src/lib/marble/FileLoader.h
index fac5fc4..55a4908 100644
--- a/src/lib/marble/FileLoader.h
+++ b/src/lib/marble/FileLoader.h
@@ -11,7 +11,6 @@
#define MARBLE_FILELOADER_H
#include "GeoDataDocument.h"
-#include "GeoDataStyle.h"
#include <QThread>
@@ -19,9 +18,9 @@ class QString;
namespace Marble
{
-class GeoDataContainer;
class FileLoaderPrivate;
class PluginManager;
+class GeoDataStyle;
class FileLoader : public QThread
{
diff --git a/src/lib/marble/FileViewWidget.cpp b/src/lib/marble/FileViewWidget.cpp
index ed879fc..3285db8 100644
--- a/src/lib/marble/FileViewWidget.cpp
+++ b/src/lib/marble/FileViewWidget.cpp
@@ -18,6 +18,7 @@
#include <QPointer>
// Marble
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataContainer.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/FileViewWidget.h b/src/lib/marble/FileViewWidget.h
index 9ae069b..aadc5c9 100644
--- a/src/lib/marble/FileViewWidget.h
+++ b/src/lib/marble/FileViewWidget.h
@@ -22,10 +22,8 @@ class QModelIndex;
namespace Marble
{
-class FileManager;
class GeoDataPlacemark;
class GeoDataLatLonBox;
-class GeoDataTreeModel;
class MarbleWidget;
class FileViewWidgetPrivate;
diff --git a/src/lib/marble/FlyToEditWidget.cpp b/src/lib/marble/FlyToEditWidget.cpp
index 32db3be..330b998 100644
--- a/src/lib/marble/FlyToEditWidget.cpp
+++ b/src/lib/marble/FlyToEditWidget.cpp
@@ -19,6 +19,7 @@
#include "FlyToEditWidget.h"
#include "MarbleWidget.h"
#include "geodata/data/GeoDataFlyTo.h"
+#include "GeoDataLookAt.h"
#include "GeoDataTypes.h"
#include "GeoDataCamera.h"
#include "MarblePlacemarkModel.h"
diff --git a/src/lib/marble/GeoDataTreeModel.cpp b/src/lib/marble/GeoDataTreeModel.cpp
index a99cfcf..01e743b 100644
--- a/src/lib/marble/GeoDataTreeModel.cpp
+++ b/src/lib/marble/GeoDataTreeModel.cpp
@@ -26,12 +26,16 @@
#include "GeoDataExtendedData.h"
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLookAt.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataPlaylist.h"
#include "GeoDataTour.h"
#include "GeoDataWait.h"
#include "GeoDataFlyTo.h"
#include "GeoDataCamera.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataListStyle.h"
#include "GeoDataTypes.h"
#include "FileManager.h"
#include "MarbleDebug.h"
diff --git a/src/lib/marble/GeoGraphicsScene.cpp b/src/lib/marble/GeoGraphicsScene.cpp
index 39371eb..810ebd5 100644
--- a/src/lib/marble/GeoGraphicsScene.cpp
+++ b/src/lib/marble/GeoGraphicsScene.cpp
@@ -12,7 +12,7 @@
#include "GeoDataFeature.h"
#include "GeoDataGroundOverlay.h"
-#include "GeoDataLatLonBox.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataPhotoOverlay.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
diff --git a/src/lib/marble/GeoPainter.cpp b/src/lib/marble/GeoPainter.cpp
index 1dbc133..4a5859b 100644
--- a/src/lib/marble/GeoPainter.cpp
+++ b/src/lib/marble/GeoPainter.cpp
@@ -19,6 +19,7 @@
#include "MarbleDebug.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataLineString.h"
#include "GeoDataLinearRing.h"
#include "GeoDataPoint.h"
diff --git a/src/lib/marble/GoToDialog.cpp b/src/lib/marble/GoToDialog.cpp
index 42e888a..2de305e 100644
--- a/src/lib/marble/GoToDialog.cpp
+++ b/src/lib/marble/GoToDialog.cpp
@@ -16,9 +16,11 @@
#include "MarbleWidget.h"
#include "MarbleModel.h"
#include "MarblePlacemarkModel.h"
+#include "GeoDataLookAt.h"
#include "GeoDataTreeModel.h"
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
+#include "GeoDataPlacemark.h"
#include "PositionTracking.h"
#include "SearchRunnerManager.h"
#include "routing/RoutingManager.h"
diff --git a/src/lib/marble/GoToDialog.h b/src/lib/marble/GoToDialog.h
index 08ef950..5c531d0 100644
--- a/src/lib/marble/GoToDialog.h
+++ b/src/lib/marble/GoToDialog.h
@@ -12,7 +12,6 @@
#define MARBLE_GOTODIALOG_H
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
#include <QDialog>
@@ -22,6 +21,7 @@ namespace Marble
{
class GeoDataPlacemark;
+class GeoDataCoordinates;
class GoToDialogPrivate;
class MarbleModel;
diff --git a/src/lib/marble/HttpDownloadManager.h b/src/lib/marble/HttpDownloadManager.h
index cda1767..32634ee 100644
--- a/src/lib/marble/HttpDownloadManager.h
+++ b/src/lib/marble/HttpDownloadManager.h
@@ -28,7 +28,6 @@ namespace Marble
{
class DownloadPolicy;
-class DownloadQueueSet;
class StoragePolicy;
/**
diff --git a/src/lib/marble/LayerInterface.cpp b/src/lib/marble/LayerInterface.cpp
index cd7f5f5..23b53c7 100644
--- a/src/lib/marble/LayerInterface.cpp
+++ b/src/lib/marble/LayerInterface.cpp
@@ -10,6 +10,8 @@
#include "LayerInterface.h"
+#include "RenderState.h"
+
namespace Marble
{
diff --git a/src/lib/marble/LayerInterface.h b/src/lib/marble/LayerInterface.h
index a7489e2..e69c219 100644
--- a/src/lib/marble/LayerInterface.h
+++ b/src/lib/marble/LayerInterface.h
@@ -13,13 +13,16 @@
#define MARBLE_LAYERINTERFACE_H
#include "marble_export.h"
-#include "RenderState.h"
+
+#include <QtGlobal>
class QStringList;
class QString;
namespace Marble {
+class RenderState;
+
class GeoPainter;
class GeoSceneLayer;
class ViewportParams;
diff --git a/src/lib/marble/LayerManager.h b/src/lib/marble/LayerManager.h
index e10c43d..d8a9a48 100644
--- a/src/lib/marble/LayerManager.h
+++ b/src/lib/marble/LayerManager.h
@@ -12,8 +12,6 @@
#ifndef MARBLE_LAYERMANAGER_H
#define MARBLE_LAYERMANAGER_H
-#include "RenderState.h"
-
// Qt
#include <QList>
#include <QObject>
@@ -30,6 +28,7 @@ class AbstractDataPluginItem;
class GeoPainter;
class ViewportParams;
class RenderPlugin;
+class RenderState;
class LayerInterface;
/**
diff --git a/src/lib/marble/MapWizard.h b/src/lib/marble/MapWizard.h
index 905c4ce..71751e3 100644
--- a/src/lib/marble/MapWizard.h
+++ b/src/lib/marble/MapWizard.h
@@ -26,7 +26,6 @@ class QNetworkReply;
namespace Marble {
class GeoSceneDocument;
-class GeoSceneHead;
class MapWizardPrivate;
diff --git a/src/lib/marble/MarbleAbstractPresenter.cpp b/src/lib/marble/MarbleAbstractPresenter.cpp
index 40b8d1a..1e93011 100644
--- a/src/lib/marble/MarbleAbstractPresenter.cpp
+++ b/src/lib/marble/MarbleAbstractPresenter.cpp
@@ -20,7 +20,10 @@
#include "MarbleMap.h"
#include "MarbleModel.h"
#include <Planet.h>
+#include "GeoDataGeometry.h"
+#include "GeoDataLatLonAltBox.h"
#include <GeoDataPlacemark.h>
+#include <GeoDataLookAt.h>
#include <MarbleClock.h>
#include <MarbleDebug.h>
diff --git a/src/lib/marble/MarbleAbstractPresenter.h b/src/lib/marble/MarbleAbstractPresenter.h
index d7460df..719d745 100644
--- a/src/lib/marble/MarbleAbstractPresenter.h
+++ b/src/lib/marble/MarbleAbstractPresenter.h
@@ -15,7 +15,6 @@
#include <QList>
-#include "GeoDataLookAt.h"
#include "GeoDataLatLonBox.h"
#include "MarblePhysics.h"
#include <marble_export.h>
@@ -24,6 +23,7 @@ namespace Marble
{
class GeoDataPlacemark;
+class GeoDataLookAt;
class MarbleMap;
class MarbleModel;
class ViewportParams;
diff --git a/src/lib/marble/MarbleInputHandler.h b/src/lib/marble/MarbleInputHandler.h
index ea5e0fb..ebefe46 100644
--- a/src/lib/marble/MarbleInputHandler.h
+++ b/src/lib/marble/MarbleInputHandler.h
@@ -32,9 +32,7 @@ class QRect;
namespace Marble
{
-class MarbleModel;
class MarbleAbstractPresenter;
-class MarbleWidgetPopupMenu;
class AbstractDataPluginItem;
class RenderPlugin;
diff --git a/src/lib/marble/MarbleLegendBrowser.cpp b/src/lib/marble/MarbleLegendBrowser.cpp
index 2310da2..0dd79d4 100644
--- a/src/lib/marble/MarbleLegendBrowser.cpp
+++ b/src/lib/marble/MarbleLegendBrowser.cpp
@@ -14,6 +14,7 @@
#include "MarbleLegendBrowser.h"
+#include <QCoreApplication>
#include <QUrl>
#include <QDesktopServices>
#include <QEvent>
diff --git a/src/lib/marble/MarbleMap.cpp b/src/lib/marble/MarbleMap.cpp
index 68f9a0a..a2e15e6 100644
--- a/src/lib/marble/MarbleMap.cpp
+++ b/src/lib/marble/MarbleMap.cpp
@@ -64,12 +64,14 @@
#include "RenderPlugin.h"
#include "StyleBuilder.h"
#include "SunLocator.h"
+#include "TileId.h"
#include "TileCoordsPyramid.h"
#include "TileCreator.h"
#include "TileCreatorDialog.h"
#include "TileLoader.h"
#include "ViewParams.h"
#include "ViewportParams.h"
+#include "RenderState.h"
#include "BookmarkManager.h"
diff --git a/src/lib/marble/MarbleMap.h b/src/lib/marble/MarbleMap.h
index e76c04f..91526f9 100644
--- a/src/lib/marble/MarbleMap.h
+++ b/src/lib/marble/MarbleMap.h
@@ -24,7 +24,6 @@
#include "marble_export.h"
#include "GeoDataCoordinates.h" // In geodata/data/
-#include "RenderState.h"
// Qt
#include <QObject>
@@ -46,8 +45,8 @@ class MarbleModel;
class ViewportParams;
class GeoPainter;
class LayerInterface;
-class Quaternion;
class RenderPlugin;
+class RenderState;
class AbstractDataPlugin;
class AbstractDataPluginItem;
class AbstractFloatItem;
diff --git a/src/lib/marble/MarbleModel.cpp b/src/lib/marble/MarbleModel.cpp
index 06ca661..edb5fce 100644
--- a/src/lib/marble/MarbleModel.cpp
+++ b/src/lib/marble/MarbleModel.cpp
@@ -44,6 +44,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
#include "GeoDataStyleMap.h"
+#include "GeoDataLineStyle.h"
#include "GeoDataPolyStyle.h"
#include "GeoDataTypes.h"
diff --git a/src/lib/marble/MarbleModel.h b/src/lib/marble/MarbleModel.h
index d7e81f4..f7f9ec7 100644
--- a/src/lib/marble/MarbleModel.h
+++ b/src/lib/marble/MarbleModel.h
@@ -33,7 +33,6 @@
#include <QString>
#include "MarbleGlobal.h"
-#include "GeoDataCoordinates.h"
class QItemSelectionModel;
class QAbstractItemModel;
@@ -54,8 +53,6 @@ class SunLocator;
class TileCreator;
class PluginManager;
class GeoDataCoordinates;
-class GeoDataDocument;
-class GeoDataStyle;
class GeoDataTreeModel;
class GeoSceneDocument;
class Planet;
diff --git a/src/lib/marble/MarblePhysics.cpp b/src/lib/marble/MarblePhysics.cpp
index 3e9889f..b9d0e32 100644
--- a/src/lib/marble/MarblePhysics.cpp
+++ b/src/lib/marble/MarblePhysics.cpp
@@ -12,6 +12,7 @@
#include "Quaternion.h"
#include "MarbleAbstractPresenter.h"
+#include "GeoDataLookAt.h"
#include "MarbleDebug.h"
#include "GeoDataLineString.h"
#include "ViewportParams.h"
diff --git a/src/lib/marble/MarblePhysics.h b/src/lib/marble/MarblePhysics.h
index ce9e1b0..206f94f 100644
--- a/src/lib/marble/MarblePhysics.h
+++ b/src/lib/marble/MarblePhysics.h
@@ -11,15 +11,16 @@
#ifndef MARBLE_MARBLEPHYSICS_H
#define MARBLE_MARBLEPHYSICS_H
-#include "GeoDataLookAt.h"
-
#include <QObject>
+#include "MarbleGlobal.h"
+
namespace Marble
{
class MarblePhysicsPrivate;
class MarbleAbstractPresenter;
+class GeoDataLookAt;
class MarblePhysics : public QObject
{
diff --git a/src/lib/marble/MarblePlacemarkModel.cpp b/src/lib/marble/MarblePlacemarkModel.cpp
index a1d6bce..a51a7a5 100644
--- a/src/lib/marble/MarblePlacemarkModel.cpp
+++ b/src/lib/marble/MarblePlacemarkModel.cpp
@@ -20,8 +20,12 @@
// Marble
#include "MarbleDebug.h"
+#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
+#include "GeoDataGeometry.h"
#include "GeoDataStyle.h" // In geodata/data/
+#include "GeoDataIconStyle.h"
using namespace Marble;
diff --git a/src/lib/marble/MarblePlacemarkModel.h b/src/lib/marble/MarblePlacemarkModel.h
index 835e3e5..885e750 100644
--- a/src/lib/marble/MarblePlacemarkModel.h
+++ b/src/lib/marble/MarblePlacemarkModel.h
@@ -22,13 +22,12 @@
#include "marble_export.h"
-#include "GeoDataPlacemark.h"
-
namespace Marble
{
class GeoDataCoordinates;
-class GeoDataStyle;
+class GeoDataPlacemark;
+
/**
* This class represents a model of all place marks which
* are currently available through a given PlacemarkManager.
diff --git a/src/lib/marble/MarbleWidget.cpp b/src/lib/marble/MarbleWidget.cpp
index 5d1017c..9f6523a 100644
--- a/src/lib/marble/MarbleWidget.cpp
+++ b/src/lib/marble/MarbleWidget.cpp
@@ -27,6 +27,7 @@
#include "FileManager.h"
#include "GeoDataLatLonAltBox.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLookAt.h"
#include "GeoPainter.h"
#include "MarbleClock.h"
#include "MarbleDebug.h"
@@ -38,6 +39,7 @@
#include "MarbleWidgetPopupMenu.h"
#include "Planet.h"
#include "PopupLayer.h"
+#include "RenderState.h"
#include "RenderPlugin.h"
#include "SunLocator.h"
#include "TileCreatorDialog.h"
diff --git a/src/lib/marble/MarbleWidget.h b/src/lib/marble/MarbleWidget.h
index 4d6ca34..acce763 100644
--- a/src/lib/marble/MarbleWidget.h
+++ b/src/lib/marble/MarbleWidget.h
@@ -23,10 +23,8 @@
#include <QWidget>
#include "GeoDataCoordinates.h"
-#include "GeoDataLookAt.h"
#include "MarbleGlobal.h" // types needed in all of marble.
#include "marble_export.h"
-#include "RenderState.h"
// Qt
class QSettings;
@@ -41,6 +39,7 @@ class GeoDataLatLonAltBox;
class GeoDataLatLonBox;
class GeoDataFeature;
class GeoDataPlacemark;
+class GeoDataLookAt;
class GeoPainter;
class GeoSceneDocument;
class LayerInterface;
@@ -49,6 +48,7 @@ class MarbleWidgetPopupMenu;
class MarbleWidgetInputHandler;
class MarbleWidgetPrivate;
class RenderPlugin;
+class RenderState;
class RoutingLayer;
class TextureLayer;
class TileCoordsPyramid;
diff --git a/src/lib/marble/MarbleWidgetPopupMenu.cpp b/src/lib/marble/MarbleWidgetPopupMenu.cpp
index 560b86e..f1e51f1 100644
--- a/src/lib/marble/MarbleWidgetPopupMenu.cpp
+++ b/src/lib/marble/MarbleWidgetPopupMenu.cpp
@@ -24,9 +24,13 @@
#include "GeoDataExtendedData.h"
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLookAt.h"
+#include "GeoDataData.h"
#include "GeoDataSnippet.h"
#include "GeoDataStyle.h"
+#include "GeoDataBalloonStyle.h"
#include "GeoDataIconStyle.h"
+#include "GeoDataPoint.h"
#include "GeoDataTypes.h"
#include "GeoDataPhotoOverlay.h"
#include "GeoSceneDocument.h"
diff --git a/src/lib/marble/MercatorScanlineTextureMapper.h b/src/lib/marble/MercatorScanlineTextureMapper.h
index 461723f..cca2bfe 100644
--- a/src/lib/marble/MercatorScanlineTextureMapper.h
+++ b/src/lib/marble/MercatorScanlineTextureMapper.h
@@ -25,6 +25,8 @@
namespace Marble
{
+class StackedTileLoader;
+
class MercatorScanlineTextureMapper : public TextureMapperInterface
{
public:
diff --git a/src/lib/marble/MergedLayerDecorator.cpp b/src/lib/marble/MergedLayerDecorator.cpp
index ff168b3..46d4619 100644
--- a/src/lib/marble/MergedLayerDecorator.cpp
+++ b/src/lib/marble/MergedLayerDecorator.cpp
@@ -30,6 +30,7 @@
#include "TileLoaderHelper.h"
#include "TextureTile.h"
#include "TileLoader.h"
+#include "RenderState.h"
#include "GeoDataCoordinates.h"
diff --git a/src/lib/marble/MergedLayerDecorator.h b/src/lib/marble/MergedLayerDecorator.h
index fd58497..b4c9c61 100644
--- a/src/lib/marble/MergedLayerDecorator.h
+++ b/src/lib/marble/MergedLayerDecorator.h
@@ -20,7 +20,6 @@
#include <QList>
#include "GeoSceneTextureTileDataset.h"
-#include "RenderState.h"
class QImage;
class QString;
@@ -35,6 +34,7 @@ class StackedTile;
class Tile;
class TileId;
class TileLoader;
+class RenderState;
class MergedLayerDecorator
{
diff --git a/src/lib/marble/ParsingRunnerManager.h b/src/lib/marble/ParsingRunnerManager.h
index 51c761b..ae4fec1 100644
--- a/src/lib/marble/ParsingRunnerManager.h
+++ b/src/lib/marble/ParsingRunnerManager.h
@@ -22,7 +22,6 @@
namespace Marble
{
-class MarbleModel;
class PluginManager;
class MARBLE_EXPORT ParsingRunnerManager : public QObject
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 8e996a5..56d917e 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -21,8 +21,11 @@
#include <QItemSelectionModel>
#include <qmath.h>
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
#include "GeoDataTypes.h"
#include "OsmPlacemarkData.h"
diff --git a/src/lib/marble/PlacemarkPositionProviderPlugin.h b/src/lib/marble/PlacemarkPositionProviderPlugin.h
index 6f34349..61d65db 100644
--- a/src/lib/marble/PlacemarkPositionProviderPlugin.h
+++ b/src/lib/marble/PlacemarkPositionProviderPlugin.h
@@ -15,6 +15,7 @@
#include "PositionProviderPlugin.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataAccuracy.h"
#include <QDateTime>
diff --git a/src/lib/marble/PlaybackAnimatedUpdateItem.cpp b/src/lib/marble/PlaybackAnimatedUpdateItem.cpp
index 49a5371..cfa64cc 100644
--- a/src/lib/marble/PlaybackAnimatedUpdateItem.cpp
+++ b/src/lib/marble/PlaybackAnimatedUpdateItem.cpp
@@ -14,6 +14,10 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
+#include "GeoDataCreate.h"
+#include "GeoDataUpdate.h"
+#include "GeoDataDelete.h"
+#include "GeoDataChange.h"
#include <QString>
diff --git a/src/lib/marble/PlaybackFlyToItem.cpp b/src/lib/marble/PlaybackFlyToItem.cpp
index fa4e5a2..9309e90 100644
--- a/src/lib/marble/PlaybackFlyToItem.cpp
+++ b/src/lib/marble/PlaybackFlyToItem.cpp
@@ -13,6 +13,7 @@
#include "GeoDataTypes.h"
#include "GeoDataLookAt.h"
#include "GeoDataCamera.h"
+#include "GeoDataFlyTo.h"
#include "Quaternion.h"
#include <QTimer>
diff --git a/src/lib/marble/PlaybackFlyToItem.h b/src/lib/marble/PlaybackFlyToItem.h
index 6e5a400..795215d 100644
--- a/src/lib/marble/PlaybackFlyToItem.h
+++ b/src/lib/marble/PlaybackFlyToItem.h
@@ -12,13 +12,14 @@
#define PLAYBACKFLYTOITEM_H
#include "PlaybackItem.h"
-#include "GeoDataFlyTo.h"
-#include "GeoDataCoordinates.h"
#include <QDateTime>
namespace Marble
{
+class GeoDataCoordinates;
+class GeoDataFlyTo;
+
class PlaybackFlyToItem : public PlaybackItem
{
Q_OBJECT
diff --git a/src/lib/marble/PlaybackWaitItem.cpp b/src/lib/marble/PlaybackWaitItem.cpp
index b12136c..9a8aa5c 100644
--- a/src/lib/marble/PlaybackWaitItem.cpp
+++ b/src/lib/marble/PlaybackWaitItem.cpp
@@ -10,6 +10,8 @@
#include "PlaybackWaitItem.h"
+#include "GeoDataWait.h"
+
#include <QTimer>
namespace Marble
diff --git a/src/lib/marble/PlaybackWaitItem.h b/src/lib/marble/PlaybackWaitItem.h
index ae7a301..ba2f4d6 100644
--- a/src/lib/marble/PlaybackWaitItem.h
+++ b/src/lib/marble/PlaybackWaitItem.h
@@ -12,11 +12,13 @@
#define PLAYBACKWAITITEM_H
#include "PlaybackItem.h"
-#include "GeoDataWait.h"
#include <QDateTime>
namespace Marble
{
+
+class GeoDataWait;
+
class PlaybackWaitItem : public PlaybackItem
{
Q_OBJECT
diff --git a/src/lib/marble/PositionProviderPluginInterface.h b/src/lib/marble/PositionProviderPluginInterface.h
index c4e8840..bd97839 100644
--- a/src/lib/marble/PositionProviderPluginInterface.h
+++ b/src/lib/marble/PositionProviderPluginInterface.h
@@ -12,13 +12,13 @@
#define MARBLE_POSITIONPROVIDERPLUGININTERFACE_H
#include "PluginInterface.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataAccuracy.h"
class QDateTime;
namespace Marble
{
+class GeoDataAccuracy;
+class GeoDataCoordinates;
enum PositionProviderStatus {
PositionProviderStatusError = 0,
diff --git a/src/lib/marble/PositionTracking.cpp b/src/lib/marble/PositionTracking.cpp
index 7fc10b5..573ab5c 100644
--- a/src/lib/marble/PositionTracking.cpp
+++ b/src/lib/marble/PositionTracking.cpp
@@ -17,10 +17,13 @@
#include "GeoDataPlacemark.h"
#include "GeoDataParser.h"
#include "GeoDataStyle.h"
+#include "GeoDataLineStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataTrack.h"
#include "GeoDataTreeModel.h"
#include "GeoDataTypes.h"
+#include "GeoDataLineString.h"
+#include "GeoDataAccuracy.h"
#include "GeoDataDocumentWriter.h"
#include "KmlElementDictionary.h"
#include "FileManager.h"
diff --git a/src/lib/marble/PositionTracking.h b/src/lib/marble/PositionTracking.h
index 737fa7e..37041b7 100644
--- a/src/lib/marble/PositionTracking.h
+++ b/src/lib/marble/PositionTracking.h
@@ -22,7 +22,6 @@ namespace Marble
{
class GeoDataAccuracy;
-class GeoDataDocument;
class GeoDataCoordinates;
class GeoDataTreeModel;
class PositionProviderPlugin;
diff --git a/src/lib/marble/RemoveItemEditWidget.cpp b/src/lib/marble/RemoveItemEditWidget.cpp
index c6d2ba7..00a79be 100644
--- a/src/lib/marble/RemoveItemEditWidget.cpp
+++ b/src/lib/marble/RemoveItemEditWidget.cpp
@@ -18,6 +18,8 @@
#include "geodata/data/GeoDataAnimatedUpdate.h"
#include "geodata/data/GeoDataFeature.h"
#include "GeoDataTypes.h"
+#include "GeoDataUpdate.h"
+#include "GeoDataDelete.h"
#include "MarblePlacemarkModel.h"
namespace Marble {
diff --git a/src/lib/marble/RenderPlugin.cpp b/src/lib/marble/RenderPlugin.cpp
index 2cdb9f6..2cb264f 100644
--- a/src/lib/marble/RenderPlugin.cpp
+++ b/src/lib/marble/RenderPlugin.cpp
@@ -19,6 +19,7 @@
#include "MarbleModel.h"
#include "MarbleDebug.h"
#include "RenderPluginModel.h"
+#include "RenderState.h"
// Qt
#include <QAction>
diff --git a/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp b/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
index 0b3fd16..a30036d 100644
--- a/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
+++ b/src/lib/marble/RouteSimulationPositionProviderPlugin.cpp
@@ -17,6 +17,7 @@
#include "routing/Route.h"
#include "routing/RoutingManager.h"
#include "routing/RoutingModel.h"
+#include "GeoDataAccuracy.h"
#include <QIcon>
diff --git a/src/lib/marble/RouteSimulationPositionProviderPlugin.h b/src/lib/marble/RouteSimulationPositionProviderPlugin.h
index 5540864..041c966 100644
--- a/src/lib/marble/RouteSimulationPositionProviderPlugin.h
+++ b/src/lib/marble/RouteSimulationPositionProviderPlugin.h
@@ -16,6 +16,7 @@
#include "PositionProviderPlugin.h"
#include "GeoDataLineString.h"
+#include "GeoDataCoordinates.h"
#include <QDateTime>
#include <QTimer>
diff --git a/src/lib/marble/RoutingRunner.cpp b/src/lib/marble/RoutingRunner.cpp
index c7a1148..1ad4d6b 100644
--- a/src/lib/marble/RoutingRunner.cpp
+++ b/src/lib/marble/RoutingRunner.cpp
@@ -11,6 +11,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "MarbleGlobal.h"
#include "MarbleLocale.h"
diff --git a/src/lib/marble/RoutingRunner.h b/src/lib/marble/RoutingRunner.h
index 0324b11..d665ab9 100644
--- a/src/lib/marble/RoutingRunner.h
+++ b/src/lib/marble/RoutingRunner.h
@@ -14,13 +14,13 @@
#include <QObject>
#include "marble_export.h"
-#include "GeoDataExtendedData.h"
class QTime;
namespace Marble
{
+class GeoDataExtendedData;
class GeoDataDocument;
class RouteRequest;
diff --git a/src/lib/marble/SearchInputWidget.cpp b/src/lib/marble/SearchInputWidget.cpp
index ff606a8..d62a73d 100644
--- a/src/lib/marble/SearchInputWidget.cpp
+++ b/src/lib/marble/SearchInputWidget.cpp
@@ -11,6 +11,7 @@
#include "SearchInputWidget.h"
+#include "GeoDataCoordinates.h"
#include "MarblePlacemarkModel.h"
#include <QCompleter>
diff --git a/src/lib/marble/SearchRunner.h b/src/lib/marble/SearchRunner.h
index 96a4c09..094c8a4 100644
--- a/src/lib/marble/SearchRunner.h
+++ b/src/lib/marble/SearchRunner.h
@@ -14,8 +14,6 @@
#include "marble_export.h"
-#include "GeoDataDocument.h"
-
#include <QObject>
#include <QVector>
@@ -25,7 +23,6 @@ namespace Marble
class GeoDataLatLonBox;
class GeoDataPlacemark;
class MarbleModel;
-class RouteRequest;
class MARBLE_EXPORT SearchRunner : public QObject
{
diff --git a/src/lib/marble/SearchWidget.cpp b/src/lib/marble/SearchWidget.cpp
index 4164492..2b84554 100644
--- a/src/lib/marble/SearchWidget.cpp
+++ b/src/lib/marble/SearchWidget.cpp
@@ -10,7 +10,10 @@
#include "SearchWidget.h"
+#include "GeoDataPlacemark.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataDocument.h"
+#include "GeoDataTreeModel.h"
#include "SearchInputWidget.h"
#include "MarbleWidget.h"
#include "MarbleModel.h"
diff --git a/src/lib/marble/SerialTrack.h b/src/lib/marble/SerialTrack.h
index 25ac419..e14adbd 100644
--- a/src/lib/marble/SerialTrack.h
+++ b/src/lib/marble/SerialTrack.h
@@ -14,12 +14,11 @@
#include <QObject>
#include "PlaybackItem.h"
-#include "GeoDataCoordinates.h"
-
-class TourPlayback;
namespace Marble
{
+class GeoDataCoordinates;
+
class SerialTrack : public QObject
{
Q_OBJECT
diff --git a/src/lib/marble/SoundTrack.cpp b/src/lib/marble/SoundTrack.cpp
index 520515e..dd99fbc 100644
--- a/src/lib/marble/SoundTrack.cpp
+++ b/src/lib/marble/SoundTrack.cpp
@@ -10,6 +10,8 @@
#include "SoundTrack.h"
+#include "PlaybackSoundCueItem.h"
+
namespace Marble
{
diff --git a/src/lib/marble/SoundTrack.h b/src/lib/marble/SoundTrack.h
index 859d374..33ee6aa 100644
--- a/src/lib/marble/SoundTrack.h
+++ b/src/lib/marble/SoundTrack.h
@@ -11,14 +11,14 @@
#ifndef SOUNDTRACK_H
#define SOUNDTRACK_H
-#include "PlaybackSoundCueItem.h"
-#include "GeoDataPlacemark.h"
-
#include <QDateTime>
#include <QTimer>
namespace Marble
{
+
+class PlaybackSoundCueItem;
+
class SoundTrack : public QObject
{
Q_OBJECT
diff --git a/src/lib/marble/StackedTileLoader.h b/src/lib/marble/StackedTileLoader.h
index 163a498..f5b1e14 100644
--- a/src/lib/marble/StackedTileLoader.h
+++ b/src/lib/marble/StackedTileLoader.h
@@ -28,7 +28,6 @@
#include <QObject>
#include "GeoSceneTextureTileDataset.h"
-#include "TileId.h"
#include "RenderState.h"
class QImage;
@@ -40,6 +39,7 @@ namespace Marble
class MergedLayerDecorator;
class StackedTile;
+class TileId;
class StackedTileLoaderPrivate;
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index aba318d..bec4229 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -16,7 +16,12 @@
#include "MarbleDirs.h"
#include "OsmPlacemarkData.h"
#include "GeoDataTypes.h"
+#include "GeoDataGeometry.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataPolyStyle.h"
#include <QApplication>
#include <QFont>
diff --git a/src/lib/marble/StyleBuilder.h b/src/lib/marble/StyleBuilder.h
index 04c05e0..e4f262b 100644
--- a/src/lib/marble/StyleBuilder.h
+++ b/src/lib/marble/StyleBuilder.h
@@ -11,7 +11,6 @@
#ifndef MARBLE_STYLEBUILDER_H
#define MARBLE_STYLEBUILDER_H
-#include <GeoDataStyle.h>
#include "marble_export.h"
#include <GeoDataFeature.h>
diff --git a/src/lib/marble/TextureColorizer.cpp b/src/lib/marble/TextureColorizer.cpp
index d7f92e6..5f4241a 100644
--- a/src/lib/marble/TextureColorizer.cpp
+++ b/src/lib/marble/TextureColorizer.cpp
@@ -29,6 +29,8 @@
#include "ViewParams.h"
#include "ViewportParams.h"
#include "MathHelper.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoDataFeature.h"
#include "GeoDataTypes.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/TextureColorizer.h b/src/lib/marble/TextureColorizer.h
index e4d261d..5796726 100644
--- a/src/lib/marble/TextureColorizer.h
+++ b/src/lib/marble/TextureColorizer.h
@@ -18,7 +18,6 @@
#include "MarbleGlobal.h"
#include "GeoDataDocument.h"
-#include "GeoPainter.h"
#include <QString>
#include <QImage>
@@ -27,6 +26,7 @@
namespace Marble
{
+class GeoPainter;
class ViewportParams;
class TextureColorizer
diff --git a/src/lib/marble/TextureMapperInterface.h b/src/lib/marble/TextureMapperInterface.h
index b10f2bc..1ffc08e 100644
--- a/src/lib/marble/TextureMapperInterface.h
+++ b/src/lib/marble/TextureMapperInterface.h
@@ -18,8 +18,6 @@ namespace Marble
{
class GeoPainter;
-class StackedTile;
-class StackedTileLoader;
class TextureColorizer;
class ViewportParams;
diff --git a/src/lib/marble/TextureTile.h b/src/lib/marble/TextureTile.h
index c0df799..27ecc15 100644
--- a/src/lib/marble/TextureTile.h
+++ b/src/lib/marble/TextureTile.h
@@ -23,11 +23,11 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QImage>
#include "Tile.h"
-#include "TileId.h"
namespace Marble
{
class Blending;
+class TileId;
/*!
\class TextureTile
diff --git a/src/lib/marble/TileLoader.cpp b/src/lib/marble/TileLoader.cpp
index fae63d2..9410eb0 100644
--- a/src/lib/marble/TileLoader.cpp
+++ b/src/lib/marble/TileLoader.cpp
@@ -35,6 +35,7 @@
#include "HttpDownloadManager.h"
#include "MarbleDebug.h"
#include "MarbleDirs.h"
+#include "TileId.h"
#include "TileLoaderHelper.h"
#include "ParseRunnerPlugin.h"
#include "ParsingRunner.h"
diff --git a/src/lib/marble/TileLoader.h b/src/lib/marble/TileLoader.h
index 5dfe91f..daa6759 100644
--- a/src/lib/marble/TileLoader.h
+++ b/src/lib/marble/TileLoader.h
@@ -22,8 +22,6 @@
#include <QObject>
-#include "TileId.h"
-#include "GeoDataContainer.h"
#include "PluginManager.h"
#include "MarbleGlobal.h"
@@ -34,12 +32,12 @@ class QString;
namespace Marble
{
+class TileId;
class HttpDownloadManager;
class GeoDataDocument;
class GeoSceneTileDataset;
class GeoSceneTextureTileDataset;
class GeoSceneVectorTileDataset;
-class ParsingRunnerManager;
class TileLoader: public QObject
{
diff --git a/src/lib/marble/TileScalingTextureMapper.h b/src/lib/marble/TileScalingTextureMapper.h
index e67b18e..a6c1223 100644
--- a/src/lib/marble/TileScalingTextureMapper.h
+++ b/src/lib/marble/TileScalingTextureMapper.h
@@ -24,6 +24,8 @@
namespace Marble
{
+class StackedTileLoader;
+
class TileScalingTextureMapper : public QObject, public TextureMapperInterface
{
Q_OBJECT
diff --git a/src/lib/marble/TourItemDelegate.cpp b/src/lib/marble/TourItemDelegate.cpp
index 0a68803..0f9c524 100644
--- a/src/lib/marble/TourItemDelegate.cpp
+++ b/src/lib/marble/TourItemDelegate.cpp
@@ -30,7 +30,12 @@
#include "SoundCueEditWidget.h"
#include "WaitEditWidget.h"
#include "RemoveItemEditWidget.h"
+#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
+#include "GeoDataCreate.h"
+#include "GeoDataUpdate.h"
+#include "GeoDataDelete.h"
+#include "GeoDataChange.h"
#include "EditPlacemarkDialog.h"
#include "MarbleWidget.h"
#include "GeoDataPlaylist.h"
diff --git a/src/lib/marble/TourPlayback.cpp b/src/lib/marble/TourPlayback.cpp
index 189b145..6df81a1 100644
--- a/src/lib/marble/TourPlayback.cpp
+++ b/src/lib/marble/TourPlayback.cpp
@@ -17,7 +17,11 @@
#include "MarbleDebug.h"
#include "MarbleWidget.h"
#include "PopupLayer.h"
+#include "GeoDataPoint.h"
+#include "GeoDataPlacemark.h"
+#include "GeoDataPlaylist.h"
#include "GeoDataTour.h"
+#include "GeoDataWait.h"
#include "GeoDataFlyTo.h"
#include "GeoDataLookAt.h"
#include "GeoDataTourControl.h"
diff --git a/src/lib/marble/TourWidget.cpp b/src/lib/marble/TourWidget.cpp
index ab6024c..b3d5ac6 100644
--- a/src/lib/marble/TourWidget.cpp
+++ b/src/lib/marble/TourWidget.cpp
@@ -17,7 +17,10 @@
#include "TourItemDelegate.h"
#include "ui_TourWidget.h"
+#include "GeoDataPlacemark.h"
#include "GeoDataDocument.h"
+#include "GeoDataLookAt.h"
+#include "GeoDataPlaylist.h"
#include "GeoDataTour.h"
#include "GeoDataTreeModel.h"
#include "GeoDataTypes.h"
@@ -26,6 +29,10 @@
#include "GeoDataCamera.h"
#include "GeoDataTourControl.h"
#include "GeoDataSoundCue.h"
+#include "GeoDataCreate.h"
+#include "GeoDataUpdate.h"
+#include "GeoDataDelete.h"
+#include "GeoDataChange.h"
#include "GeoDataAnimatedUpdate.h"
#include "GeoDataDocumentWriter.h"
#include "KmlElementDictionary.h"
@@ -41,6 +48,7 @@
#include "EditPlacemarkDialog.h"
#include "MarbleDirs.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include <QFileDialog>
#include <QDir>
diff --git a/src/lib/marble/TreeViewDecoratorModel.cpp b/src/lib/marble/TreeViewDecoratorModel.cpp
index 5283e9c..0c01da9 100644
--- a/src/lib/marble/TreeViewDecoratorModel.cpp
+++ b/src/lib/marble/TreeViewDecoratorModel.cpp
@@ -14,6 +14,8 @@
#include "GeoDataObject.h"
#include "GeoDataContainer.h"
#include "GeoDataStyle.h"
+#include "GeoDataListStyle.h"
+#include "GeoDataItemIcon.h"
#include "GeoDataTour.h"
#include "MarblePlacemarkModel.h"
diff --git a/src/lib/marble/ViewportParams.cpp b/src/lib/marble/ViewportParams.cpp
index 8daf8dd..31583e5 100644
--- a/src/lib/marble/ViewportParams.cpp
+++ b/src/lib/marble/ViewportParams.cpp
@@ -19,6 +19,7 @@
#include <QRegion>
#include "MarbleDebug.h"
+#include "GeoDataLatLonAltBox.h"
#include "SphericalProjection.h"
#include "EquirectProjection.h"
#include "MercatorProjection.h"
diff --git a/src/lib/marble/ViewportParams.h b/src/lib/marble/ViewportParams.h
index 1bf3a8d..3571d8b 100644
--- a/src/lib/marble/ViewportParams.h
+++ b/src/lib/marble/ViewportParams.h
@@ -21,8 +21,7 @@
#include <QSize>
-#include "GeoDataLatLonAltBox.h"
-
+#include "GeoDataCoordinates.h"
#include "Quaternion.h"
#include "MarbleGlobal.h"
#include "marble_export.h"
@@ -33,6 +32,9 @@ class QPainterPath;
namespace Marble
{
+class GeoDataLatLonAltBox;
+class GeoDataLatLonBox;
+class GeoDataLineString;
class AbstractProjection;
class ViewportParamsPrivate;
diff --git a/src/lib/marble/VisiblePlacemark.cpp b/src/lib/marble/VisiblePlacemark.cpp
index e97d587..d057a94 100644
--- a/src/lib/marble/VisiblePlacemark.cpp
+++ b/src/lib/marble/VisiblePlacemark.cpp
@@ -16,6 +16,8 @@
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
#include "PlacemarkLayer.h"
#include <QApplication>
diff --git a/src/lib/marble/cloudsync/BookmarkSyncManager.cpp b/src/lib/marble/cloudsync/BookmarkSyncManager.cpp
index 819a0e2..2bcfca7 100644
--- a/src/lib/marble/cloudsync/BookmarkSyncManager.cpp
+++ b/src/lib/marble/cloudsync/BookmarkSyncManager.cpp
@@ -17,6 +17,7 @@
#include "GeoDataParser.h"
#include "GeoDataFolder.h"
#include "GeoDataDocument.h"
+#include "GeoDataLookAt.h"
#include "CloudSyncManager.h"
#include "GeoDataCoordinates.h"
#include "OwncloudSyncBackend.h"
diff --git a/src/lib/marble/cloudsync/BookmarkSyncManager.h b/src/lib/marble/cloudsync/BookmarkSyncManager.h
index b260dd8..54e0614 100644
--- a/src/lib/marble/cloudsync/BookmarkSyncManager.h
+++ b/src/lib/marble/cloudsync/BookmarkSyncManager.h
@@ -13,7 +13,6 @@
#include "MergeItem.h"
#include "marble_export.h"
-#include "GeoDataPlacemark.h"
#include <QObject>
diff --git a/src/lib/marble/cloudsync/CloudRouteModel.cpp b/src/lib/marble/cloudsync/CloudRouteModel.cpp
index f5a069a..de836d9 100644
--- a/src/lib/marble/cloudsync/CloudRouteModel.cpp
+++ b/src/lib/marble/cloudsync/CloudRouteModel.cpp
@@ -10,6 +10,8 @@
#include "CloudRouteModel.h"
+#include "RouteItem.h"
+
#include "MarbleDebug.h"
#include "MarbleDirs.h"
diff --git a/src/lib/marble/cloudsync/CloudRouteModel.h b/src/lib/marble/cloudsync/CloudRouteModel.h
index 93519c5..1e4cd98 100644
--- a/src/lib/marble/cloudsync/CloudRouteModel.h
+++ b/src/lib/marble/cloudsync/CloudRouteModel.h
@@ -11,8 +11,6 @@
#ifndef CLOUDROUTEMODEL_H
#define CLOUDROUTEMODEL_H
-#include "RouteItem.h"
-
#include "marble_export.h"
#include <QModelIndex>
@@ -23,6 +21,8 @@ class QNetworkReply;
namespace Marble
{
+class RouteItem;
+
class MARBLE_EXPORT CloudRouteModel : public QAbstractListModel
{
Q_OBJECT
diff --git a/src/lib/marble/cloudsync/CloudRoutesDialog.cpp b/src/lib/marble/cloudsync/CloudRoutesDialog.cpp
index 385b44a..17437fe 100644
--- a/src/lib/marble/cloudsync/CloudRoutesDialog.cpp
+++ b/src/lib/marble/cloudsync/CloudRoutesDialog.cpp
@@ -11,6 +11,7 @@
#include "CloudRoutesDialog.h"
#include "ui_CloudRoutesDialog.h"
+#include "CloudRouteModel.h"
#include "RouteItemDelegate.h"
#include <QTimer>
diff --git a/src/lib/marble/cloudsync/CloudRoutesDialog.h b/src/lib/marble/cloudsync/CloudRoutesDialog.h
index 4a0f430..16a1148 100644
--- a/src/lib/marble/cloudsync/CloudRoutesDialog.h
+++ b/src/lib/marble/cloudsync/CloudRoutesDialog.h
@@ -11,13 +11,12 @@
#ifndef CLOUDROUTESDIALOG_H
#define CLOUDROUTESDIALOG_H
-#include "MarbleWidget.h"
-#include "CloudRouteModel.h"
-
#include <QDialog>
namespace Marble {
+class CloudRouteModel;
+
class CloudRoutesDialog : public QDialog
{
Q_OBJECT
diff --git a/src/lib/marble/cloudsync/ConflictDialog.h b/src/lib/marble/cloudsync/ConflictDialog.h
index 46691da..229fc29 100644
--- a/src/lib/marble/cloudsync/ConflictDialog.h
+++ b/src/lib/marble/cloudsync/ConflictDialog.h
@@ -11,7 +11,6 @@
#ifndef CONFLICTDIALOG_H
#define CONFLICTDIALOG_H
-#include "MergeItem.h"
#include "marble_export.h"
#include <QDialog>
@@ -19,7 +18,10 @@
class QDialogButtonBox;
class QAbstractButton;
-namespace Marble {
+namespace Marble
+{
+
+class MergeItem;
class MARBLE_EXPORT ConflictDialog : public QDialog
{
diff --git a/src/lib/marble/cloudsync/MergeItem.h b/src/lib/marble/cloudsync/MergeItem.h
index 0d4d1bf..58f5afc 100644
--- a/src/lib/marble/cloudsync/MergeItem.h
+++ b/src/lib/marble/cloudsync/MergeItem.h
@@ -18,8 +18,6 @@
namespace Marble {
-class GeoDataPlacemark;
-
class MARBLE_EXPORT MergeItem : public QObject
{
diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp b/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
index 8588235..c44372e 100644
--- a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
+++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp
@@ -21,12 +21,14 @@
#include "GeoDataParser.h"
#include "GeoDataFolder.h"
#include "RoutingManager.h"
+#include "RouteItem.h"
#include "GeoDataDocument.h"
#include "CloudRouteModel.h"
#include "GeoDataPlacemark.h"
#include "CloudSyncManager.h"
#include "GeoDataTypes.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include <QNetworkAccessManager>
#include <QNetworkRequest>
diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.h b/src/lib/marble/cloudsync/OwncloudSyncBackend.h
index b01a662..480b17c 100644
--- a/src/lib/marble/cloudsync/OwncloudSyncBackend.h
+++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.h
@@ -11,9 +11,6 @@
#ifndef OWNCLOUDSYNCBACKEND_H
#define OWNCLOUDSYNCBACKEND_H
-#include "CloudRouteModel.h"
-#include "GeoDataDocument.h"
-
#include <QObject>
#include <QVector>
#include <QNetworkReply>
@@ -24,6 +21,7 @@ class QDir;
namespace Marble {
class CloudSyncManager;
+class RouteItem;
class OwncloudSyncBackend : public QObject
{
diff --git a/src/lib/marble/cloudsync/RouteItemDelegate.cpp b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
index 17377d7..98ad8bb 100644
--- a/src/lib/marble/cloudsync/RouteItemDelegate.cpp
+++ b/src/lib/marble/cloudsync/RouteItemDelegate.cpp
@@ -1,5 +1,7 @@
#include "RouteItemDelegate.h"
+#include "CloudRouteModel.h"
+
#ifdef MARBLE_NO_WEBKITWIDGETS
#include <QWidget>
#else
diff --git a/src/lib/marble/cloudsync/RouteItemDelegate.h b/src/lib/marble/cloudsync/RouteItemDelegate.h
index eb3775d..7e319be 100644
--- a/src/lib/marble/cloudsync/RouteItemDelegate.h
+++ b/src/lib/marble/cloudsync/RouteItemDelegate.h
@@ -1,13 +1,12 @@
#ifndef ROUTEITEMDELEGATE_H
#define ROUTEITEMDELEGATE_H
-#include "CloudRouteModel.h"
-
#include <QStyledItemDelegate>
class QListView;
namespace Marble {
+class CloudRouteModel;
class RouteItemDelegate : public QStyledItemDelegate {
Q_OBJECT
diff --git a/src/lib/marble/cloudsync/RouteSyncManager.cpp b/src/lib/marble/cloudsync/RouteSyncManager.cpp
index ed81be1..eb5365a 100644
--- a/src/lib/marble/cloudsync/RouteSyncManager.cpp
+++ b/src/lib/marble/cloudsync/RouteSyncManager.cpp
@@ -16,9 +16,11 @@
#include "GeoDataFolder.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
+#include "CloudRouteModel.h"
#include "CloudRoutesDialog.h"
#include "CloudSyncManager.h"
#include "OwncloudSyncBackend.h"
+#include "RouteItem.h"
#include "RoutingManager.h"
#include <QDir>
diff --git a/src/lib/marble/declarative/DeclarativeDataPlugin.cpp b/src/lib/marble/declarative/DeclarativeDataPlugin.cpp
index 0d3c011..a9fad73 100644
--- a/src/lib/marble/declarative/DeclarativeDataPlugin.cpp
+++ b/src/lib/marble/declarative/DeclarativeDataPlugin.cpp
@@ -16,6 +16,8 @@
#include "MarbleDebug.h"
#include "MarbleModel.h"
+#include "RenderState.h"
+#include "GeoDataCoordinates.h"
#include <QAbstractListModel>
#include <QMetaObject>
diff --git a/src/lib/marble/declarative/MarbleQuickItem.cpp b/src/lib/marble/declarative/MarbleQuickItem.cpp
index 18806a0..997303d 100644
--- a/src/lib/marble/declarative/MarbleQuickItem.cpp
+++ b/src/lib/marble/declarative/MarbleQuickItem.cpp
@@ -21,7 +21,6 @@
#include <ViewportParams.h>
#include <GeoPainter.h>
#include <GeoDataLookAt.h>
-#include <MarbleLocale.h>
#include <Planet.h>
#include <MarbleAbstractPresenter.h>
#include <AbstractFloatItem.h>
@@ -31,6 +30,7 @@
#include <PluginManager.h>
#include <RenderPlugin.h>
#include <MarbleMath.h>
+#include <GeoDataLatLonAltBox.h>
#include <GeoDataCoordinates.h>
#include <GeoDataTypes.h>
#include <ReverseGeocodingRunnerManager.h>
diff --git a/src/lib/marble/declarative/MarbleQuickItem.h b/src/lib/marble/declarative/MarbleQuickItem.h
index 6631306..151bc39 100644
--- a/src/lib/marble/declarative/MarbleQuickItem.h
+++ b/src/lib/marble/declarative/MarbleQuickItem.h
@@ -14,14 +14,17 @@
#include "marble_declarative_export.h"
#include <QSharedPointer>
#include <QQuickPaintedItem>
-#include "GeoDataPlacemark.h"
+#include "GeoDataAccuracy.h"
#include "MarbleGlobal.h"
#include "PositionProviderPluginInterface.h"
#include "MarbleMap.h"
#include "Placemark.h"
+#include "Coordinate.h"
namespace Marble
{
+ class GeoDataLatLonBox;
+ class GeoDataPlacemark;
class MarbleModel;
class MarbleInputHandler;
class MarbleQuickItemPrivate;
diff --git a/src/lib/marble/declarative/Navigation.cpp b/src/lib/marble/declarative/Navigation.cpp
index bc445ea..b7f14a5 100644
--- a/src/lib/marble/declarative/Navigation.cpp
+++ b/src/lib/marble/declarative/Navigation.cpp
@@ -13,6 +13,7 @@
#include "Planet.h"
#include "MarbleModel.h"
#include "MarbleQuickItem.h"
+#include "routing/Route.h"
#include "routing/RoutingManager.h"
#include "routing/RoutingModel.h"
#include "PositionTracking.h"
@@ -20,6 +21,7 @@
#include "AutoNavigation.h"
#include "routing/VoiceNavigationModel.h"
#include "ViewportParams.h"
+#include "GeoDataAccuracy.h"
namespace Marble {
diff --git a/src/lib/marble/declarative/Navigation.h b/src/lib/marble/declarative/Navigation.h
index 0bf83b0..adf87dd 100644
--- a/src/lib/marble/declarative/Navigation.h
+++ b/src/lib/marble/declarative/Navigation.h
@@ -17,7 +17,6 @@
namespace Marble {
class MarbleQuickItem;
-class MarbleModel;
class NavigationPrivate;
class Navigation : public QObject
diff --git a/src/lib/marble/declarative/Placemark.h b/src/lib/marble/declarative/Placemark.h
index 97236ff..620a4c3 100644
--- a/src/lib/marble/declarative/Placemark.h
+++ b/src/lib/marble/declarative/Placemark.h
@@ -11,10 +11,7 @@
#ifndef MARBLE_DECLARATIVE_PLACEMARK_H
#define MARBLE_DECLARATIVE_PLACEMARK_H
-#include "Coordinate.h"
-
#include "GeoDataPlacemark.h"
-#include "GeoDataFeature.h"
#include <QObject>
#include <QtQml>
diff --git a/src/lib/marble/declarative/Routing.cpp b/src/lib/marble/declarative/Routing.cpp
index d242c57..d89a335 100644
--- a/src/lib/marble/declarative/Routing.cpp
+++ b/src/lib/marble/declarative/Routing.cpp
@@ -17,6 +17,7 @@
#include "routing/RoutingManager.h"
#include "routing/RouteRequest.h"
#include "routing/RoutingProfilesModel.h"
+#include <GeoDataLatLonAltBox.h>
#include <GeoPainter.h>
#include <routing/Route.h>
#include <declarative/RouteRequestModel.h>
diff --git a/src/lib/marble/declarative/Routing.h b/src/lib/marble/declarative/Routing.h
index f204831..24f5500 100644
--- a/src/lib/marble/declarative/Routing.h
+++ b/src/lib/marble/declarative/Routing.h
@@ -13,7 +13,6 @@
#include <QQuickPaintedItem>
-#include <Coordinate.h>
#include <Placemark.h>
#include <routing/RoutingModel.h>
#include <RouteRequestModel.h>
diff --git a/src/lib/marble/declarative/SearchBackend.cpp b/src/lib/marble/declarative/SearchBackend.cpp
index 730ab5f..6fe6bf5 100644
--- a/src/lib/marble/declarative/SearchBackend.cpp
+++ b/src/lib/marble/declarative/SearchBackend.cpp
@@ -9,6 +9,8 @@
//
#include "SearchBackend.h"
+
+#include "SearchRunnerManager.h"
#include "MarblePlacemarkModel.h"
#include "MarbleModel.h"
#include "Coordinate.h"
diff --git a/src/lib/marble/declarative/SearchBackend.h b/src/lib/marble/declarative/SearchBackend.h
index 493c7e2..abcd58c 100644
--- a/src/lib/marble/declarative/SearchBackend.h
+++ b/src/lib/marble/declarative/SearchBackend.h
@@ -15,7 +15,6 @@
#include <QSortFilterProxyModel>
#include "MarbleQuickItem.h"
-#include "SearchRunnerManager.h"
#include "MarblePlacemarkModel.h"
#include "Placemark.h"
@@ -23,6 +22,7 @@ class QCompleter;
namespace Marble
{
+class SearchRunnerManager;
class SearchBackend : public QObject
{
diff --git a/src/lib/marble/geodata/data/GeoDataAbstractView.cpp b/src/lib/marble/geodata/data/GeoDataAbstractView.cpp
index 058ef9e..3b90704 100644
--- a/src/lib/marble/geodata/data/GeoDataAbstractView.cpp
+++ b/src/lib/marble/geodata/data/GeoDataAbstractView.cpp
@@ -14,6 +14,8 @@
#include "GeoDataCamera.h"
#include "GeoDataLookAt.h"
#include "GeoDataTypes.h"
+#include "GeoDataTimeSpan.h"
+#include "GeoDataTimeStamp.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataAbstractView.h b/src/lib/marble/geodata/data/GeoDataAbstractView.h
index c1c1615..3ad1a59 100644
--- a/src/lib/marble/geodata/data/GeoDataAbstractView.h
+++ b/src/lib/marble/geodata/data/GeoDataAbstractView.h
@@ -13,15 +13,14 @@
#include "MarbleGlobal.h"
#include "GeoDataObject.h"
-#include "GeoDataTimeSpan.h"
-#include "GeoDataTimeStamp.h"
-#include "GeoDataCoordinates.h"
#include "geodata_export.h"
namespace Marble
{
-
+class GeoDataCoordinates;
+class GeoDataTimeSpan;
+class GeoDataTimeStamp;
class GeoDataAbstractViewPrivate;
/**
diff --git a/src/lib/marble/geodata/data/GeoDataAlias.h b/src/lib/marble/geodata/data/GeoDataAlias.h
index e1d31f4..6ec7cfa 100644
--- a/src/lib/marble/geodata/data/GeoDataAlias.h
+++ b/src/lib/marble/geodata/data/GeoDataAlias.h
@@ -12,7 +12,7 @@
#ifndef MARBLE_GEODATAALIAS_H
#define MARBLE_GEODATAALIAS_H
-#include "GeoDataObject.h"
+#include "GeoDocument.h"
#include "MarbleGlobal.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h b/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h
index b0d469a..f4a7193 100644
--- a/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h
+++ b/src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h
@@ -12,13 +12,13 @@
#ifndef MARBLE_GEODATAANIMATEDUPDATE_H
#define MARBLE_GEODATAANIMATEDUPDATE_H
-#include "GeoDataUpdate.h"
#include "GeoDataTourPrimitive.h"
#include "MarbleGlobal.h"
namespace Marble {
class GeoDataAnimatedUpdatePrivate;
+class GeoDataUpdate;
class GEODATA_EXPORT GeoDataAnimatedUpdate: public GeoDataTourPrimitive
{
diff --git a/src/lib/marble/geodata/data/GeoDataCamera.cpp b/src/lib/marble/geodata/data/GeoDataCamera.cpp
index 829773b..4347bd9 100644
--- a/src/lib/marble/geodata/data/GeoDataCamera.cpp
+++ b/src/lib/marble/geodata/data/GeoDataCamera.cpp
@@ -12,6 +12,8 @@
#include "GeoDataCamera.h"
#include "GeoDataCamera_p.h"
+#include "GeoDataTypes.h"
+
#include <QDataStream>
namespace Marble
diff --git a/src/lib/marble/geodata/data/GeoDataCamera_p.h b/src/lib/marble/geodata/data/GeoDataCamera_p.h
index 71a2cf2..8a6057b 100644
--- a/src/lib/marble/geodata/data/GeoDataCamera_p.h
+++ b/src/lib/marble/geodata/data/GeoDataCamera_p.h
@@ -13,7 +13,6 @@
#define MARBLE_GEODATACAMERA_P_H
#include "GeoDataCoordinates.h"
-#include "GeoDataTypes.h"
#include <QAtomicInt>
diff --git a/src/lib/marble/geodata/data/GeoDataContainer.cpp b/src/lib/marble/geodata/data/GeoDataContainer.cpp
index 6aa231d..bb0b3c8 100644
--- a/src/lib/marble/geodata/data/GeoDataContainer.cpp
+++ b/src/lib/marble/geodata/data/GeoDataContainer.cpp
@@ -20,6 +20,8 @@
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataDocument.h"
+#include "GeoDataLatLonAltBox.h"
+#include "GeoDataGeometry.h"
#include "GeoDataNetworkLinkControl.h"
#include "GeoDataNetworkLink.h"
#include "GeoDataGroundOverlay.h"
diff --git a/src/lib/marble/geodata/data/GeoDataDocument.h b/src/lib/marble/geodata/data/GeoDataDocument.h
index f9bfd70..fd9c9bb 100644
--- a/src/lib/marble/geodata/data/GeoDataDocument.h
+++ b/src/lib/marble/geodata/data/GeoDataDocument.h
@@ -45,7 +45,6 @@ enum DocumentRole {
};
-class GeoDataStyle;
class GeoDataStyleMap;
class GeoDataNetworkLinkControl;
class GeoDataSchema;
diff --git a/src/lib/marble/geodata/data/GeoDataExtendedData.h b/src/lib/marble/geodata/data/GeoDataExtendedData.h
index 46a4e6c..51433fe 100644
--- a/src/lib/marble/geodata/data/GeoDataExtendedData.h
+++ b/src/lib/marble/geodata/data/GeoDataExtendedData.h
@@ -13,7 +13,6 @@
#define MARBLE_GEODATAEXTENDEDDATA_H
#include "GeoDataObject.h"
-#include "GeoDataData.h"
#include "geodata_export.h"
#include <QHash>
@@ -23,6 +22,7 @@ namespace Marble
class GeoDataSimpleArrayData;
class GeoDataSchemaData;
+class GeoDataData;
class GeoDataExtendedDataPrivate;
diff --git a/src/lib/marble/geodata/data/GeoDataFeature_p.h b/src/lib/marble/geodata/data/GeoDataFeature_p.h
index c5e3e69..5df69f4 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature_p.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature_p.h
@@ -25,7 +25,6 @@
#include "GeoDataSnippet.h"
#include "GeoDataLookAt.h"
#include "GeoDataCamera.h"
-#include "MarbleDirs.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataFlyTo.h b/src/lib/marble/geodata/data/GeoDataFlyTo.h
index 82dbf60..325b235 100644
--- a/src/lib/marble/geodata/data/GeoDataFlyTo.h
+++ b/src/lib/marble/geodata/data/GeoDataFlyTo.h
@@ -12,12 +12,12 @@
#ifndef MARBLE_GEODATAFLYTO_H
#define MARBLE_GEODATAFLYTO_H
-#include "GeoDataAbstractView.h"
#include "GeoDataTourPrimitive.h"
#include "MarbleGlobal.h"
namespace Marble {
+class GeoDataAbstractView;
class GeoDataFlyToPrivate;
class MARBLE_EXPORT GeoDataFlyTo: public GeoDataTourPrimitive
diff --git a/src/lib/marble/geodata/data/GeoDataGeometry.h b/src/lib/marble/geodata/data/GeoDataGeometry.h
index 477d800..5fa31e6 100644
--- a/src/lib/marble/geodata/data/GeoDataGeometry.h
+++ b/src/lib/marble/geodata/data/GeoDataGeometry.h
@@ -16,7 +16,6 @@
#include "GeoDataObject.h"
-#include "Serializable.h"
#include "MarbleGlobal.h"
#include "geodata_export.h"
@@ -26,12 +25,9 @@ namespace Marble
class GeoDataGeometryPrivate;
-class GeoDataPoint;
-class GeoDataPolygon;
class GeoDataLatLonAltBox;
class GeoDataLineString; // LinearRing is the same!
class GeoDataMultiGeometry;
-class GeoDataOrientation;
/**
* @short A base class for all geodata features
diff --git a/src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp b/src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp
index 8933308..007132e 100644
--- a/src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp
+++ b/src/lib/marble/geodata/data/GeoDataGroundOverlay.cpp
@@ -9,7 +9,9 @@
//
#include "GeoDataGroundOverlay.h"
+
#include "GeoDataTypes.h"
+#include "GeoDataLatLonQuad.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
index e681ef4..79c64a3 100644
--- a/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
+++ b/src/lib/marble/geodata/data/GeoDataGroundOverlay.h
@@ -15,11 +15,11 @@
#include "GeoDataOverlay.h"
#include "MarbleGlobal.h"
#include "GeoDataLatLonBox.h"
-#include "GeoDataLatLonQuad.h"
namespace Marble {
class GeoDataGroundOverlayPrivate;
+class GeoDataLatLonQuad;
class MARBLE_EXPORT GeoDataGroundOverlay: public GeoDataOverlay
{
diff --git a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
index cee0bbd..5d04938 100644
--- a/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
+++ b/src/lib/marble/geodata/data/GeoDataLatLonAltBox.h
@@ -16,8 +16,6 @@
#include "MarbleGlobal.h"
-#include "GeoDataObject.h"
-
#include "geodata_export.h"
#include "GeoDataLatLonBox.h"
diff --git a/src/lib/marble/geodata/data/GeoDataLineString.h b/src/lib/marble/geodata/data/GeoDataLineString.h
index 4c5cd6d..f78a857 100644
--- a/src/lib/marble/geodata/data/GeoDataLineString.h
+++ b/src/lib/marble/geodata/data/GeoDataLineString.h
@@ -20,13 +20,11 @@
#include "geodata_export.h"
#include "GeoDataGeometry.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataLatLonAltBox.h"
namespace Marble
{
-
+class GeoDataCoordinates;
class GeoDataLineStringPrivate;
/*!
diff --git a/src/lib/marble/geodata/data/GeoDataListStyle.cpp b/src/lib/marble/geodata/data/GeoDataListStyle.cpp
index a4e73e8..319876c 100644
--- a/src/lib/marble/geodata/data/GeoDataListStyle.cpp
+++ b/src/lib/marble/geodata/data/GeoDataListStyle.cpp
@@ -10,6 +10,7 @@
#include "GeoDataListStyle.h"
#include "GeoDataTypes.h"
+#include "GeoDataItemIcon.h"
#include "MarbleDirs.h"
#include <QDataStream>
diff --git a/src/lib/marble/geodata/data/GeoDataListStyle.h b/src/lib/marble/geodata/data/GeoDataListStyle.h
index ddc1eef..f3b9344 100644
--- a/src/lib/marble/geodata/data/GeoDataListStyle.h
+++ b/src/lib/marble/geodata/data/GeoDataListStyle.h
@@ -15,13 +15,13 @@
#include "MarbleGlobal.h"
#include "GeoDataObject.h"
-#include "GeoDataItemIcon.h"
#include "geodata_export.h"
namespace Marble
{
class GeoDataListStylePrivate;
+class GeoDataItemIcon;
class GEODATA_EXPORT GeoDataListStyle : public GeoDataObject
{
diff --git a/src/lib/marble/geodata/data/GeoDataLocation.h b/src/lib/marble/geodata/data/GeoDataLocation.h
index 8df8491..42d5789 100644
--- a/src/lib/marble/geodata/data/GeoDataLocation.h
+++ b/src/lib/marble/geodata/data/GeoDataLocation.h
@@ -12,7 +12,7 @@
#ifndef GEODATALOCATION_H
#define GEODATALOCATION_H
-#include "GeoDataGeometry.h"
+#include "GeoDataObject.h"
#include "GeoDataCoordinates.h"
#include "MarbleGlobal.h"
diff --git a/src/lib/marble/geodata/data/GeoDataLookAt.cpp b/src/lib/marble/geodata/data/GeoDataLookAt.cpp
index 59048a7..1b1d9ee 100644
--- a/src/lib/marble/geodata/data/GeoDataLookAt.cpp
+++ b/src/lib/marble/geodata/data/GeoDataLookAt.cpp
@@ -12,6 +12,9 @@
//own
#include "GeoDataLookAt.h"
#include "GeoDataLookAt_p.h"
+
+#include "GeoDataTypes.h"
+
#include "MarbleDebug.h"
namespace Marble
diff --git a/src/lib/marble/geodata/data/GeoDataLookAt_p.h b/src/lib/marble/geodata/data/GeoDataLookAt_p.h
index 56cd6d2..249238a 100644
--- a/src/lib/marble/geodata/data/GeoDataLookAt_p.h
+++ b/src/lib/marble/geodata/data/GeoDataLookAt_p.h
@@ -14,7 +14,6 @@
// Marble
#include "GeoDataCoordinates.h"
-#include "GeoDataTypes.h"
// Qt
#include <QAtomicInt>
diff --git a/src/lib/marble/geodata/data/GeoDataModel.cpp b/src/lib/marble/geodata/data/GeoDataModel.cpp
index 64be665..7c3d89b 100644
--- a/src/lib/marble/geodata/data/GeoDataModel.cpp
+++ b/src/lib/marble/geodata/data/GeoDataModel.cpp
@@ -13,6 +13,11 @@
#include "GeoDataGeometry_p.h"
#include "GeoDataTypes.h"
+#include "GeoDataLink.h"
+#include "GeoDataLocation.h"
+#include "GeoDataOrientation.h"
+#include "GeoDataResourceMap.h"
+#include "GeoDataScale.h"
#include "stdio.h"
diff --git a/src/lib/marble/geodata/data/GeoDataModel.h b/src/lib/marble/geodata/data/GeoDataModel.h
index 30c1127..a8369e7 100644
--- a/src/lib/marble/geodata/data/GeoDataModel.h
+++ b/src/lib/marble/geodata/data/GeoDataModel.h
@@ -15,15 +15,15 @@
#include "GeoDataGeometry.h"
#include "MarbleGlobal.h"
#include "GeoDataLink.h"
-#include "GeoDataScale.h"
-#include "GeoDataOrientation.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataLocation.h"
-#include "GeoDataResourceMap.h"
-#include "GeoDataAlias.h"
namespace Marble {
+class GeoDataCoordinates;
+class GeoDataLink;
+class GeoDataLocation;
+class GeoDataOrientation;
+class GeoDataResourceMap;
+class GeoDataScale;
class GeoDataModelPrivate;
class MARBLE_EXPORT GeoDataModel: public GeoDataGeometry
diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLink.cpp b/src/lib/marble/geodata/data/GeoDataNetworkLink.cpp
index d07c4e3..89c607c 100644
--- a/src/lib/marble/geodata/data/GeoDataNetworkLink.cpp
+++ b/src/lib/marble/geodata/data/GeoDataNetworkLink.cpp
@@ -9,7 +9,9 @@
//
#include "GeoDataNetworkLink.h"
+
#include "GeoDataTypes.h"
+#include "GeoDataLink.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLink.h b/src/lib/marble/geodata/data/GeoDataNetworkLink.h
index 058e855..aec3f18 100644
--- a/src/lib/marble/geodata/data/GeoDataNetworkLink.h
+++ b/src/lib/marble/geodata/data/GeoDataNetworkLink.h
@@ -13,11 +13,11 @@
#define MARBLE_GEODATANETWORKLINK_H
#include "GeoDataFeature.h"
-#include "GeoDataLink.h"
#include "MarbleGlobal.h"
namespace Marble {
+class GeoDataLink;
class GeoDataNetworkLinkPrivate;
class GEODATA_EXPORT GeoDataNetworkLink: public GeoDataFeature
diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp
index 6b33bfd..20ff266 100644
--- a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp
+++ b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.cpp
@@ -9,9 +9,11 @@
//
#include "GeoDataNetworkLinkControl.h"
+
#include "GeoDataTypes.h"
#include "GeoDataCamera.h"
#include "GeoDataLookAt.h"
+#include "GeoDataUpdate.h"
#include <QDateTime>
diff --git a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
index 17e23e0..f5d0655 100644
--- a/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
+++ b/src/lib/marble/geodata/data/GeoDataNetworkLinkControl.h
@@ -12,8 +12,6 @@
#define GEODATANETWORKLINKCONTROL_H
#include "GeoDataContainer.h"
-#include "GeoDataUpdate.h"
-#include "GeoDataAbstractView.h"
#include "marble_export.h"
class QDateTime;
@@ -21,6 +19,8 @@ class QDateTime;
namespace Marble
{
+class GeoDataAbstractView;
+class GeoDataUpdate;
class GeoDataNetworkLinkControlPrivate;
class MARBLE_EXPORT GeoDataNetworkLinkControl : public GeoDataContainer
diff --git a/src/lib/marble/geodata/data/GeoDataOrientation.h b/src/lib/marble/geodata/data/GeoDataOrientation.h
index 6621822..cc4552b 100644
--- a/src/lib/marble/geodata/data/GeoDataOrientation.h
+++ b/src/lib/marble/geodata/data/GeoDataOrientation.h
@@ -11,7 +11,7 @@
#ifndef GEODATAORIENTATION_H
#define GEODATAORIENTATION_H
-#include "GeoDataGeometry.h"
+#include "GeoDataObject.h"
#include "MarbleGlobal.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp
index 1f87d8c..3165f00 100644
--- a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.cpp
@@ -11,6 +11,9 @@
#include "GeoDataPhotoOverlay.h"
#include "GeoDataTypes.h"
+#include "GeoDataPoint.h"
+#include "GeoDataImagePyramid.h"
+#include "GeoDataViewVolume.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
index 926bb26..6e1a161 100644
--- a/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
+++ b/src/lib/marble/geodata/data/GeoDataPhotoOverlay.h
@@ -15,14 +15,14 @@
#include "GeoDataOverlay.h"
#include "MarbleGlobal.h"
-#include "GeoDataPoint.h"
-#include "GeoDataImagePyramid.h"
-#include "GeoDataViewVolume.h"
#include "marble_export.h"
namespace Marble {
class GeoDataPhotoOverlayPrivate;
+class GeoDataPoint;
+class GeoDataImagePyramid;
+class GeoDataViewVolume;
class MARBLE_EXPORT GeoDataPhotoOverlay: public GeoDataOverlay
{
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
index 8083d91..9b92661 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp
@@ -19,6 +19,8 @@
#include "GeoDataMultiGeometry.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLatLonAltBox.h"
+#include "GeoDataData.h"
#include "osm/OsmPlacemarkData.h"
// Qt
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h
index 2f93e0a..47f3a40 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h
@@ -17,12 +17,7 @@
#include <QDateTime>
-#include "GeoDataPoint.h"
-#include "GeoDataLineString.h"
-#include "GeoDataLinearRing.h"
-#include "GeoDataLookAt.h"
-#include "GeoDataPolygon.h"
-#include "GeoDataMultiGeometry.h"
+#include "GeoDataCoordinates.h"
#include "GeoDataFeature.h"
#include "geodata_export.h"
@@ -34,6 +29,9 @@ namespace Marble
class GeoDataPlacemarkPrivate;
class OsmPlacemarkData;
+class GeoDataLookAt;
+class GeoDataPolygon;
+class GeoDataGeometry;
/**
* @short a class representing a point of interest on the map
diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark_p.h b/src/lib/marble/geodata/data/GeoDataPlacemark_p.h
index 3be8dfe..13b5cb7 100644
--- a/src/lib/marble/geodata/data/GeoDataPlacemark_p.h
+++ b/src/lib/marble/geodata/data/GeoDataPlacemark_p.h
@@ -13,9 +13,13 @@
#include "GeoDataFeature_p.h"
+#include "GeoDataPoint.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoDataMultiTrack.h"
#include "GeoDataTrack.h"
#include "GeoDataTypes.h"
+#include "GeoDataMultiGeometry.h"
#include "osm/OsmPlacemarkData.h"
namespace Marble
diff --git a/src/lib/marble/geodata/data/GeoDataPolygon.h b/src/lib/marble/geodata/data/GeoDataPolygon.h
index a9ce54f..b84d2ab 100644
--- a/src/lib/marble/geodata/data/GeoDataPolygon.h
+++ b/src/lib/marble/geodata/data/GeoDataPolygon.h
@@ -19,13 +19,13 @@
#include "geodata_export.h"
#include "GeoDataGeometry.h"
-#include "GeoDataLinearRing.h"
-#include "GeoDataLatLonAltBox.h"
namespace Marble
{
class GeoDataPolygonPrivate;
+class GeoDataLinearRing;
+class GeoDataCoordinates;
/*!
\class GeoDataPolygon
diff --git a/src/lib/marble/geodata/data/GeoDataPolygon_p.h b/src/lib/marble/geodata/data/GeoDataPolygon_p.h
index 5605057..4d85f34 100644
--- a/src/lib/marble/geodata/data/GeoDataPolygon_p.h
+++ b/src/lib/marble/geodata/data/GeoDataPolygon_p.h
@@ -14,6 +14,7 @@
#include "GeoDataGeometry_p.h"
#include "GeoDataTypes.h"
+#include "GeoDataLinearRing.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataRegion.cpp b/src/lib/marble/geodata/data/GeoDataRegion.cpp
index 0f074ea..20bd25a 100644
--- a/src/lib/marble/geodata/data/GeoDataRegion.cpp
+++ b/src/lib/marble/geodata/data/GeoDataRegion.cpp
@@ -19,7 +19,6 @@
#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataGeometry.h"
-
#include "GeoDataTypes.h"
// std
diff --git a/src/lib/marble/geodata/data/GeoDataRegion.h b/src/lib/marble/geodata/data/GeoDataRegion.h
index 228651c..524a8c0 100644
--- a/src/lib/marble/geodata/data/GeoDataRegion.h
+++ b/src/lib/marble/geodata/data/GeoDataRegion.h
@@ -13,14 +13,13 @@
#define MARBLE_GEODATAREGION_H
#include "GeoDataObject.h"
-#include "GeoDataLatLonAltBox.h"
-#include "GeoDataLod.h"
-
namespace Marble
{
class GeoDataFeature;
+class GeoDataLatLonAltBox;
+class GeoDataLod;
class GeoDataRegionPrivate;
/*!
diff --git a/src/lib/marble/geodata/data/GeoDataRegion_p.h b/src/lib/marble/geodata/data/GeoDataRegion_p.h
index f3a8069..1b044d8 100644
--- a/src/lib/marble/geodata/data/GeoDataRegion_p.h
+++ b/src/lib/marble/geodata/data/GeoDataRegion_p.h
@@ -13,7 +13,9 @@
#include "GeoDataRegion.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataTypes.h"
+#include "GeoDataLod.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataResourceMap.cpp b/src/lib/marble/geodata/data/GeoDataResourceMap.cpp
index fdf1e14..aebbc93 100644
--- a/src/lib/marble/geodata/data/GeoDataResourceMap.cpp
+++ b/src/lib/marble/geodata/data/GeoDataResourceMap.cpp
@@ -9,6 +9,8 @@
//
#include "GeoDataResourceMap.h"
+
+#include "GeoDataAlias.h"
#include "GeoDataTypes.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataResourceMap.h b/src/lib/marble/geodata/data/GeoDataResourceMap.h
index ef611b5..7c763e0 100644
--- a/src/lib/marble/geodata/data/GeoDataResourceMap.h
+++ b/src/lib/marble/geodata/data/GeoDataResourceMap.h
@@ -11,12 +11,12 @@
#ifndef GEODATARESOURCEMAP_H
#define GEODATARESOURCEMAP_H
-#include "GeoDataAlias.h"
-#include "GeoDataObject.h"
+#include "GeoDataDocument.h"
#include "MarbleGlobal.h"
namespace Marble {
+class GeoDataAlias;
class GeoDataResourceMapPrivate;
class MARBLE_EXPORT GeoDataResourceMap: public GeoNode
diff --git a/src/lib/marble/geodata/data/GeoDataScale.h b/src/lib/marble/geodata/data/GeoDataScale.h
index 6d37665..e6cd168 100644
--- a/src/lib/marble/geodata/data/GeoDataScale.h
+++ b/src/lib/marble/geodata/data/GeoDataScale.h
@@ -12,7 +12,7 @@
#ifndef GEODATASCALE_H
#define GEODATASCALE_H
-#include "GeoDataGeometry.h"
+#include "GeoDataObject.h"
#include "MarbleGlobal.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/data/GeoDataSchema.cpp b/src/lib/marble/geodata/data/GeoDataSchema.cpp
index 6f9e865..5ec15e2 100644
--- a/src/lib/marble/geodata/data/GeoDataSchema.cpp
+++ b/src/lib/marble/geodata/data/GeoDataSchema.cpp
@@ -8,12 +8,14 @@
// Copyright 2014 Abhinav Gangwar <abhgang@gmail.com>
//
+#include "GeoDataSchema.h"
+
// Qt
#include <QDataStream>
// Marble
-#include "GeoDataSchema.h"
#include "GeoDataTypes.h"
+#include "GeoDataSimpleField.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataSchema.h b/src/lib/marble/geodata/data/GeoDataSchema.h
index c17dcee..901eb68 100644
--- a/src/lib/marble/geodata/data/GeoDataSchema.h
+++ b/src/lib/marble/geodata/data/GeoDataSchema.h
@@ -17,7 +17,6 @@
// Marble
#include "GeoDataObject.h"
-#include "GeoDataSimpleField.h"
#include "geodata_export.h"
class QDataStream;
@@ -26,6 +25,7 @@ namespace Marble
{
class GeoDataSchemaPrivate;
+class GeoDataSimpleField;
class GEODATA_EXPORT GeoDataSchema : public GeoDataObject
{
diff --git a/src/lib/marble/geodata/data/GeoDataSchemaData.cpp b/src/lib/marble/geodata/data/GeoDataSchemaData.cpp
index 1b04ea1..1cdc881 100644
--- a/src/lib/marble/geodata/data/GeoDataSchemaData.cpp
+++ b/src/lib/marble/geodata/data/GeoDataSchemaData.cpp
@@ -8,13 +8,15 @@
// Copyright 2014 Abhinav Gangwar <abhgang@gmail.com>
//
+#include "GeoDataSchemaData.h"
+
// Qt
#include <QDataStream>
#include <QString>
#include <QHash>
// Marble
-#include "GeoDataSchemaData.h"
+#include "GeoDataSimpleData.h"
#include "GeoDataTypes.h"
namespace Marble
diff --git a/src/lib/marble/geodata/data/GeoDataSchemaData.h b/src/lib/marble/geodata/data/GeoDataSchemaData.h
index d7b9cab..bc38289 100644
--- a/src/lib/marble/geodata/data/GeoDataSchemaData.h
+++ b/src/lib/marble/geodata/data/GeoDataSchemaData.h
@@ -16,7 +16,6 @@
// Marble
#include "GeoDocument.h"
-#include "GeoDataSimpleData.h"
#include "geodata_export.h"
@@ -24,6 +23,7 @@ namespace Marble
{
class GeoDataSchemaDataPrivate;
+class GeoDataSimpleData;
class GEODATA_EXPORT GeoDataSchemaData : public GeoNode
{
diff --git a/src/lib/marble/geodata/data/GeoDataStyle.cpp b/src/lib/marble/geodata/data/GeoDataStyle.cpp
index 188ad44..73bd446 100644
--- a/src/lib/marble/geodata/data/GeoDataStyle.cpp
+++ b/src/lib/marble/geodata/data/GeoDataStyle.cpp
@@ -12,6 +12,12 @@
#include "GeoDataStyle.h"
#include "GeoDataTypes.h"
+#include "GeoDataBalloonStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataListStyle.h"
+#include "GeoDataPolyStyle.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/data/GeoDataStyle.h b/src/lib/marble/geodata/data/GeoDataStyle.h
index e974b6c..39d1496 100644
--- a/src/lib/marble/geodata/data/GeoDataStyle.h
+++ b/src/lib/marble/geodata/data/GeoDataStyle.h
@@ -15,12 +15,6 @@
#include "GeoDataStyleSelector.h"
-#include "GeoDataIconStyle.h"
-#include "GeoDataLabelStyle.h"
-#include "GeoDataPolyStyle.h"
-#include "GeoDataLineStyle.h"
-#include "GeoDataBalloonStyle.h"
-#include "GeoDataListStyle.h"
#include "geodata_export.h"
@@ -33,6 +27,12 @@ class QColor;
namespace Marble
{
+class GeoDataBalloonStyle;
+class GeoDataIconStyle;
+class GeoDataLabelStyle;
+class GeoDataLineStyle;
+class GeoDataListStyle;
+class GeoDataPolyStyle;
class GeoDataStylePrivate;
/**
diff --git a/src/lib/marble/geodata/data/GeoDataStyleMap.h b/src/lib/marble/geodata/data/GeoDataStyleMap.h
index aba14e8..088d637 100644
--- a/src/lib/marble/geodata/data/GeoDataStyleMap.h
+++ b/src/lib/marble/geodata/data/GeoDataStyleMap.h
@@ -16,7 +16,6 @@
#include <QString>
#include <QMap>
-#include "GeoDataObject.h"
#include "GeoDataStyleSelector.h"
#include "geodata_export.h"
diff --git a/src/lib/marble/geodata/data/GeoDataTimeSpan.h b/src/lib/marble/geodata/data/GeoDataTimeSpan.h
index 1682366..0372a6d 100644
--- a/src/lib/marble/geodata/data/GeoDataTimeSpan.h
+++ b/src/lib/marble/geodata/data/GeoDataTimeSpan.h
@@ -11,15 +11,14 @@
#ifndef MARBLE_GEODATATIMESPAN_H
#define MARBLE_GEODATATIMESPAN_H
-#include "GeoDataObject.h"
#include "GeoDataTimePrimitive.h"
-#include "GeoDataTimeStamp.h"
#include "geodata_export.h"
namespace Marble
{
+class GeoDataTimeStamp;
class GeoDataTimeSpanPrivate;
class GEODATA_EXPORT GeoDataTimeSpan : public GeoDataTimePrimitive
diff --git a/src/lib/marble/geodata/data/GeoDataTimeStamp.h b/src/lib/marble/geodata/data/GeoDataTimeStamp.h
index 31f1f3c..6981a51 100644
--- a/src/lib/marble/geodata/data/GeoDataTimeStamp.h
+++ b/src/lib/marble/geodata/data/GeoDataTimeStamp.h
@@ -11,7 +11,6 @@
#ifndef MARBLE_GEODATATIMESTAMP_H
#define MARBLE_GEODATATIMESTAMP_H
-#include "GeoDataObject.h"
#include "GeoDataTimePrimitive.h"
#include "geodata_export.h"
diff --git a/src/lib/marble/geodata/data/GeoDataTour.h b/src/lib/marble/geodata/data/GeoDataTour.h
index d91be37..b594b00 100644
--- a/src/lib/marble/geodata/data/GeoDataTour.h
+++ b/src/lib/marble/geodata/data/GeoDataTour.h
@@ -12,7 +12,6 @@
#define GEODATATOUR_H
#include "GeoDataFeature.h"
-#include "GeoDataPlaylist.h"
#include "geodata_export.h"
namespace Marble
diff --git a/src/lib/marble/geodata/data/GeoDataTrack.h b/src/lib/marble/geodata/data/GeoDataTrack.h
index d985fa1..a06bcf1 100644
--- a/src/lib/marble/geodata/data/GeoDataTrack.h
+++ b/src/lib/marble/geodata/data/GeoDataTrack.h
@@ -11,7 +11,6 @@
#ifndef MARBLE_GEODATATRACK_H
#define MARBLE_GEODATATRACK_H
-#include "GeoDataCoordinates.h"
#include "GeoDataGeometry.h"
#include <QList>
@@ -23,6 +22,7 @@ namespace Marble {
class GeoDataTrackPrivate;
class GeoDataExtendedData;
class GeoDataLineString;
+class GeoDataCoordinates;
/**
* @class GeoDataTrack
diff --git a/src/lib/marble/geodata/data/GeoDataUpdate.cpp b/src/lib/marble/geodata/data/GeoDataUpdate.cpp
index ced3e18..e231359 100644
--- a/src/lib/marble/geodata/data/GeoDataUpdate.cpp
+++ b/src/lib/marble/geodata/data/GeoDataUpdate.cpp
@@ -9,6 +9,10 @@
//
#include "GeoDataUpdate.h"
+
+#include "GeoDataCreate.h"
+#include "GeoDataDelete.h"
+#include "GeoDataChange.h"
#include "GeoDataTypes.h"
#include <QString>
diff --git a/src/lib/marble/geodata/data/GeoDataUpdate.h b/src/lib/marble/geodata/data/GeoDataUpdate.h
index 924fd15..c40b937 100644
--- a/src/lib/marble/geodata/data/GeoDataUpdate.h
+++ b/src/lib/marble/geodata/data/GeoDataUpdate.h
@@ -12,14 +12,14 @@
#define GEODATAUPDATE_H
#include "GeoDataObject.h"
-#include "GeoDataCreate.h"
-#include "GeoDataDelete.h"
-#include "GeoDataChange.h"
#include "marble_export.h"
namespace Marble
{
+class GeoDataChange;
+class GeoDataCreate;
+class GeoDataDelete;
class GeoDataUpdatePrivate;
class MARBLE_EXPORT GeoDataUpdate : public GeoDataObject
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
index 163e02f..bcc72ad 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
@@ -13,6 +13,8 @@
#include "GeoDataFeature.h"
#include "GeoDataLineString.h"
#include "GeoDataLineStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataPolyStyle.h"
#include "GeoPainter.h"
#include "StyleBuilder.h"
#include "ViewportParams.h"
diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
index 02e7d60..404ee5a 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.h
@@ -12,13 +12,13 @@
#define MARBLE_GEOLINESTRINGGRAPHICSITEM_H
#include "GeoGraphicsItem.h"
+#include "MarbleGlobal.h"
#include "marble_export.h"
namespace Marble
{
class GeoDataLineString;
-class GeoDataLineStyle;
class MARBLE_EXPORT GeoLineStringGraphicsItem : public GeoGraphicsItem
{
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
index a74f4b1..54d3789 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
@@ -12,6 +12,7 @@
#include "GeoPainter.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include "GeoDataFeature.h"
#include "StyleBuilder.h"
#include "ViewportParams.h"
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h
index cc0936b..fb62bb9 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/GeoPointGraphicsItem.h
@@ -13,7 +13,6 @@
#include "GeoDataPoint.h"
#include "GeoGraphicsItem.h"
-#include "GeoDataLatLonAltBox.h"
#include "marble_export.h"
namespace Marble
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
index 40b8936..2155b13 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp
@@ -13,10 +13,14 @@
#include "GeoDataLinearRing.h"
#include "GeoDataPolygon.h"
#include "GeoPainter.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataTypes.h"
#include "GeoDataPlacemark.h"
#include "ViewportParams.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataPolyStyle.h"
#include "MarbleDirs.h"
#include "MarbleDebug.h"
#include "OsmPlacemarkData.h"
diff --git a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp
index 47e057c..77d2525 100644
--- a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.cpp
@@ -12,6 +12,8 @@
#include "ScreenOverlayGraphicsItem.h"
#include "ViewportParams.h"
+#include "GeoDataScreenOverlay.h"
+#include "GeoPainter.h"
namespace Marble {
diff --git a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h
index f54e442..665545e 100644
--- a/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h
+++ b/src/lib/marble/geodata/graphicsitem/ScreenOverlayGraphicsItem.h
@@ -12,9 +12,7 @@
#ifndef SCREENOVERLAYGRAPHICSITEM_H
#define SCREENOVERLAYGRAPHICSITEM_H
-#include "GeoDataScreenOverlay.h"
#include "GeoDataVec2.h"
-#include "GeoPainter.h"
#include "ScreenGraphicsItem.h"
#include "marble_export.h"
@@ -22,6 +20,8 @@
namespace Marble {
+class GeoDataScreenOverlay;
+
class MARBLE_EXPORT ScreenOverlayGraphicsItem : public ScreenGraphicsItem
{
public:
diff --git a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
index f2cbdd5..e768c6a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp
@@ -27,6 +27,7 @@
#include "KmlElementDictionary.h"
#include "GeoDataGeometry.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataGroundOverlay.h"
#include "GeoDataPoint.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
index 4449e3d..eec8fc4 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp
@@ -17,6 +17,7 @@
#include "KmlElementDictionary.h"
#include "GeoDataGeometry.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataGroundOverlay.h"
#include "GeoDataPoint.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
index 005452a..8041761 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlLinearRingTagHandler.cpp
@@ -28,6 +28,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataPolygon.h"
#include "GeoDataMultiGeometry.h"
+#include "GeoDataLinearRing.h"
#include "GeoParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.cpp
index a1b5629..87f6bae 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlMemberTagHandler.cpp
@@ -11,6 +11,7 @@
#include "KmlMemberTagHandler.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataPolygon.h"
#include "GeoDataGeometry.h"
#include "GeoDataTypes.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
index 641468b..22db167 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp
@@ -15,6 +15,7 @@
#include "KmlElementDictionary.h"
#include "KmlObjectTagHandler.h"
#include "GeoDataModel.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataPlacemark.h"
#include "GeoDataParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.cpp
index 1044b8d..f331804 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlNdTagHandler.cpp
@@ -17,7 +17,9 @@
#include "GeoDataGeometry.h"
#include "GeoDataPlacemark.h"
#include "GeoDataLineString.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataPolygon.h"
+#include "GeoDataPoint.h"
#include "GeoDataTypes.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h
index 26b8f5c..0737740 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h
+++ b/src/lib/marble/geodata/handlers/kml/KmlOsmPlacemarkDataTagHandler.h
@@ -16,9 +16,6 @@
namespace Marble
{
class OsmPlacemarkData;
-class GeoDataLineString;
-class GeoDataPolygon;
-class GeoDataPlacemark;
namespace kml
{
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
index 8203608..a44662f 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPointTagHandler.cpp
@@ -26,6 +26,7 @@
#include "KmlElementDictionary.h"
#include "KmlObjectTagHandler.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataPoint.h"
#include "GeoDataMultiGeometry.h"
#include "GeoDataPhotoOverlay.h"
#include "GeoParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
index 396ff8a..5f2b384 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlPolygonTagHandler.cpp
@@ -27,6 +27,7 @@
#include "KmlObjectTagHandler.h"
#include "GeoDataPlacemark.h"
#include "GeoDataMultiGeometry.h"
+#include "GeoDataPolygon.h"
#include "GeoParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
index bbcb6c9..dbfb2a3 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlResourceMapTagHandler.cpp
@@ -16,6 +16,7 @@
#include "GeoDataScale.h"
#include "GeoDataGeometry.h"
#include "GeoDataModel.h"
+#include "GeoDataResourceMap.h"
#include "GeoDataParser.h"
namespace Marble
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
index e947ecf..cd7780d 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.cpp
@@ -15,6 +15,7 @@
#include "KmlElementDictionary.h"
#include "GeoDataSchemaData.h"
+#include "GeoDataSimpleData.h"
#include "GeoParser.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h
index eed3ab4..99b43be 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h
+++ b/src/lib/marble/geodata/handlers/kml/KmlSimpleDataTagHandler.h
@@ -12,7 +12,6 @@
#define MARBLE_KMLSIMPLEDATATAGHANDLER_H
#include "GeoTagHandler.h"
-#include "GeoDataSimpleData.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
index 86112c8..be7d694 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTessellateTagHandler.cpp
@@ -25,6 +25,8 @@
#include "KmlElementDictionary.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoDataGeometry.h"
#include "GeoDataPoint.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
index 4013152..3bd9f9a 100644
--- a/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
+++ b/src/lib/marble/geodata/handlers/kml/KmlTrackTagHandler.cpp
@@ -13,6 +13,7 @@
#include "GeoDataMultiTrack.h"
#include "GeoDataTrack.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataMultiGeometry.h"
#include "KmlElementDictionary.h"
#include "MarbleDebug.h"
diff --git a/src/lib/marble/geodata/parser/GeoTagHandler.h b/src/lib/marble/geodata/parser/GeoTagHandler.h
index 7979269..bcd043a 100644
--- a/src/lib/marble/geodata/parser/GeoTagHandler.h
+++ b/src/lib/marble/geodata/parser/GeoTagHandler.h
@@ -30,7 +30,6 @@ namespace Marble
{
class GeoNode;
-class GeoParser;
/**
* @brief A base class for XML tag handlers
diff --git a/src/lib/marble/geodata/scene/GeoSceneTileDataset.h b/src/lib/marble/geodata/scene/GeoSceneTileDataset.h
index 19c156e..586d806 100644
--- a/src/lib/marble/geodata/scene/GeoSceneTileDataset.h
+++ b/src/lib/marble/geodata/scene/GeoSceneTileDataset.h
@@ -36,7 +36,6 @@ class QUrl;
namespace Marble
{
-class Blending;
class DownloadPolicy;
class ServerLayout;
class TileId;
diff --git a/src/lib/marble/geodata/writer/GeoDataDocumentWriter.cpp b/src/lib/marble/geodata/writer/GeoDataDocumentWriter.cpp
index 4b37482..7f4db46 100644
--- a/src/lib/marble/geodata/writer/GeoDataDocumentWriter.cpp
+++ b/src/lib/marble/geodata/writer/GeoDataDocumentWriter.cpp
@@ -13,6 +13,7 @@
#include "GeoWriterBackend.h"
#include "GeoWriter.h"
#include "GeoTagWriter.h"
+#include "GeoDataDocument.h"
#include "KmlElementDictionary.h"
#include <QFileInfo>
diff --git a/src/lib/marble/geodata/writer/GeoDataDocumentWriter.h b/src/lib/marble/geodata/writer/GeoDataDocumentWriter.h
index d2dc96e..c1cd647 100644
--- a/src/lib/marble/geodata/writer/GeoDataDocumentWriter.h
+++ b/src/lib/marble/geodata/writer/GeoDataDocumentWriter.h
@@ -11,8 +11,6 @@
#ifndef MARBLE_GEODATADOCUMENTWRITER_H
#define MARBLE_GEODATADOCUMENTWRITER_H
-#include "GeoDataDocument.h"
-
#include "marble_export.h"
#include <QIODevice>
@@ -22,6 +20,7 @@ namespace Marble
{
class GeoWriterBackend;
+class GeoDataDocument;
/**
* Write GeoDataDocument content to I/O devices (e.g. a file)
diff --git a/src/lib/marble/geodata/writer/GeoTagWriter.h b/src/lib/marble/geodata/writer/GeoTagWriter.h
index fe0174f..ab5bc83 100644
--- a/src/lib/marble/geodata/writer/GeoTagWriter.h
+++ b/src/lib/marble/geodata/writer/GeoTagWriter.h
@@ -20,7 +20,6 @@
namespace Marble
{
-class GeoDataObject;
class GeoNode;
class GeoWriter;
diff --git a/src/lib/marble/geodata/writer/GeoWriterBackend.h b/src/lib/marble/geodata/writer/GeoWriterBackend.h
index 0de1898..7d2f088 100644
--- a/src/lib/marble/geodata/writer/GeoWriterBackend.h
+++ b/src/lib/marble/geodata/writer/GeoWriterBackend.h
@@ -11,15 +11,16 @@
#ifndef MARBLE_GEOWRITERBACKEND_H
#define MARBLE_GEOWRITERBACKEND_H
-#include "GeoDataDocument.h"
-
#include "marble_export.h"
class QIODevice;
+class QString;
namespace Marble
{
+class GeoDataDocument;
+
class MARBLE_EXPORT GeoWriterBackend
{
public:
diff --git a/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp
index aa1dfdc..9c0078f 100644
--- a/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlCameraTagWriter.cpp
@@ -14,6 +14,8 @@
#include "GeoDataCamera.h"
#include "GeoDataTypes.h"
+#include "GeoDataTimeSpan.h"
+#include "GeoDataTimeStamp.h"
#include "GeoWriter.h"
#include "KmlGroundOverlayWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp
index 52e7bc7..2ea35d8 100644
--- a/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlFeatureTagWriter.cpp
@@ -22,6 +22,7 @@
#include "GeoDataCamera.h"
#include "GeoWriter.h"
#include "GeoDataRegion.h"
+#include "GeoDataLatLonAltBox.h"
#include "KmlElementDictionary.h"
#include "KmlObjectTagWriter.h"
#include "KmlOsmPlacemarkDataTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp
index 7f2135e..031ec84 100644
--- a/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlGroundOverlayWriter.cpp
@@ -11,6 +11,7 @@
#include "KmlGroundOverlayWriter.h"
+#include "GeoDataLatLonQuad.h"
#include "GeoDataGroundOverlay.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp
index 4f444c1..7dc02bf 100644
--- a/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlLineStringTagWriter.cpp
@@ -13,6 +13,7 @@
#include "GeoDataLineString.h"
#include "GeoDataTypes.h"
+#include "GeoDataCoordinates.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "KmlObjectTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp
index a4ba04b..b62c049 100644
--- a/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlLinearRingTagWriter.cpp
@@ -13,6 +13,7 @@
#include "GeoDataLinearRing.h"
#include "GeoDataTypes.h"
+#include "GeoDataCoordinates.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "KmlObjectTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h
index dfc8054..02efa4e 100644
--- a/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlListStyleTagWriter.h
@@ -13,6 +13,7 @@
#include "GeoTagWriter.h"
#include "GeoDataListStyle.h"
+#include "GeoDataItemIcon.h"
namespace Marble
{
diff --git a/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp
index 9b38667..6bfe626 100644
--- a/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp
@@ -14,6 +14,8 @@
#include "GeoDataLookAt.h"
#include "GeoDataTypes.h"
+#include "GeoDataTimeSpan.h"
+#include "GeoDataTimeStamp.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "KmlGroundOverlayWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp
index 0b1deca..e2b5f75 100644
--- a/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlModelTagWriter.cpp
@@ -11,7 +11,12 @@
#include "KmlModelTagWriter.h"
#include "GeoDataModel.h"
+#include "GeoDataAlias.h"
#include "GeoDataTypes.h"
+#include "GeoDataLocation.h"
+#include "GeoDataOrientation.h"
+#include "GeoDataResourceMap.h"
+#include "GeoDataScale.h"
#include "GeoWriter.h"
#include "KmlGroundOverlayWriter.h"
#include "KmlLinkTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp
index 692b760..37ba5e0 100644
--- a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkControlTagWriter.cpp
@@ -12,6 +12,7 @@
#include "GeoDataNetworkLinkControl.h"
#include "GeoDataTypes.h"
+#include "GeoDataUpdate.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp
index 2533c69..536fbb4 100644
--- a/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlNetworkLinkTagWriter.cpp
@@ -12,6 +12,7 @@
#include "GeoDataNetworkLink.h"
#include "GeoDataTypes.h"
+#include "GeoDataLink.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp
index 37f797b..7b85a05 100644
--- a/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.cpp
@@ -10,6 +10,8 @@
#include "KmlObjectTagWriter.h"
+#include "GeoWriter.h"
+
namespace Marble {
void KmlObjectTagWriter::writeIdentifiers( GeoWriter &writer, const GeoDataObject *object )
diff --git a/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h
index 1e1a852..57e5a7c 100644
--- a/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlObjectTagWriter.h
@@ -11,11 +11,11 @@
#ifndef MARBLE_KMLOBJECTTAGWRITER_H
#define MARBLE_KMLOBJECTTAGWRITER_H
-#include <GeoWriter.h>
#include <GeoDataObject.h>
namespace Marble
{
+class GeoWriter;
class KmlObjectTagWriter
{
diff --git a/src/lib/marble/geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp
index b9769e9..d9c8f83 100644
--- a/src/lib/marble/geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlOsmPlacemarkDataTagWriter.cpp
@@ -16,6 +16,8 @@
#include "GeoDataExtendedData.h"
#include "GeoDataFeature.h"
#include "GeoDataTypes.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h
index 82df48b..c051b2b 100644
--- a/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlOverlayTagWriter.h
@@ -11,7 +11,6 @@
#ifndef MARBLE_KMLOVERLAYTAGWRITER_H
#define MARBLE_KMLOVERLAYTAGWRITER_H
-#include "GeoTagWriter.h"
#include "KmlFeatureTagWriter.h"
class QString;
diff --git a/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp
index 9ed55de..c525cd5 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlPhotoOverlayWriter.cpp
@@ -13,6 +13,9 @@
#include "GeoDataPhotoOverlay.h"
#include "GeoDataTypes.h"
+#include "GeoDataImagePyramid.h"
+#include "GeoDataPoint.h"
+#include "GeoDataViewVolume.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp
index 1b809ac..4cd1b8f 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.cpp
@@ -15,6 +15,7 @@
#include "GeoDataExtendedData.h"
#include "GeoDataTimeStamp.h"
#include "GeoDataTypes.h"
+#include "GeoDataPolygon.h"
#include "GeoWriter.h"
#include "GeoDataStyle.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h
index 92852ac..808e1b9 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlPlacemarkTagWriter.h
@@ -11,7 +11,6 @@
#ifndef MARBLE_KMLPLACEMARKTAGWRITER_H
#define MARBLE_KMLPLACEMARKTAGWRITER_H
-#include "GeoTagWriter.h"
#include "KmlFeatureTagWriter.h"
namespace Marble
diff --git a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp
index 131e3ab..a5682f7 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp
@@ -12,6 +12,8 @@
#include "GeoDataPlaylist.h"
#include "GeoDataTypes.h"
+#include "GeoDataSoundCue.h"
+#include "GeoDataWait.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "KmlObjectTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h
index d01fd7b..0168366 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.h
@@ -13,13 +13,13 @@
#include "GeoTagWriter.h"
#include "GeoDataTourControl.h"
-#include "GeoDataWait.h"
-#include "GeoDataFlyTo.h"
-#include "GeoDataSoundCue.h"
namespace Marble
{
+class GeoDataSoundCue;
+class GeoDataWait;
+
class KmlPlaylistTagWriter : public GeoTagWriter
{
public:
diff --git a/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp
index 2861746..f54f0af 100644
--- a/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlPolygonTagWriter.cpp
@@ -12,6 +12,7 @@
#include "KmlPolygonTagWriter.h"
#include "GeoDataPolygon.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp
index 5258f64..326b932 100644
--- a/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlRegionTagWriter.cpp
@@ -11,7 +11,9 @@
#include "KmlRegionTagWriter.h"
#include "GeoDataRegion.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataTypes.h"
+#include "GeoDataLod.h"
#include "GeoWriter.h"
#include "GeoTagWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h b/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h
index 5a29672..34908db 100644
--- a/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlScreenOverlayWriter.h
@@ -11,8 +11,6 @@
#ifndef MARBLE_KMLSCREENOVERLAYWRITER_H
#define MARBLE_KMLSCREENOVERLAYWRITER_H
-#include "GeoTagWriter.h"
-#include "GeoWriter.h"
#include "GeoDataVec2.h"
#include "KmlOverlayTagWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp
index d902100..3870865 100644
--- a/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlStyleTagWriter.cpp
@@ -11,6 +11,12 @@
#include "KmlStyleTagWriter.h"
#include "GeoDataStyle.h"
+#include "GeoDataBalloonStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataListStyle.h"
+#include "GeoDataPolyStyle.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h b/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h
index 114c8fb..adfc551 100644
--- a/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h
+++ b/src/lib/marble/geodata/writers/kml/KmlTimeStampTagWriter.h
@@ -12,10 +12,10 @@
#define MARBLE_KMLTIMESTAMPTAGWRITER_H
#include "GeoTagWriter.h"
-#include "GeoDataTimeStamp.h"
namespace Marble
{
+class GeoDataTimeStamp;
class KmlTimeStampTagWriter : public GeoTagWriter
{
diff --git a/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp
index 1ab1b75..884e544 100644
--- a/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlTourTagWriter.cpp
@@ -12,6 +12,7 @@
#include "GeoDataTour.h"
#include "GeoDataTypes.h"
+#include "GeoDataPlaylist.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp
index a3cf459..b41a54d 100644
--- a/src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlTrackWriter.cpp
@@ -10,6 +10,7 @@
#include "KmlTrackWriter.h"
+#include "GeoDataCoordinates.h"
#include "GeoDataTrack.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
diff --git a/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp b/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp
index fb99a5c..740bbdf 100644
--- a/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp
+++ b/src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp
@@ -10,6 +10,9 @@
#include "KmlUpdateTagWriter.h"
#include "GeoDataUpdate.h"
+#include "GeoDataCreate.h"
+#include "GeoDataDelete.h"
+#include "GeoDataChange.h"
#include "GeoDataTypes.h"
#include "GeoWriter.h"
#include "GeoDataAbstractView.h"
diff --git a/src/lib/marble/graphicsview/BillboardGraphicsItem.h b/src/lib/marble/graphicsview/BillboardGraphicsItem.h
index 7a5106b..6355226 100644
--- a/src/lib/marble/graphicsview/BillboardGraphicsItem.h
+++ b/src/lib/marble/graphicsview/BillboardGraphicsItem.h
@@ -14,12 +14,13 @@
#include "MarbleGraphicsItem.h"
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
+#include <Qt>
class QPointF;
namespace Marble
{
+class GeoDataCoordinates;
/**
* @brief Base class for all 2D labels (a.k.a. billboards) in 3D space.
diff --git a/src/lib/marble/graphicsview/GeoGraphicsItem_p.h b/src/lib/marble/graphicsview/GeoGraphicsItem_p.h
index d13a373..15095ce 100644
--- a/src/lib/marble/graphicsview/GeoGraphicsItem_p.h
+++ b/src/lib/marble/graphicsview/GeoGraphicsItem_p.h
@@ -15,7 +15,6 @@
// Marble
#include "GeoDataStyle.h"
-#include "ViewportParams.h"
#include "StyleBuilder.h"
namespace Marble
diff --git a/src/lib/marble/graphicsview/ScreenGraphicsItem.h b/src/lib/marble/graphicsview/ScreenGraphicsItem.h
index d4e274c..49104db 100644
--- a/src/lib/marble/graphicsview/ScreenGraphicsItem.h
+++ b/src/lib/marble/graphicsview/ScreenGraphicsItem.h
@@ -21,8 +21,6 @@
namespace Marble
{
-class ViewportParams;
-
class ScreenGraphicsItemPrivate;
class MARBLE_EXPORT ScreenGraphicsItem : public MarbleGraphicsItem
diff --git a/src/lib/marble/layers/FogLayer.cpp b/src/lib/marble/layers/FogLayer.cpp
index 144baf5..2b535d9 100644
--- a/src/lib/marble/layers/FogLayer.cpp
+++ b/src/lib/marble/layers/FogLayer.cpp
@@ -15,6 +15,7 @@
#include "GeoPainter.h"
#include "ViewportParams.h"
+#include "RenderState.h"
namespace Marble
{
diff --git a/src/lib/marble/layers/FogLayer.h b/src/lib/marble/layers/FogLayer.h
index c27ccd2..6e772a8 100644
--- a/src/lib/marble/layers/FogLayer.h
+++ b/src/lib/marble/layers/FogLayer.h
@@ -16,6 +16,8 @@
#include "LayerInterface.h"
+#include <QString>
+
namespace Marble
{
diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layers/GeometryLayer.cpp
index ee87860..7289a95 100644
--- a/src/lib/marble/layers/GeometryLayer.cpp
+++ b/src/lib/marble/layers/GeometryLayer.cpp
@@ -14,15 +14,19 @@
#include "GeometryLayer.h"
// Marble
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
#include "GeoDataLineStyle.h"
#include "GeoDataMultiTrack.h"
#include "GeoDataObject.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataPolygon.h"
#include "GeoDataPolyStyle.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataTrack.h"
#include "GeoDataTypes.h"
@@ -30,6 +34,7 @@
#include "MarbleDebug.h"
#include "GeoPainter.h"
#include "ViewportParams.h"
+#include "RenderState.h"
#include "GeoGraphicsScene.h"
#include "GeoGraphicsItem.h"
#include "GeoLineStringGraphicsItem.h"
diff --git a/src/lib/marble/layers/GroundLayer.cpp b/src/lib/marble/layers/GroundLayer.cpp
index 73ce357..58d409f 100644
--- a/src/lib/marble/layers/GroundLayer.cpp
+++ b/src/lib/marble/layers/GroundLayer.cpp
@@ -12,6 +12,7 @@
#include "GeoPainter.h"
#include "ViewportParams.h"
+#include "RenderState.h"
namespace Marble
{
diff --git a/src/lib/marble/layers/MarbleSplashLayer.cpp b/src/lib/marble/layers/MarbleSplashLayer.cpp
index f3f6834..9fd26b8 100644
--- a/src/lib/marble/layers/MarbleSplashLayer.cpp
+++ b/src/lib/marble/layers/MarbleSplashLayer.cpp
@@ -16,6 +16,7 @@
#include "GeoPainter.h"
#include "MarbleDirs.h"
#include "ViewportParams.h"
+#include "RenderState.h"
#include <QPixmap>
diff --git a/src/lib/marble/layers/MarbleSplashLayer.h b/src/lib/marble/layers/MarbleSplashLayer.h
index 3fefcd3..0707d5c 100644
--- a/src/lib/marble/layers/MarbleSplashLayer.h
+++ b/src/lib/marble/layers/MarbleSplashLayer.h
@@ -13,6 +13,7 @@
#include "LayerInterface.h"
+#include <QString>
namespace Marble
{
diff --git a/src/lib/marble/layers/PlacemarkLayer.cpp b/src/lib/marble/layers/PlacemarkLayer.cpp
index 2d0d857..2c3c68f 100644
--- a/src/lib/marble/layers/PlacemarkLayer.cpp
+++ b/src/lib/marble/layers/PlacemarkLayer.cpp
@@ -22,6 +22,7 @@
#include "GeoDataPlacemark.h"
#include "ViewportParams.h"
#include "VisiblePlacemark.h"
+#include "RenderState.h"
using namespace Marble;
diff --git a/src/lib/marble/layers/PlacemarkLayer.h b/src/lib/marble/layers/PlacemarkLayer.h
index 202bd09..47333c1 100644
--- a/src/lib/marble/layers/PlacemarkLayer.h
+++ b/src/lib/marble/layers/PlacemarkLayer.h
@@ -36,7 +36,6 @@ class GeoPainter;
class GeoSceneLayer;
class MarbleClock;
class ViewportParams;
-class VisiblePlacemark;
class StyleBuilder;
class PlacemarkLayer : public QObject, public LayerInterface
diff --git a/src/lib/marble/layers/PopupLayer.cpp b/src/lib/marble/layers/PopupLayer.cpp
index 6060f9c..017f1af 100644
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@ -19,6 +19,7 @@
#include "PopupItem.h"
#include "ViewportParams.h"
#include "RenderPlugin.h"
+#include "RenderState.h"
#include <QSizeF>
diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/layers/VectorTileLayer.cpp
index 25f49a6..35159e1 100644
--- a/src/lib/marble/layers/VectorTileLayer.cpp
+++ b/src/lib/marble/layers/VectorTileLayer.cpp
@@ -24,6 +24,8 @@
#include "MarbleDebug.h"
#include "TileLoader.h"
#include "ViewportParams.h"
+#include "RenderState.h"
+#include "GeoDataDocument.h"
#include "GeoDataLatLonAltBox.h"
#include "HttpDownloadManager.h"
diff --git a/src/lib/marble/layers/VectorTileLayer.h b/src/lib/marble/layers/VectorTileLayer.h
index 6c96ab0..eaf5109 100644
--- a/src/lib/marble/layers/VectorTileLayer.h
+++ b/src/lib/marble/layers/VectorTileLayer.h
@@ -18,21 +18,19 @@
#include <QObject>
#include "MarbleGlobal.h"
-#include "MarbleModel.h"
-#include "GeoDataDocument.h"
-#include "GeoDataLatLonAltBox.h"
-#include "TileId.h"
namespace Marble
{
class GeoPainter;
+class GeoDataDocument;
class GeoSceneGroup;
class GeoSceneVectorTileDataset;
+class GeoDataTreeModel;
+class PluginManager;
class HttpDownloadManager;
-class SunLocator;
-class TileLoader;
class ViewportParams;
+class TileId;
class VectorTileLayer : public QObject, public LayerInterface
{
diff --git a/src/lib/marble/osm/OsmObjectManager.cpp b/src/lib/marble/osm/OsmObjectManager.cpp
index 1956c8c..e88a3fb 100644
--- a/src/lib/marble/osm/OsmObjectManager.cpp
+++ b/src/lib/marble/osm/OsmObjectManager.cpp
@@ -13,6 +13,8 @@
// Marble
#include "GeoDataPlacemark.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoDataTypes.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/lib/marble/osm/OsmObjectManager.h b/src/lib/marble/osm/OsmObjectManager.h
index 8335f6b..61a3a13 100644
--- a/src/lib/marble/osm/OsmObjectManager.h
+++ b/src/lib/marble/osm/OsmObjectManager.h
@@ -18,7 +18,6 @@ namespace Marble
{
class GeoDataPlacemark;
-class OsmPlacemarkData;
/**
* @brief The OsmObjectManager class is used to assign osmData to placemarks that
diff --git a/src/lib/marble/osm/OsmPlacemarkData.h b/src/lib/marble/osm/OsmPlacemarkData.h
index 7dca644..1789e35 100644
--- a/src/lib/marble/osm/OsmPlacemarkData.h
+++ b/src/lib/marble/osm/OsmPlacemarkData.h
@@ -26,9 +26,6 @@ class QXmlStreamAttributes;
namespace Marble
{
-class GeoDataGeometry;
-class GeoDataPlacemark;
-
/**
* This class is used to encapsulate the osm data fields kept within a placemark's extendedData.
* It stores OSM server generated data: id, version, changeset, uid, visible, user, timestamp;
diff --git a/src/lib/marble/osm/OsmRelationManagerWidget.h b/src/lib/marble/osm/OsmRelationManagerWidget.h
index 2a36498..a58ea58 100644
--- a/src/lib/marble/osm/OsmRelationManagerWidget.h
+++ b/src/lib/marble/osm/OsmRelationManagerWidget.h
@@ -23,7 +23,6 @@ namespace Marble
class OsmRelationManagerWidgetPrivate;
class GeoDataPlacemark;
-class GeoDataFeature;
class OsmPlacemarkData;
enum Column {
diff --git a/src/lib/marble/osm/OsmTagEditorWidget.h b/src/lib/marble/osm/OsmTagEditorWidget.h
index 27fcca6..51d48a7 100644
--- a/src/lib/marble/osm/OsmTagEditorWidget.h
+++ b/src/lib/marble/osm/OsmTagEditorWidget.h
@@ -15,7 +15,6 @@
#include "marble_export.h"
#include "MarbleGlobal.h"
-#include "OsmPlacemarkData.h"
class QTreeWidgetItem;
@@ -25,6 +24,7 @@ namespace Marble
class OsmTagEditorWidgetPrivate;
class GeoDataPlacemark;
class GeoDataFeature;
+class OsmPlacemarkData;
class MARBLE_EXPORT OsmTagEditorWidget : public QWidget
{
diff --git a/src/lib/marble/osm/OsmTagEditorWidget_p.cpp b/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
index ccdf809..3502089 100644
--- a/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
+++ b/src/lib/marble/osm/OsmTagEditorWidget_p.cpp
@@ -16,9 +16,11 @@
#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
#include "OsmPlacemarkData.h"
#include "GeoDataExtendedData.h"
#include "GeoDataData.h"
+#include "GeoDataGeometry.h"
#include "StyleBuilder.h"
// Qt
diff --git a/src/lib/marble/projections/AbstractProjection.cpp b/src/lib/marble/projections/AbstractProjection.cpp
index 6d0d136..75f3db2 100644
--- a/src/lib/marble/projections/AbstractProjection.cpp
+++ b/src/lib/marble/projections/AbstractProjection.cpp
@@ -22,6 +22,7 @@
// Marble
#include "GeoDataLineString.h"
#include "GeoDataLinearRing.h"
+#include "GeoDataLatLonAltBox.h"
#include "ViewportParams.h"
using namespace Marble;
diff --git a/src/lib/marble/projections/AbstractProjection.h b/src/lib/marble/projections/AbstractProjection.h
index f138363..e2b1b40 100644
--- a/src/lib/marble/projections/AbstractProjection.h
+++ b/src/lib/marble/projections/AbstractProjection.h
@@ -23,7 +23,6 @@
#include <QVector>
-#include "GeoDataLatLonAltBox.h"
#include "GeoDataCoordinates.h"
#include "marble_export.h"
@@ -41,6 +40,7 @@ static const int tessellationPrecision = 10;
static const int latLonAltBoxSamplingRate = 4;
class GeoDataLineString;
+class GeoDataLatLonAltBox;
class ViewportParams;
class AbstractProjectionPrivate;
diff --git a/src/lib/marble/projections/AzimuthalProjection.cpp b/src/lib/marble/projections/AzimuthalProjection.cpp
index b75f53c..16e8a87 100644
--- a/src/lib/marble/projections/AzimuthalProjection.cpp
+++ b/src/lib/marble/projections/AzimuthalProjection.cpp
@@ -17,6 +17,7 @@
#include "GeoDataLinearRing.h"
#include "GeoDataLineString.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLatLonAltBox.h"
#include "ViewportParams.h"
#include <QPainterPath>
diff --git a/src/lib/marble/projections/CylindricalProjection.cpp b/src/lib/marble/projections/CylindricalProjection.cpp
index 0ccd065..baa71f1 100644
--- a/src/lib/marble/projections/CylindricalProjection.cpp
+++ b/src/lib/marble/projections/CylindricalProjection.cpp
@@ -19,6 +19,7 @@
#include "GeoDataLinearRing.h"
#include "GeoDataLineString.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLatLonAltBox.h"
#include "ViewportParams.h"
#include <QPainterPath>
diff --git a/src/lib/marble/projections/EquirectProjection.cpp b/src/lib/marble/projections/EquirectProjection.cpp
index 327d756..48f0120 100644
--- a/src/lib/marble/projections/EquirectProjection.cpp
+++ b/src/lib/marble/projections/EquirectProjection.cpp
@@ -15,6 +15,7 @@
// Marble
#include "ViewportParams.h"
+#include "GeoDataLatLonAltBox.h"
#include "MarbleDebug.h"
diff --git a/src/lib/marble/projections/MercatorProjection.cpp b/src/lib/marble/projections/MercatorProjection.cpp
index 2ddae01..3091cd2 100644
--- a/src/lib/marble/projections/MercatorProjection.cpp
+++ b/src/lib/marble/projections/MercatorProjection.cpp
@@ -17,6 +17,7 @@
// Marble
#include "ViewportParams.h"
+#include "GeoDataLatLonAltBox.h"
#include "MathHelper.h"
#include "GeoDataPoint.h"
diff --git a/src/lib/marble/routing/AlternativeRoutesModel.cpp b/src/lib/marble/routing/AlternativeRoutesModel.cpp
index 145e70a..aee7dad 100644
--- a/src/lib/marble/routing/AlternativeRoutesModel.cpp
+++ b/src/lib/marble/routing/AlternativeRoutesModel.cpp
@@ -10,9 +10,11 @@
#include "AlternativeRoutesModel.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataLineString.h"
#include "GeoDataPlacemark.h"
#include "MarbleMath.h"
diff --git a/src/lib/marble/routing/AlternativeRoutesModel.h b/src/lib/marble/routing/AlternativeRoutesModel.h
index b34c5be..ae5b5d9 100644
--- a/src/lib/marble/routing/AlternativeRoutesModel.h
+++ b/src/lib/marble/routing/AlternativeRoutesModel.h
@@ -11,7 +11,7 @@
#ifndef MARBLE_ALTERNATIVEROUTESMODEL_H
#define MARBLE_ALTERNATIVEROUTESMODEL_H
-#include "GeoDataLineString.h"
+#include "marble_export.h"
#include <QAbstractListModel>
@@ -26,6 +26,7 @@ namespace Marble
class RouteRequest;
class GeoDataDocument;
+class GeoDataLineString;
class MARBLE_EXPORT AlternativeRoutesModel : public QAbstractListModel
{
diff --git a/src/lib/marble/routing/RouteRequest.h b/src/lib/marble/routing/RouteRequest.h
index 01ccc01..c21b62d 100644
--- a/src/lib/marble/routing/RouteRequest.h
+++ b/src/lib/marble/routing/RouteRequest.h
@@ -12,7 +12,6 @@
#define MARBLE_ROUTEREQUEST_H
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
#include "RoutingProfile.h"
#include <QObject>
@@ -20,6 +19,7 @@
namespace Marble
{
+class GeoDataCoordinates;
class GeoDataPlacemark;
class RouteRequestPrivate;
diff --git a/src/lib/marble/routing/RouteSegment.cpp b/src/lib/marble/routing/RouteSegment.cpp
index 3f177e1..b533ed5 100644
--- a/src/lib/marble/routing/RouteSegment.cpp
+++ b/src/lib/marble/routing/RouteSegment.cpp
@@ -11,6 +11,7 @@
#include "RouteSegment.h"
#include "MarbleMath.h"
+#include "GeoDataLatLonAltBox.h"
namespace Marble
{
diff --git a/src/lib/marble/routing/RoutingInputWidget.cpp b/src/lib/marble/routing/RoutingInputWidget.cpp
index 05977d9..42259e5 100644
--- a/src/lib/marble/routing/RoutingInputWidget.cpp
+++ b/src/lib/marble/routing/RoutingInputWidget.cpp
@@ -11,7 +11,6 @@
#include "RoutingInputWidget.h"
-#include "MarbleLocale.h"
#include "MarblePlacemarkModel.h"
#include "RouteRequest.h"
@@ -25,8 +24,10 @@
#include "MarbleModel.h"
#include "MarbleWidget.h"
#include "routing/RoutingManager.h"
+#include "GeoDataPlacemark.h"
#include "GeoDataFolder.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "PositionTracking.h"
#include "ReverseGeocodingRunnerManager.h"
#include "SearchRunnerManager.h"
diff --git a/src/lib/marble/routing/RoutingInputWidget.h b/src/lib/marble/routing/RoutingInputWidget.h
index 8f9c33f..fb0cc50 100644
--- a/src/lib/marble/routing/RoutingInputWidget.h
+++ b/src/lib/marble/routing/RoutingInputWidget.h
@@ -11,8 +11,6 @@
#ifndef MARBLE_ROUTINGINPUTWIDGET_H
#define MARBLE_ROUTINGINPUTWIDGET_H
-#include "GeoDataCoordinates.h"
-#include "GeoDataPlacemark.h"
#include "PositionProviderPluginInterface.h"
#include <QWidget>
@@ -23,6 +21,8 @@ namespace Marble
{
class RoutingInputWidgetPrivate;
+class GeoDataCoordinates;
+class GeoDataPlacemark;
class MarbleModel;
class MarblePlacemarkModel;
diff --git a/src/lib/marble/routing/RoutingLayer.cpp b/src/lib/marble/routing/RoutingLayer.cpp
index c846a13..bc3e1ef 100644
--- a/src/lib/marble/routing/RoutingLayer.cpp
+++ b/src/lib/marble/routing/RoutingLayer.cpp
@@ -23,6 +23,7 @@
#include "AlternativeRoutesModel.h"
#include "RoutingManager.h"
#include "Maneuver.h"
+#include "RenderState.h"
#include <QAbstractItemModel>
#include <QIcon>
diff --git a/src/lib/marble/routing/RoutingLayer.h b/src/lib/marble/routing/RoutingLayer.h
index 3773290..6aae2a3 100644
--- a/src/lib/marble/routing/RoutingLayer.h
+++ b/src/lib/marble/routing/RoutingLayer.h
@@ -11,9 +11,11 @@
#ifndef MARBLE_ROUTINGLAYER_H
#define MARBLE_ROUTINGLAYER_H
-#include "GeoDataCoordinates.h"
#include "LayerInterface.h"
+#include "MarbleGlobal.h"
+
+#include <QObject>
#include <QRect>
class QItemSelectionModel;
@@ -23,10 +25,8 @@ namespace Marble
{
class MarbleWidget;
-class RoutingModel;
class MarblePlacemarkModel;
class RoutingLayerPrivate;
-class AlternativeRoutesModel;
/**
* @brief A paint layer that serves as a view on a route model
diff --git a/src/lib/marble/routing/RoutingManager.cpp b/src/lib/marble/routing/RoutingManager.cpp
index 286e3d2..67c527c 100644
--- a/src/lib/marble/routing/RoutingManager.cpp
+++ b/src/lib/marble/routing/RoutingManager.cpp
@@ -19,6 +19,7 @@
#include "GeoWriter.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataFolder.h"
#include "GeoDataParser.h"
#include "GeoDataPlacemark.h"
diff --git a/src/lib/marble/routing/RoutingManager.h b/src/lib/marble/routing/RoutingManager.h
index c13570d..e863b2f 100644
--- a/src/lib/marble/routing/RoutingManager.h
+++ b/src/lib/marble/routing/RoutingManager.h
@@ -12,7 +12,6 @@
#define MARBLE_ROUTINGMANAGER_H
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
#include "RoutingProfile.h"
namespace Marble
@@ -23,7 +22,6 @@ class RoutingModel;
class RouteRequest;
class MarbleModel;
class GeoDataDocument;
-class GeoDataFolder;
class AlternativeRoutesModel;
class RoutingProfilesModel;
diff --git a/src/lib/marble/routing/RoutingModel.cpp b/src/lib/marble/routing/RoutingModel.cpp
index 14f8ac8..c41ba3b 100644
--- a/src/lib/marble/routing/RoutingModel.cpp
+++ b/src/lib/marble/routing/RoutingModel.cpp
@@ -17,6 +17,7 @@
#include "PositionTracking.h"
#include "MarbleModel.h"
#include "MarbleGlobal.h"
+#include "GeoDataAccuracy.h"
#include <QPixmap>
diff --git a/src/lib/marble/routing/RoutingModel.h b/src/lib/marble/routing/RoutingModel.h
index d607a8b..df7303c 100644
--- a/src/lib/marble/routing/RoutingModel.h
+++ b/src/lib/marble/routing/RoutingModel.h
@@ -13,8 +13,6 @@
#include "marble_export.h"
-#include "GeoDataCoordinates.h"
-
#include <QAbstractListModel>
class QIODevice;
@@ -32,6 +30,8 @@ class RoutingModelPrivate;
class Route;
class RouteRequest;
class MarbleModel;
+class GeoDataCoordinates;
+
class MARBLE_EXPORT RoutingModel : public QAbstractListModel
{
Q_OBJECT
diff --git a/src/lib/marble/routing/RoutingWidget.cpp b/src/lib/marble/routing/RoutingWidget.cpp
index 7841ac6..ef0ce4a 100644
--- a/src/lib/marble/routing/RoutingWidget.cpp
+++ b/src/lib/marble/routing/RoutingWidget.cpp
@@ -11,9 +11,13 @@
#include "RoutingWidget.h"
#include "GeoDataLineString.h"
+#include "GeoDataLookAt.h"
+#include "GeoDataPlaylist.h"
#include "GeoDataTour.h"
#include "GeoDataFlyTo.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataPlacemark.h"
#include "TourPlayback.h"
#include "Maneuver.h"
#include "MarbleModel.h"
@@ -31,6 +35,9 @@
#include "GeoDataDocument.h"
#include "GeoDataTreeModel.h"
#include "GeoDataTypes.h"
+#include "GeoDataCreate.h"
+#include "GeoDataUpdate.h"
+#include "GeoDataDelete.h"
#include "AlternativeRoutesModel.h"
#include "RouteSyncManager.h"
#include "CloudRoutesDialog.h"
diff --git a/src/lib/marble/routing/RoutingWidget.h b/src/lib/marble/routing/RoutingWidget.h
index 2823565..2f7fc0d 100644
--- a/src/lib/marble/routing/RoutingWidget.h
+++ b/src/lib/marble/routing/RoutingWidget.h
@@ -11,8 +11,6 @@
#ifndef MARBLE_ROUTINGWIDGET_H
#define MARBLE_ROUTINGWIDGET_H
-#include "GeoDataCoordinates.h"
-#include "GeoDataLineString.h"
#include "RoutingManager.h"
#include "marble_export.h"
@@ -27,6 +25,7 @@ class MarbleWidget;
class RoutingInputWidget;
class RoutingWidgetPrivate;
class RouteSyncManager;
+class GeoDataCoordinates;
/**
* A widget consisting of input fields for places / routing destinations,
diff --git a/src/lib/marble/routing/VoiceNavigationModel.cpp b/src/lib/marble/routing/VoiceNavigationModel.cpp
index b2508fb..f8ebfa7 100644
--- a/src/lib/marble/routing/VoiceNavigationModel.cpp
+++ b/src/lib/marble/routing/VoiceNavigationModel.cpp
@@ -10,6 +10,8 @@
#include "VoiceNavigationModel.h"
+#include "Route.h"
+
#include "MarbleDirs.h"
#include "MarbleDebug.h"
diff --git a/src/lib/marble/routing/VoiceNavigationModel.h b/src/lib/marble/routing/VoiceNavigationModel.h
index 2d6760d..1281a98 100644
--- a/src/lib/marble/routing/VoiceNavigationModel.h
+++ b/src/lib/marble/routing/VoiceNavigationModel.h
@@ -12,15 +12,14 @@
#define MARBLE_VOICENAVIGATIONMODEL_H
#include "marble_export.h"
-#include "Route.h"
-#include "Maneuver.h"
-#include "PositionTracking.h"
#include <QObject>
namespace Marble
{
+class Route;
+
class VoiceNavigationModelPrivate;
class MARBLE_EXPORT VoiceNavigationModel : public QObject
diff --git a/src/lib/marble/routing/instructions/RoutingInstruction.cpp b/src/lib/marble/routing/instructions/RoutingInstruction.cpp
index 8602c08..cab29ea 100644
--- a/src/lib/marble/routing/instructions/RoutingInstruction.cpp
+++ b/src/lib/marble/routing/instructions/RoutingInstruction.cpp
@@ -9,7 +9,6 @@
//
#include "RoutingInstruction.h"
-#include "MarbleLocale.h"
#include <QCoreApplication>
#include <QStringList>
diff --git a/src/plasmarunner/plasmarunner.cpp b/src/plasmarunner/plasmarunner.cpp
index f6de8a4..a1ed2cf 100644
--- a/src/plasmarunner/plasmarunner.cpp
+++ b/src/plasmarunner/plasmarunner.cpp
@@ -18,6 +18,7 @@
// Marble
#include <GeoDataCoordinates.h>
#include <GeoDataFolder.h>
+#include <GeoDataLookAt.h>
#include <GeoDataPlacemark.h>
#include <BookmarkManager.h>
#include <GeoDataTreeModel.h>
diff --git a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
index c94a462..a5100a8 100644
--- a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
+++ b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
@@ -12,6 +12,8 @@
#include "PositionProviderPlugin.h"
+#include "GeoDataAccuracy.h"
+#include "GeoDataCoordinates.h"
#include <QDateTime>
class QUdpSocket;
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
index b16802d..2de8df6 100644
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
@@ -12,6 +12,8 @@
#define GPSDPOSITIONPROVIDERPLUGIN_H
#include "PositionProviderPlugin.h"
+#include "GeoDataCoordinates.h"
+#include "GeoDataAccuracy.h"
#include <QDateTime>
diff --git a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
index eb34db6..f38fb8f 100644
--- a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.cpp
@@ -11,6 +11,9 @@
#include "QtPositioningPositionProviderPlugin.h"
+#include "GeoDataAccuracy.h"
+#include "GeoDataCoordinates.h"
+
#include <QGeoPositionInfoSource>
#include <QGeoPositionInfo>
#include <QGeoCoordinate>
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
index 03c7444..30d7425 100644
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.cpp
@@ -10,6 +10,9 @@
#include "WlocatePositionProviderPlugin.h"
+#include <GeoDataCoordinates.h>
+#include <GeoDataAccuracy.h>
+
#include <QFutureWatcher>
#include <QtConcurrentRun>
#include <QDateTime>
diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/render/annotate/AnnotatePlugin.cpp
index 3adec01..09c3985 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.cpp
+++ b/src/plugins/render/annotate/AnnotatePlugin.cpp
@@ -32,9 +32,15 @@
#include "GeoDataParser.h"
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataPolyStyle.h"
#include "GeoDataTreeModel.h"
#include "GeoDataTypes.h"
#include "GeoPainter.h"
+#include "GeoDataLatLonAltBox.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoWriter.h"
#include "KmlElementDictionary.h"
#include "MarbleDirs.h"
diff --git a/src/plugins/render/annotate/AnnotatePlugin.h b/src/plugins/render/annotate/AnnotatePlugin.h
index 4b4606c..0d45133 100644
--- a/src/plugins/render/annotate/AnnotatePlugin.h
+++ b/src/plugins/render/annotate/AnnotatePlugin.h
@@ -27,10 +27,8 @@ namespace Marble
{
class MarbleWidget;
-class TextureLayer;
class GeoDataDocument;
class GeoDataLinearRing;
-class GeoDataLineString;
class AreaAnnotation;
class PolylineAnnotation;
class PlacemarkTextAnnotation;
diff --git a/src/plugins/render/annotate/AreaAnnotation.cpp b/src/plugins/render/annotate/AreaAnnotation.cpp
index ec5e076..b67371c 100644
--- a/src/plugins/render/annotate/AreaAnnotation.cpp
+++ b/src/plugins/render/annotate/AreaAnnotation.cpp
@@ -22,6 +22,8 @@
// Marble
#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoPainter.h"
#include "ViewportParams.h"
#include "SceneGraphicsTypes.h"
diff --git a/src/plugins/render/annotate/EditGroundOverlayDialog.cpp b/src/plugins/render/annotate/EditGroundOverlayDialog.cpp
index 042e536..06d3bfe 100644
--- a/src/plugins/render/annotate/EditGroundOverlayDialog.cpp
+++ b/src/plugins/render/annotate/EditGroundOverlayDialog.cpp
@@ -19,6 +19,8 @@
//Marble
#include "FormattedTextWidget.h"
+#include "GeoDataGroundOverlay.h"
+#include "TextureLayer.h"
namespace Marble
{
diff --git a/src/plugins/render/annotate/EditGroundOverlayDialog.h b/src/plugins/render/annotate/EditGroundOverlayDialog.h
index 71cfecc..01d6b99 100644
--- a/src/plugins/render/annotate/EditGroundOverlayDialog.h
+++ b/src/plugins/render/annotate/EditGroundOverlayDialog.h
@@ -13,11 +13,11 @@
#include <QDialog>
-#include "GeoDataGroundOverlay.h"
-#include "TextureLayer.h"
-
namespace Marble
{
+class TextureLayer;
+
+class GeoDataGroundOverlay;
class EditGroundOverlayDialog : public QDialog
{
diff --git a/src/plugins/render/annotate/EditPolygonDialog.cpp b/src/plugins/render/annotate/EditPolygonDialog.cpp
index 6135a71..cdf043c 100644
--- a/src/plugins/render/annotate/EditPolygonDialog.cpp
+++ b/src/plugins/render/annotate/EditPolygonDialog.cpp
@@ -17,8 +17,13 @@
#include <QMessageBox>
// Marble
+#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataLineStyle.h"
+#include "GeoDataPolyStyle.h"
#include "GeoDataTypes.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "NodeModel.h"
#include "NodeItemDelegate.h"
#include "FormattedTextWidget.h"
diff --git a/src/plugins/render/annotate/EditPolygonDialog.h b/src/plugins/render/annotate/EditPolygonDialog.h
index 5800fcb..1c7194a 100644
--- a/src/plugins/render/annotate/EditPolygonDialog.h
+++ b/src/plugins/render/annotate/EditPolygonDialog.h
@@ -15,11 +15,15 @@
#include <QColor>
#include "MarbleGlobal.h"
-#include "GeoDataPlacemark.h"
namespace Marble {
+class GeoDataPlacemark;
+class GeoDataCoordinates;
+class GeoDataFeature;
+class OsmPlacemarkData;
+
/**
* @brief As it name says by itself, this class is used to show a couple of
* editing options for a polygon. So far there are only a few customization
diff --git a/src/plugins/render/annotate/EditPolylineDialog.cpp b/src/plugins/render/annotate/EditPolylineDialog.cpp
index a4252ce..ef1344c 100644
--- a/src/plugins/render/annotate/EditPolylineDialog.cpp
+++ b/src/plugins/render/annotate/EditPolylineDialog.cpp
@@ -18,7 +18,9 @@
// Marble
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include "GeoDataStyle.h"
+#include "GeoDataLineStyle.h"
#include "GeoDataTypes.h"
#include "NodeModel.h"
#include "FormattedTextWidget.h"
diff --git a/src/plugins/render/annotate/GroundOverlayFrame.cpp b/src/plugins/render/annotate/GroundOverlayFrame.cpp
index 42044ca..722083d 100644
--- a/src/plugins/render/annotate/GroundOverlayFrame.cpp
+++ b/src/plugins/render/annotate/GroundOverlayFrame.cpp
@@ -13,10 +13,14 @@
// Marble
#include "GeoDataPlacemark.h"
+#include "GeoDataGroundOverlay.h"
#include "GeoDataTypes.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoPainter.h"
#include "ViewportParams.h"
#include "SceneGraphicsTypes.h"
+#include "TextureLayer.h"
#include "MarbleDirs.h"
// Qt
diff --git a/src/plugins/render/annotate/GroundOverlayFrame.h b/src/plugins/render/annotate/GroundOverlayFrame.h
index a9fa4e8..f3da7bc 100644
--- a/src/plugins/render/annotate/GroundOverlayFrame.h
+++ b/src/plugins/render/annotate/GroundOverlayFrame.h
@@ -12,11 +12,12 @@
#define MARBLE_GROUNDOVERLAYFRAME_H
#include "SceneGraphicsItem.h"
-#include "GeoDataGroundOverlay.h"
-#include "TextureLayer.h"
+#include "GeoDataCoordinates.h"
namespace Marble
{
+class TextureLayer;
+class GeoDataGroundOverlay;
class GroundOverlayFrame : public SceneGraphicsItem
{
diff --git a/src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp b/src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp
index 7adc7ef..50fc3d0 100644
--- a/src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp
+++ b/src/plugins/render/annotate/MergingPolygonNodesAnimation.cpp
@@ -15,6 +15,7 @@
#include "AreaAnnotation.h"
#include "GeoDataCoordinates.h"
#include "GeoDataPolygon.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataPlacemark.h"
#include "MarbleMath.h"
diff --git a/src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp b/src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp
index eba144c..093aa87 100644
--- a/src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp
+++ b/src/plugins/render/annotate/MergingPolylineNodesAnimation.cpp
@@ -15,6 +15,7 @@
#include "PolylineAnnotation.h"
#include "GeoDataCoordinates.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include "MarbleMath.h"
diff --git a/src/plugins/render/annotate/MergingPolylineNodesAnimation.h b/src/plugins/render/annotate/MergingPolylineNodesAnimation.h
index e5c2290..1db8300 100644
--- a/src/plugins/render/annotate/MergingPolylineNodesAnimation.h
+++ b/src/plugins/render/annotate/MergingPolylineNodesAnimation.h
@@ -15,13 +15,13 @@
#include <QTimer>
#include "GeoDataCoordinates.h"
-#include "GeoDataLineString.h"
namespace Marble
{
class PolylineAnnotation;
+class GeoDataLineString;
class MergingPolylineNodesAnimation : public QObject
{
diff --git a/src/plugins/render/annotate/NodeItemDelegate.cpp b/src/plugins/render/annotate/NodeItemDelegate.cpp
index 3080fd0..327c0e5 100644
--- a/src/plugins/render/annotate/NodeItemDelegate.cpp
+++ b/src/plugins/render/annotate/NodeItemDelegate.cpp
@@ -17,8 +17,11 @@
// Marble
#include "LatLonEdit.h"
+#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
#include "GeoDataLineString.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
namespace Marble
{
diff --git a/src/plugins/render/annotate/NodeItemDelegate.h b/src/plugins/render/annotate/NodeItemDelegate.h
index 069e9c4..889b4a0 100644
--- a/src/plugins/render/annotate/NodeItemDelegate.h
+++ b/src/plugins/render/annotate/NodeItemDelegate.h
@@ -16,12 +16,13 @@
#include <QTreeView>
// Marble
-#include "GeoDataPlacemark.h"
#include "EditPolygonDialog.h"
namespace Marble
{
+class GeoDataPlacemark;
+
/**
* @brief The NodeItemDelegate class handles the NodeModel view for both the EditPolygonDialog
* and EditPolylineDialog. It manages editing and updating the NodeModel and triggers drawing
diff --git a/src/plugins/render/annotate/NodeModel.h b/src/plugins/render/annotate/NodeModel.h
index 4e5fee9..86f4563 100644
--- a/src/plugins/render/annotate/NodeModel.h
+++ b/src/plugins/render/annotate/NodeModel.h
@@ -11,13 +11,12 @@
#ifndef NODEMODEL_H
#define NODEMODEL_H
+#include "GeoDataCoordinates.h"
#include <QAbstractListModel>
namespace Marble
{
-class GeoDataCoordinates;
-
class NodeModel : public QAbstractListModel
{
Q_OBJECT
diff --git a/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp b/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
index aa03cac..df48457 100644
--- a/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
+++ b/src/plugins/render/annotate/PlacemarkTextAnnotation.cpp
@@ -22,6 +22,8 @@
#include "AbstractProjection.h"
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
#include "GeoPainter.h"
#include "ViewportParams.h"
#include "MarbleDirs.h"
diff --git a/src/plugins/render/annotate/SceneGraphicsItem.cpp b/src/plugins/render/annotate/SceneGraphicsItem.cpp
index 6bc3780..6c763c3 100644
--- a/src/plugins/render/annotate/SceneGraphicsItem.cpp
+++ b/src/plugins/render/annotate/SceneGraphicsItem.cpp
@@ -15,6 +15,7 @@
// Marble
#include "GeoDataPlacemark.h"
+#include "GeoDataGeometry.h"
namespace Marble
diff --git a/src/plugins/render/aprs/AprsObject.h b/src/plugins/render/aprs/AprsObject.h
index 2de83d5..5caac63 100644
--- a/src/plugins/render/aprs/AprsObject.h
+++ b/src/plugins/render/aprs/AprsObject.h
@@ -15,11 +15,13 @@
#include <QPixmap>
#include "GeoAprsCoordinates.h"
-#include "GeoPainter.h"
namespace Marble
{
+class ViewportParams;
+class GeoPainter;
+
class AprsObject
{
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.cpp
index 05dcf19..390e6d9 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.cpp
@@ -16,6 +16,7 @@
#include "GeoDataDocument.h"
#include "GeoDataLineString.h"
#include "GeoDataObject.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataPlacemark.h"
#include "GeoDataTrack.h"
#include "GeoDataTreeModel.h"
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h
index 6f2b708..c0ef90a 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileDataSource.h
@@ -29,7 +29,6 @@ class GeoDataLineString;
class GeoDataObject;
class GeoDataTrack;
class GeoDataTreeModel;
-class MarbleModel;
class RoutingModel;
class ElevationProfileDataSource : public QObject
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
index b7a8fa4..f1657cf 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.cpp
@@ -15,7 +15,6 @@
#include "ElevationProfileContextMenu.h"
#include "ui_ElevationProfileConfigWidget.h"
-#include "MarbleLocale.h"
#include "MarbleModel.h"
#include "MarbleWidget.h"
#include "GeoDataPlacemark.h"
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
index 75f1ad5..def8841 100644
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
@@ -21,8 +21,6 @@
#include "GeoDataDocument.h"
#include "GeoDataLineString.h"
-#include "GeoGraphicsItem.h"
-#include "LabelGraphicsItem.h"
namespace Ui
{
@@ -38,7 +36,6 @@ class ElevationProfileTrackDataSource;
class ElevationProfileRouteDataSource;
class GeoDataPlacemark;
class MarbleWidget;
-class RoutingModel;
/**
* @short The class that creates an interactive elvation profile.
diff --git a/src/plugins/render/gpsinfo/GpsInfo.cpp b/src/plugins/render/gpsinfo/GpsInfo.cpp
index 19d7bf1..522e907 100644
--- a/src/plugins/render/gpsinfo/GpsInfo.cpp
+++ b/src/plugins/render/gpsinfo/GpsInfo.cpp
@@ -19,6 +19,7 @@
#include "WidgetGraphicsItem.h"
#include "MarbleGraphicsGridLayout.h"
#include "ViewportParams.h"
+#include "GeoDataAccuracy.h"
namespace Marble
{
diff --git a/src/plugins/render/license/License.h b/src/plugins/render/license/License.h
index 5942a86..f13fd2f 100644
--- a/src/plugins/render/license/License.h
+++ b/src/plugins/render/license/License.h
@@ -19,9 +19,7 @@ class QLabel;
namespace Marble
{
-class GeoDataCoordinates;
class WidgetGraphicsItem;
-class MarbleLocale;
/**
* @short The class that displays copyright info
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
index b15f74a..57db24b 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -27,6 +27,7 @@
#include "MarbleLocale.h"
#include "MarbleModel.h"
#include "ViewportParams.h"
+#include "GeoDataLatLonAltBox.h"
namespace Marble
{
diff --git a/src/plugins/render/measure/MeasureToolPlugin.cpp b/src/plugins/render/measure/MeasureToolPlugin.cpp
index 64e09e2..ff6f648 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.cpp
+++ b/src/plugins/render/measure/MeasureToolPlugin.cpp
@@ -20,6 +20,7 @@
#include "GeoDataLinearRing.h"
#include "MarbleDebug.h"
#include "MarbleMath.h"
+#include "MarbleWidgetPopupMenu.h"
#include "MarbleModel.h"
#include "MarbleLocale.h"
#include "ViewportParams.h"
diff --git a/src/plugins/render/measure/MeasureToolPlugin.h b/src/plugins/render/measure/MeasureToolPlugin.h
index 984a2b5..46c0236 100644
--- a/src/plugins/render/measure/MeasureToolPlugin.h
+++ b/src/plugins/render/measure/MeasureToolPlugin.h
@@ -18,10 +18,10 @@
#define MARBLE_MEASURETOOLPLUGIN_H
#include "DialogConfigurationInterface.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataLineString.h"
#include "RenderPlugin.h"
#include "MarbleWidget.h"
-#include "MarbleWidgetPopupMenu.h"
#include <QFont>
#include <QPen>
diff --git a/src/plugins/render/opendesktop/OpenDesktopItem.h b/src/plugins/render/opendesktop/OpenDesktopItem.h
index fdcaeab..390382c 100644
--- a/src/plugins/render/opendesktop/OpenDesktopItem.h
+++ b/src/plugins/render/opendesktop/OpenDesktopItem.h
@@ -12,15 +12,14 @@
#define OPENDESKTOPITEM_H
#include "AbstractDataPluginItem.h"
-#include "TinyWebBrowser.h"
#include "MarbleWidget.h"
+#include <QUrl>
+
class QAction;
namespace Marble
{
-
-class TinyWebBrowser;
class OpenDesktopItem : public AbstractDataPluginItem
{
diff --git a/src/plugins/render/opendesktop/OpenDesktopModel.cpp b/src/plugins/render/opendesktop/OpenDesktopModel.cpp
index c040c81..acc9b66 100644
--- a/src/plugins/render/opendesktop/OpenDesktopModel.cpp
+++ b/src/plugins/render/opendesktop/OpenDesktopModel.cpp
@@ -14,6 +14,7 @@
#include "OpenDesktopItem.h"
#include "MarbleGlobal.h"
#include "MarbleModel.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataCoordinates.h"
#include <QString>
#include <QUrl>
diff --git a/src/plugins/render/opendesktop/OpenDesktopModel.h b/src/plugins/render/opendesktop/OpenDesktopModel.h
index 1498620..47c5cbf 100644
--- a/src/plugins/render/opendesktop/OpenDesktopModel.h
+++ b/src/plugins/render/opendesktop/OpenDesktopModel.h
@@ -12,11 +12,10 @@
#define OPENDESKTOPMODEL_H
#include "AbstractDataPluginModel.h"
-#include "GeoDataLatLonAltBox.h"
-#include "MarbleWidget.h"
namespace Marble {
+class MarbleWidget;
class MarbleModel;
class OpenDesktopModel : public AbstractDataPluginModel
diff --git a/src/plugins/render/positionmarker/PositionMarker.cpp b/src/plugins/render/positionmarker/PositionMarker.cpp
index 3a631ec..d1750f0 100644
--- a/src/plugins/render/positionmarker/PositionMarker.cpp
+++ b/src/plugins/render/positionmarker/PositionMarker.cpp
@@ -30,6 +30,7 @@
#include "PositionTracking.h"
#include "ViewportParams.h"
#include "Planet.h"
+#include "GeoDataAccuracy.h"
namespace Marble
{
diff --git a/src/plugins/render/routing/AudioOutput.cpp b/src/plugins/render/routing/AudioOutput.cpp
index 431c5ee..a7179cb 100644
--- a/src/plugins/render/routing/AudioOutput.cpp
+++ b/src/plugins/render/routing/AudioOutput.cpp
@@ -13,6 +13,7 @@
#include "MarbleDirs.h"
#include "MarbleDebug.h"
#include "routing/VoiceNavigationModel.h"
+#include "routing/Route.h"
#include <QUrl>
#include <phonon/MediaObject>
diff --git a/src/plugins/render/routing/AudioOutput.h b/src/plugins/render/routing/AudioOutput.h
index da53f6f..ca4453b 100644
--- a/src/plugins/render/routing/AudioOutput.h
+++ b/src/plugins/render/routing/AudioOutput.h
@@ -11,11 +11,12 @@
#ifndef MARBLE_AUDIOOUTPUT_H
#define MARBLE_AUDIOOUTPUT_H
-#include "routing/Route.h"
+#include <QObject>
namespace Marble
{
+class Route;
class AudioOutputPrivate;
/**
diff --git a/src/plugins/render/routing/RoutingPlugin.cpp b/src/plugins/render/routing/RoutingPlugin.cpp
index 805e362..fdf2fb6 100644
--- a/src/plugins/render/routing/RoutingPlugin.cpp
+++ b/src/plugins/render/routing/RoutingPlugin.cpp
@@ -17,6 +17,7 @@
#include "Planet.h"
#include "AudioOutput.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLookAt.h"
#include "GeoPainter.h"
#include "MarbleGraphicsGridLayout.h"
#include "MarbleModel.h"
@@ -27,6 +28,7 @@
#include "PluginManager.h"
#include "PositionTracking.h"
#include "PositionProviderPlugin.h"
+#include "routing/Route.h"
#include "routing/RoutingManager.h"
#include "routing/RoutingModel.h"
#include "routing/RouteRequest.h"
diff --git a/src/plugins/render/satellites/SatellitesMSCItem.h b/src/plugins/render/satellites/SatellitesMSCItem.h
index dc5e83b..c2f1b9f 100644
--- a/src/plugins/render/satellites/SatellitesMSCItem.h
+++ b/src/plugins/render/satellites/SatellitesMSCItem.h
@@ -24,7 +24,6 @@ namespace Marble {
class GeoDataTrack;
class MarbleClock;
-class GeoDataPlacemark;
/**
* An instance of SatellitesMSCItem represents an item of a Marble
diff --git a/src/plugins/render/satellites/SatellitesModel.cpp b/src/plugins/render/satellites/SatellitesModel.cpp
index 2b4d15a..1125490 100644
--- a/src/plugins/render/satellites/SatellitesModel.cpp
+++ b/src/plugins/render/satellites/SatellitesModel.cpp
@@ -18,6 +18,9 @@
#include "MarbleClock.h"
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
#include <planetarySats.h>
#include <sgp4io.h>
diff --git a/src/plugins/render/satellites/SatellitesTLEItem.cpp b/src/plugins/render/satellites/SatellitesTLEItem.cpp
index 1d63c93..bc99737 100644
--- a/src/plugins/render/satellites/SatellitesTLEItem.cpp
+++ b/src/plugins/render/satellites/SatellitesTLEItem.cpp
@@ -30,8 +30,6 @@
namespace Marble {
-#include "GeoDataPoint.h"
-
SatellitesTLEItem::SatellitesTLEItem( const QString &name,
elsetrec satrec,
const MarbleClock *clock )
diff --git a/src/plugins/render/satellites/SatellitesTLEItem.h b/src/plugins/render/satellites/SatellitesTLEItem.h
index 2ffe310..58af62f 100644
--- a/src/plugins/render/satellites/SatellitesTLEItem.h
+++ b/src/plugins/render/satellites/SatellitesTLEItem.h
@@ -13,15 +13,14 @@
#include "TrackerPluginItem.h"
-#include "GeoDataCoordinates.h"
-#include "GeoDataTrack.h"
-
#include <sgp4unit.h>
class QColor;
+class QDateTime;
namespace Marble {
+class GeoDataCoordinates;
class GeoDataTrack;
class MarbleClock;
diff --git a/src/plugins/render/satellites/TrackerPluginItem.h b/src/plugins/render/satellites/TrackerPluginItem.h
index c74d838..1ab45de 100644
--- a/src/plugins/render/satellites/TrackerPluginItem.h
+++ b/src/plugins/render/satellites/TrackerPluginItem.h
@@ -18,10 +18,7 @@ class QString;
namespace Marble {
class GeoDataPlacemark;
-class GeoPainter;
-class GeoSceneLayer;
class TrackerPluginItemPrivate;
-class ViewportParams;
/**
* Subclass this to represent items in your TrackerPluginModel.
diff --git a/src/plugins/render/stars/StarsPlugin.h b/src/plugins/render/stars/StarsPlugin.h
index 7f21cc1..5152318 100644
--- a/src/plugins/render/stars/StarsPlugin.h
+++ b/src/plugins/render/stars/StarsPlugin.h
@@ -17,6 +17,8 @@
#include <QVector>
#include <QHash>
+#include <QMap>
+#include <QVariant>
#include <QBrush>
#include "RenderPlugin.h"
diff --git a/src/plugins/render/weather/BBCItemGetter.h b/src/plugins/render/weather/BBCItemGetter.h
index a9334f5..740a98c 100644
--- a/src/plugins/render/weather/BBCItemGetter.h
+++ b/src/plugins/render/weather/BBCItemGetter.h
@@ -24,7 +24,6 @@ namespace Marble
{
class BBCStation;
-class MarbleModel;
class BBCItemGetter : public AbstractWorkerThread
{
diff --git a/src/plugins/render/weather/WeatherItem.h b/src/plugins/render/weather/WeatherItem.h
index 7cbc9a7..59de879 100644
--- a/src/plugins/render/weather/WeatherItem.h
+++ b/src/plugins/render/weather/WeatherItem.h
@@ -14,7 +14,6 @@
// Marble
#include "AbstractDataPluginItem.h"
-#include "MarbleWidget.h"
// Qt
#include <QMap>
@@ -25,7 +24,8 @@ class QDate;
namespace Marble
{
-
+
+class MarbleWidget;
class WeatherData;
class WeatherItemPrivate;
diff --git a/src/plugins/render/weather/WeatherModel.h b/src/plugins/render/weather/WeatherModel.h
index 3f969d6..1b7b505 100644
--- a/src/plugins/render/weather/WeatherModel.h
+++ b/src/plugins/render/weather/WeatherModel.h
@@ -14,8 +14,6 @@
#include "AbstractDataPluginModel.h"
#include "WeatherData.h"
-#include "GeoDataLatLonAltBox.h"
-#include "MarbleWidget.h"
#include <QStringList>
@@ -27,6 +25,7 @@ namespace Marble
class AbstractWeatherService;
class GeoDataLatLonAltBox;
+class MarbleWidget;
class MarbleModel;
class WeatherModel : public AbstractDataPluginModel
diff --git a/src/plugins/render/weather/WeatherPlugin.cpp b/src/plugins/render/weather/WeatherPlugin.cpp
index 28c2d79..cdfba49 100644
--- a/src/plugins/render/weather/WeatherPlugin.cpp
+++ b/src/plugins/render/weather/WeatherPlugin.cpp
@@ -15,6 +15,7 @@
#include "ui_WeatherConfigWidget.h"
#include "WeatherData.h"
#include "WeatherModel.h"
+#include "MarbleWidget.h"
#include "MarbleDirs.h"
#include "MarbleLocale.h"
#include "MarbleGlobal.h"
diff --git a/src/plugins/runner/cache/CacheRunner.cpp b/src/plugins/runner/cache/CacheRunner.cpp
index 368377a..58b71d6 100644
--- a/src/plugins/runner/cache/CacheRunner.cpp
+++ b/src/plugins/runner/cache/CacheRunner.cpp
@@ -11,6 +11,7 @@
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
#include "MarbleDebug.h"
diff --git a/src/plugins/runner/cyclestreets/CycleStreetsRunner.cpp b/src/plugins/runner/cyclestreets/CycleStreetsRunner.cpp
index 076a302..7ef5449 100644
--- a/src/plugins/runner/cyclestreets/CycleStreetsRunner.cpp
+++ b/src/plugins/runner/cyclestreets/CycleStreetsRunner.cpp
@@ -13,7 +13,9 @@
#include "MarbleDebug.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include "HttpDownloadManager.h"
#include "routing/Maneuver.h"
#include "routing/RouteRequest.h"
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
index 47ccbba..ada3132 100644
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingRunner.cpp
@@ -18,6 +18,7 @@
#include "routing/instructions/InstructionTransformation.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
#include <QProcess>
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
index d318311..62f1709 100644
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingRunner.cpp
@@ -18,7 +18,9 @@
#include "routing/instructions/InstructionTransformation.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include <QProcess>
#include <QMap>
diff --git a/src/plugins/runner/gpsbabel/GpsbabelRunner.h b/src/plugins/runner/gpsbabel/GpsbabelRunner.h
index cff727c..a346567 100644
--- a/src/plugins/runner/gpsbabel/GpsbabelRunner.h
+++ b/src/plugins/runner/gpsbabel/GpsbabelRunner.h
@@ -15,9 +15,6 @@
namespace Marble
{
-class MarbleModel;
-class ParsingRunnerManager;
-
class GpsbabelRunner : public ParsingRunner
{
Q_OBJECT
diff --git a/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp
index 392456e..40a09a3 100644
--- a/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXgpxTagHandler.cpp
@@ -28,6 +28,9 @@
#include "GeoDataDocument.h"
#include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
+#include "GeoDataLabelStyle.h"
+#include "GeoDataLineStyle.h"
#include "GeoDataStyleMap.h"
#include "GeoDataHotSpot.h"
#include "MarbleDirs.h"
diff --git a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
index 5ab5c89..ab4c698 100644
--- a/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXrteTagHandler.cpp
@@ -27,6 +27,7 @@
#include "GeoDataFolder.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
+#include "GeoDataLineString.h"
namespace Marble
{
diff --git a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
index 85718e1..33497e3 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrkTagHandler.cpp
@@ -26,6 +26,7 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
+#include "GeoDataMultiGeometry.h"
namespace Marble
{
diff --git a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
index 1e33d97..ea9a5bd 100644
--- a/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXtrksegTagHandler.cpp
@@ -26,6 +26,7 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPoint.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataTrack.h"
namespace Marble
diff --git a/src/plugins/runner/gpx/tests/TestTrack.cpp b/src/plugins/runner/gpx/tests/TestTrack.cpp
index fb43197..58efd0a 100644
--- a/src/plugins/runner/gpx/tests/TestTrack.cpp
+++ b/src/plugins/runner/gpx/tests/TestTrack.cpp
@@ -13,6 +13,7 @@
#include "GeoDataPoint.h"
#include "GeoDataLinearRing.h"
+#include "GeoDataMultiGeometry.h"
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
#include <GeoDataPlacemark.h>
diff --git a/src/plugins/runner/json/JsonParser.cpp b/src/plugins/runner/json/JsonParser.cpp
index 235352b..ffd3481 100644
--- a/src/plugins/runner/json/JsonParser.cpp
+++ b/src/plugins/runner/json/JsonParser.cpp
@@ -12,6 +12,8 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPolygon.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPoint.h"
#include "MarbleDebug.h"
#include "StyleBuilder.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/plugins/runner/json/JsonParser.h b/src/plugins/runner/json/JsonParser.h
index 3dc5e0e..a9c7588 100644
--- a/src/plugins/runner/json/JsonParser.h
+++ b/src/plugins/runner/json/JsonParser.h
@@ -11,12 +11,12 @@
#ifndef MARBLE_JSONPARSER_H
#define MARBLE_JSONPARSER_H
-#include "GeoDataDocument.h"
-
class QIODevice;
namespace Marble {
+class GeoDataDocument;
+
class JsonParser
{
public:
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
index 4cb57dd..1a39827 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -15,6 +15,7 @@
#include "MarbleDebug.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataPoint.h"
#include <QString>
#include <QVector>
diff --git a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
index 1004fb9..8cb6333 100644
--- a/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
+++ b/src/plugins/runner/localdatabase/LocalDatabaseRunner.cpp
@@ -16,6 +16,7 @@
#include "GeoDataFeature.h"
#include "GeoDataPlacemark.h"
#include "GeoDataCoordinates.h"
+#include "GeoDataLatLonAltBox.h"
#include "MarbleDebug.h"
#include <QString>
diff --git a/src/plugins/runner/mapquest/MapQuestRunner.cpp b/src/plugins/runner/mapquest/MapQuestRunner.cpp
index 33567bb..99e2a44 100644
--- a/src/plugins/runner/mapquest/MapQuestRunner.cpp
+++ b/src/plugins/runner/mapquest/MapQuestRunner.cpp
@@ -15,6 +15,8 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
+#include "GeoDataLineString.h"
#include "HttpDownloadManager.h"
#include "routing/Maneuver.h"
#include "routing/RouteRequest.h"
diff --git a/src/plugins/runner/monav/MonavMap.cpp b/src/plugins/runner/monav/MonavMap.cpp
index 52dfb28..5f6fb29 100644
--- a/src/plugins/runner/monav/MonavMap.cpp
+++ b/src/plugins/runner/monav/MonavMap.cpp
@@ -12,10 +12,12 @@
#include "MarbleDebug.h"
#include "GeoDataParser.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataPlacemark.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
#include "GeoDataData.h"
+#include "GeoDataLatLonAltBox.h"
namespace Marble
{
diff --git a/src/plugins/runner/monav/MonavRunner.cpp b/src/plugins/runner/monav/MonavRunner.cpp
index 0f60b3a..2bea88b 100644
--- a/src/plugins/runner/monav/MonavRunner.cpp
+++ b/src/plugins/runner/monav/MonavRunner.cpp
@@ -20,6 +20,7 @@
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include <QTime>
#include <QLocalSocket>
diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
index 33f4817..9e9032a 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
@@ -15,6 +15,7 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "HttpDownloadManager.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index e0af560..33d80cf 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -15,6 +15,8 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
+#include "GeoDataLatLonAltBox.h"
#include "HttpDownloadManager.h"
#include "StyleBuilder.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h
index 2bcd4c0..64b2f89 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h
@@ -23,6 +23,7 @@ class QDomNode;
namespace Marble
{
+class GeoDataExtendedData;
class OsmNominatimRunner : public SearchRunner
{
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
index 6ff094f..fdaa48b 100644
--- a/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
+++ b/src/plugins/runner/open-source-routing-machine/OSRMRunner.cpp
@@ -11,10 +11,11 @@
#include "OSRMRunner.h"
#include "MarbleDebug.h"
-#include "MarbleLocale.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
+#include "GeoDataLineString.h"
#include "routing/Maneuver.h"
#include "routing/RouteRequest.h"
#include "HttpDownloadManager.h"
diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.cpp b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.cpp
index 68db402..1873ffd 100644
--- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.cpp
+++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.cpp
@@ -11,6 +11,8 @@
//self
#include "OpenLocationCodeSearchRunner.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoDataStyle.h"
#include "GeoDataLineStyle.h"
#include "GeoDataPolyStyle.h"
diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h
index 2f538a7..8ba9cf4 100644
--- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h
+++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchRunner.h
@@ -13,12 +13,13 @@
#include "SearchRunner.h"
#include "GeoDataLatLonBox.h"
-#include "GeoDataPolygon.h"
#include "MarbleDebug.h"
namespace Marble
{
+class GeoDataPolygon;
+
class OpenLocationCodeSearchRunner : public SearchRunner
{
Q_OBJECT
diff --git a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
index 3317b2d..a277afe 100644
--- a/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
+++ b/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp
@@ -15,6 +15,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataData.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataLineString.h"
#include "routing/RouteRequest.h"
#include <QString>
diff --git a/src/plugins/runner/osm/OsmNode.cpp b/src/plugins/runner/osm/OsmNode.cpp
index 5d6b8e3..853fab6 100644
--- a/src/plugins/runner/osm/OsmNode.cpp
+++ b/src/plugins/runner/osm/OsmNode.cpp
@@ -14,6 +14,7 @@
#include <GeoDataPlacemark.h>
#include <GeoDataStyle.h>
#include <GeoDataIconStyle.h>
+#include <GeoDataDocument.h>
#include <MarbleDirs.h>
#include <StyleBuilder.h>
diff --git a/src/plugins/runner/osm/OsmNode.h b/src/plugins/runner/osm/OsmNode.h
index eb1238e..f5b00a5 100644
--- a/src/plugins/runner/osm/OsmNode.h
+++ b/src/plugins/runner/osm/OsmNode.h
@@ -12,7 +12,6 @@
#define MARBLE_OSMNODE
#include <osm/OsmPlacemarkData.h>
-#include <GeoDataDocument.h>
#include <QString>
@@ -20,6 +19,8 @@ class QXmlStreamAttributes;
namespace Marble {
+class GeoDataDocument;
+
class OsmNode {
public:
OsmPlacemarkData & osmData();
diff --git a/src/plugins/runner/osm/OsmParser.cpp b/src/plugins/runner/osm/OsmParser.cpp
index 58b6e33..e5f6641 100644
--- a/src/plugins/runner/osm/OsmParser.cpp
+++ b/src/plugins/runner/osm/OsmParser.cpp
@@ -19,6 +19,7 @@
#include "GeoDataPoint.h"
#include "GeoDataTypes.h"
#include "GeoDataStyle.h"
+#include "GeoDataPolyStyle.h"
#include <MarbleZipReader.h>
#include "o5mreader.h"
diff --git a/src/plugins/runner/osm/OsmRelation.cpp b/src/plugins/runner/osm/OsmRelation.cpp
index 1a816d8..d13c6c1 100644
--- a/src/plugins/runner/osm/OsmRelation.cpp
+++ b/src/plugins/runner/osm/OsmRelation.cpp
@@ -11,6 +11,8 @@
#include <OsmRelation.h>
#include <MarbleDebug.h>
#include <GeoDataPlacemark.h>
+#include <GeoDataDocument.h>
+#include <GeoDataPolygon.h>
#include <StyleBuilder.h>
#include <osm/OsmObjectManager.h>
diff --git a/src/plugins/runner/osm/OsmRelation.h b/src/plugins/runner/osm/OsmRelation.h
index d2784eb..910ee65 100644
--- a/src/plugins/runner/osm/OsmRelation.h
+++ b/src/plugins/runner/osm/OsmRelation.h
@@ -15,7 +15,6 @@
#include "OsmWay.h"
#include <osm/OsmPlacemarkData.h>
#include <GeoDataLinearRing.h>
-#include <GeoDataDocument.h>
#include <QString>
#include <QXmlStreamAttributes>
@@ -23,6 +22,8 @@
namespace Marble {
+class GeoDataDocument;
+
class OsmRelation
{
public:
diff --git a/src/plugins/runner/osm/OsmWay.cpp b/src/plugins/runner/osm/OsmWay.cpp
index fe99546..c5e9c97 100644
--- a/src/plugins/runner/osm/OsmWay.cpp
+++ b/src/plugins/runner/osm/OsmWay.cpp
@@ -14,6 +14,7 @@
#include <GeoDataLineStyle.h>
#include <GeoDataPolyStyle.h>
#include <GeoDataStyle.h>
+#include <GeoDataDocument.h>
#include <osm/OsmObjectManager.h>
#include <MarbleDirs.h>
#include <StyleBuilder.h>
diff --git a/src/plugins/runner/osm/OsmWay.h b/src/plugins/runner/osm/OsmWay.h
index edad81c..3a9efa0 100644
--- a/src/plugins/runner/osm/OsmWay.h
+++ b/src/plugins/runner/osm/OsmWay.h
@@ -13,7 +13,6 @@
#include "OsmNode.h"
#include <osm/OsmPlacemarkData.h>
-#include <GeoDataDocument.h>
#include <StyleBuilder.h>
#include <QSet>
@@ -21,6 +20,8 @@
namespace Marble {
+class GeoDataDocument;
+
class OsmWay
{
public:
diff --git a/src/plugins/runner/osm/translators/O5mWriter.cpp b/src/plugins/runner/osm/translators/O5mWriter.cpp
index 76084e7..73d3116 100644
--- a/src/plugins/runner/osm/translators/O5mWriter.cpp
+++ b/src/plugins/runner/osm/translators/O5mWriter.cpp
@@ -15,6 +15,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataLineString.h"
#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
#include "GeoWriter.h"
#include "osm/OsmPlacemarkData.h"
diff --git a/src/plugins/runner/osm/translators/O5mWriter.h b/src/plugins/runner/osm/translators/O5mWriter.h
index 7f5482e..ea876e6 100644
--- a/src/plugins/runner/osm/translators/O5mWriter.h
+++ b/src/plugins/runner/osm/translators/O5mWriter.h
@@ -11,15 +11,14 @@
#ifndef MARBLE_O5MWRITER_H
#define MARBLE_O5MWRITER_H
-#include "osm/OsmPlacemarkData.h"
#include "OsmConverter.h"
#include "GeoWriterBackend.h"
namespace Marble
{
-class GeoDataPlacemark;
class GeoDataLineString;
+class OsmPlacemarkData;
class O5mWriter: public GeoWriterBackend
{
diff --git a/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h b/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h
index 22f7f9d..353aebf 100644
--- a/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h
+++ b/src/plugins/runner/osm/translators/OsmDocumentTagTranslator.h
@@ -13,8 +13,6 @@
#include "GeoTagWriter.h"
-#include <GeoDataCoordinates.h>
-
namespace Marble
{
/**
diff --git a/src/plugins/runner/osm/writers/OsmNodeTagWriter.cpp b/src/plugins/runner/osm/writers/OsmNodeTagWriter.cpp
index 3b68f13..c9a1a0b 100644
--- a/src/plugins/runner/osm/writers/OsmNodeTagWriter.cpp
+++ b/src/plugins/runner/osm/writers/OsmNodeTagWriter.cpp
@@ -20,6 +20,7 @@
#include "OsmTagTagWriter.h"
#include "GeoDataPoint.h"
#include "GeoDataLineString.h"
+#include "GeoWriter.h"
#include "osm/OsmPlacemarkData.h"
#include "osm/OsmObjectManager.h"
diff --git a/src/plugins/runner/osm/writers/OsmNodeTagWriter.h b/src/plugins/runner/osm/writers/OsmNodeTagWriter.h
index bbaf69f..c344d21 100644
--- a/src/plugins/runner/osm/writers/OsmNodeTagWriter.h
+++ b/src/plugins/runner/osm/writers/OsmNodeTagWriter.h
@@ -17,10 +17,7 @@
namespace Marble
{
-class GeoDataLineString;
-class GeoDataCoordinates;
class GeoWriter;
-class OsmPlacemarkData;
class OsmWayData;
class OsmNodeTagWriter
diff --git a/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.cpp b/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.cpp
index 976d713..ccb8a46 100644
--- a/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.cpp
+++ b/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.cpp
@@ -11,6 +11,7 @@
#include "OsmObjectAttributeWriter.h"
#include "osm/OsmObjectManager.h"
#include "osm/OsmPlacemarkData.h"
+#include "GeoWriter.h"
namespace Marble {
diff --git a/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.h b/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.h
index 3e3f81b..4ef154f 100644
--- a/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.h
+++ b/src/plugins/runner/osm/writers/OsmObjectAttributeWriter.h
@@ -11,12 +11,10 @@
#ifndef MARBLE_OSMOBJECTATTRIBUTEWRITER_H
#define MARBLE_OSMOBJECTATTRIBUTEWRITER_H
-#include <GeoWriter.h>
-#include <GeoDataObject.h>
-
namespace Marble
{
class OsmPlacemarkData;
+class GeoWriter;
class OsmObjectAttributeWriter
{
diff --git a/src/plugins/runner/osm/writers/OsmRelationTagWriter.cpp b/src/plugins/runner/osm/writers/OsmRelationTagWriter.cpp
index 8178e67..24411f0 100644
--- a/src/plugins/runner/osm/writers/OsmRelationTagWriter.cpp
+++ b/src/plugins/runner/osm/writers/OsmRelationTagWriter.cpp
@@ -16,8 +16,10 @@
#include "OsmObjectAttributeWriter.h"
#include "OsmTagTagWriter.h"
#include "GeoDataLineString.h"
+#include "GeoDataPolygon.h"
#include "GeoDataCoordinates.h"
#include "GeoDataPlacemark.h"
+#include "GeoWriter.h"
#include "osm/OsmPlacemarkData.h"
#include "osm/OsmObjectManager.h"
diff --git a/src/plugins/runner/osm/writers/OsmTagTagWriter.h b/src/plugins/runner/osm/writers/OsmTagTagWriter.h
index 9ee7018..8cac8a1 100644
--- a/src/plugins/runner/osm/writers/OsmTagTagWriter.h
+++ b/src/plugins/runner/osm/writers/OsmTagTagWriter.h
@@ -12,12 +12,12 @@
#define MARBLE_OSMTAGTAGWRITER_H
// Marble
-#include "GeoTagWriter.h"
namespace Marble
{
class OsmPlacemarkData;
+class GeoWriter;
class OsmTagTagWriter
{
diff --git a/src/plugins/runner/osm/writers/OsmWayTagWriter.cpp b/src/plugins/runner/osm/writers/OsmWayTagWriter.cpp
index 70935f0..5aa3db5 100644
--- a/src/plugins/runner/osm/writers/OsmWayTagWriter.cpp
+++ b/src/plugins/runner/osm/writers/OsmWayTagWriter.cpp
@@ -19,6 +19,7 @@
#include "GeoDataCoordinates.h"
#include "osm/OsmPlacemarkData.h"
#include "osm/OsmObjectManager.h"
+#include "GeoWriter.h"
namespace Marble
diff --git a/src/plugins/runner/pn2/Pn2Runner.cpp b/src/plugins/runner/pn2/Pn2Runner.cpp
index 9664b33..11a7882 100644
--- a/src/plugins/runner/pn2/Pn2Runner.cpp
+++ b/src/plugins/runner/pn2/Pn2Runner.cpp
@@ -39,6 +39,9 @@
#include "GeoDataPlacemark.h"
#include "GeoDataStyle.h"
#include "GeoDataPolyStyle.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPolygon.h"
+#include "GeoDataMultiGeometry.h"
#include "MarbleDebug.h"
#include <QFile>
diff --git a/src/plugins/runner/pnt/PntRunner.cpp b/src/plugins/runner/pnt/PntRunner.cpp
index 7a8a4c8..07f31d2 100644
--- a/src/plugins/runner/pnt/PntRunner.cpp
+++ b/src/plugins/runner/pnt/PntRunner.cpp
@@ -12,6 +12,7 @@
#include "GeoDataDocument.h"
#include "GeoDataLineString.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataPlacemark.h"
#include "MarbleDebug.h"
#include "MarbleGlobal.h"
diff --git a/src/plugins/runner/routino/RoutinoRunner.cpp b/src/plugins/runner/routino/RoutinoRunner.cpp
index 42cebdd..7e918cd 100644
--- a/src/plugins/runner/routino/RoutinoRunner.cpp
+++ b/src/plugins/runner/routino/RoutinoRunner.cpp
@@ -18,7 +18,9 @@
#include "routing/instructions/InstructionTransformation.h"
#include "GeoDataDocument.h"
#include "GeoDataExtendedData.h"
+#include "GeoDataData.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLineString.h"
#include <QProcess>
#include <QTemporaryFile>
diff --git a/src/plugins/runner/shp/ShpRunner.cpp b/src/plugins/runner/shp/ShpRunner.cpp
index 12f1bd2..3cf86f7 100644
--- a/src/plugins/runner/shp/ShpRunner.cpp
+++ b/src/plugins/runner/shp/ShpRunner.cpp
@@ -12,6 +12,9 @@
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataPolygon.h"
+#include "GeoDataLinearRing.h"
+#include "GeoDataPoint.h"
+#include "GeoDataMultiGeometry.h"
#include "GeoDataSchema.h"
#include "GeoDataSimpleField.h"
#include "GeoDataStyle.h"
diff --git a/src/plugins/runner/yours/YoursRunner.cpp b/src/plugins/runner/yours/YoursRunner.cpp
index f38e1d5..0b5d5ce 100644
--- a/src/plugins/runner/yours/YoursRunner.cpp
+++ b/src/plugins/runner/yours/YoursRunner.cpp
@@ -16,6 +16,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataParser.h"
#include "GeoDataFolder.h"
+#include "GeoDataLineString.h"
#include "routing/RouteRequest.h"
#include <QString>
diff --git a/src/thumbnailer/thumbnailer.h b/src/thumbnailer/thumbnailer.h
index a85606a..c13aaec 100644
--- a/src/thumbnailer/thumbnailer.h
+++ b/src/thumbnailer/thumbnailer.h
@@ -27,8 +27,9 @@
#include <QEventLoop>
#include <QTimer>
-namespace Marble {
-class MarbleMap;
+namespace Marble
+{
+
class GeoDataObject;
diff --git a/tests/PlacemarkPositionProviderPluginTest.cpp b/tests/PlacemarkPositionProviderPluginTest.cpp
index 6f05fd7..229f235 100644
--- a/tests/PlacemarkPositionProviderPluginTest.cpp
+++ b/tests/PlacemarkPositionProviderPluginTest.cpp
@@ -10,6 +10,7 @@
#include "GeoDataTrack.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataAccuracy.h"
#include "PositionProviderPlugin.h"
#include "PluginManager.h"
#include "MarbleModel.h"
diff --git a/tests/PositionTrackingTest.cpp b/tests/PositionTrackingTest.cpp
index f6c7c4d..777653a 100644
--- a/tests/PositionTrackingTest.cpp
+++ b/tests/PositionTrackingTest.cpp
@@ -10,6 +10,7 @@
#include "GeoDataTreeModel.h"
+#include "GeoDataAccuracy.h"
#include "PositionProviderPlugin.h"
#include "PositionTracking.h"
#include "TestUtils.h"
diff --git a/tests/TestEquality.cpp b/tests/TestEquality.cpp
index f438e8b..3c93cab 100644
--- a/tests/TestEquality.cpp
+++ b/tests/TestEquality.cpp
@@ -28,6 +28,7 @@
#include <GeoDataLink.h>
#include <GeoDataAnimatedUpdate.h>
#include <GeoDataSoundCue.h>
+#include "GeoDataPlaylist.h"
#include <GeoDataTourControl.h>
#include <GeoDataWait.h>
#include <GeoDataTour.h>
@@ -70,6 +71,7 @@
#include <GeoDataFolder.h>
#include <GeoDataSchemaData.h>
#include <GeoDataSimpleData.h>
+#include <GeoDataUpdate.h>
#include "TestUtils.h"
using namespace Marble;
diff --git a/tests/TestFeatureDetach.cpp b/tests/TestFeatureDetach.cpp
index 20d471e..8ba2870 100644
--- a/tests/TestFeatureDetach.cpp
+++ b/tests/TestFeatureDetach.cpp
@@ -11,6 +11,7 @@
#include <QObject>
#include "GeoDataContainer.h"
+#include "GeoDataPoint.h"
#include "GeoDataPlacemark.h"
#include "GeoDataCamera.h"
#include "MarbleGlobal.h"
diff --git a/tests/TestGeoDataPack.cpp b/tests/TestGeoDataPack.cpp
index 130d951..1a996a8 100644
--- a/tests/TestGeoDataPack.cpp
+++ b/tests/TestGeoDataPack.cpp
@@ -10,6 +10,7 @@
#include "MarbleDirs.h"
#include "GeoDataParser.h"
+#include "GeoDataGeometry.h"
#include "GeoDataDocument.h"
#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
diff --git a/tests/TestGeometryDetach.cpp b/tests/TestGeometryDetach.cpp
index a61ed01..a2a48ab 100644
--- a/tests/TestGeometryDetach.cpp
+++ b/tests/TestGeometryDetach.cpp
@@ -13,6 +13,7 @@
#include "GeoDataMultiTrack.h"
#include "GeoDataPoint.h"
#include "GeoDataPolygon.h"
+#include "GeoDataLinearRing.h"
#include "GeoDataTrack.h"
#include "GeoDataMultiGeometry.h"
#include "TestUtils.h"
diff --git a/tests/TestGxTimeSpan.cpp b/tests/TestGxTimeSpan.cpp
index ee8d38b..8ce280e 100644
--- a/tests/TestGxTimeSpan.cpp
+++ b/tests/TestGxTimeSpan.cpp
@@ -12,9 +12,11 @@
#include <GeoDataDocument.h>
#include <GeoDataTimeSpan.h>
+#include <GeoDataTimeStamp.h>
#include <MarbleDebug.h>
#include <GeoDataFolder.h>
#include "TestUtils.h"
+#include <GeoDataLookAt.h>
#include <GeoDataCamera.h>
#include <GeoDataPlacemark.h>
diff --git a/tests/TestListStyle.cpp b/tests/TestListStyle.cpp
index 866b04d..03cd7b9 100644
--- a/tests/TestListStyle.cpp
+++ b/tests/TestListStyle.cpp
@@ -16,6 +16,7 @@
#include <GeoDataPlacemark.h>
#include <GeoDataStyle.h>
#include <GeoDataListStyle.h>
+#include <GeoDataItemIcon.h>
#include "TestUtils.h"
using namespace Marble;
diff --git a/tests/TestModel.cpp b/tests/TestModel.cpp
index 40cd552..3de06fe 100644
--- a/tests/TestModel.cpp
+++ b/tests/TestModel.cpp
@@ -13,10 +13,13 @@
#include <GeoDataDocument.h>
#include <GeoDataPlacemark.h>
+#include <GeoDataOrientation.h>
+#include <GeoDataScale.h>
#include <MarbleDebug.h>
#include <GeoDataFolder.h>
#include <GeoDataModel.h>
#include <GeoDataLink.h>
+#include <GeoDataLocation.h>
#include "TestUtils.h"
diff --git a/tests/TestNetworkLink.cpp b/tests/TestNetworkLink.cpp
index c3c0fe9..40c4722 100644
--- a/tests/TestNetworkLink.cpp
+++ b/tests/TestNetworkLink.cpp
@@ -15,6 +15,7 @@
#include <GeoDataFolder.h>
#include <MarbleDebug.h>
#include <GeoDataNetworkLink.h>
+#include <GeoDataLink.h>
using namespace Marble;
diff --git a/tests/TestTimeSpan.cpp b/tests/TestTimeSpan.cpp
index f65b512..271ebad 100644
--- a/tests/TestTimeSpan.cpp
+++ b/tests/TestTimeSpan.cpp
@@ -13,6 +13,7 @@
#include <GeoDataDocument.h>
#include <GeoDataPlacemark.h>
#include <GeoDataTimeSpan.h>
+#include <GeoDataTimeStamp.h>
#include <GeoDataCamera.h>
#include <MarbleDebug.h>
#include <GeoDataFolder.h>
diff --git a/tests/TestTour.cpp b/tests/TestTour.cpp
index 3ec39c1..4eafdc0 100644
--- a/tests/TestTour.cpp
+++ b/tests/TestTour.cpp
@@ -10,6 +10,7 @@
#include <GeoDataParser.h>
#include <GeoDataDocument.h>
+#include <GeoDataUpdate.h>
#include <GeoDataTour.h>
#include <GeoDataPlaylist.h>
#include <GeoDataTourControl.h>
diff --git a/tools/kml2cache/kml2cache.cpp b/tools/kml2cache/kml2cache.cpp
index 0710ac3..6d8b4e6 100644
--- a/tools/kml2cache/kml2cache.cpp
+++ b/tools/kml2cache/kml2cache.cpp
@@ -18,6 +18,7 @@
#include <GeoDataFolder.h>
#include <GeoDataPlacemark.h>
#include <GeoDataExtendedData.h>
+#include <GeoDataData.h>
#include <QApplication>
#include <QDebug>
diff --git a/tools/osm-addresses/OsmParser.cpp b/tools/osm-addresses/OsmParser.cpp
index a84bc72..f747a87 100644
--- a/tools/osm-addresses/OsmParser.cpp
+++ b/tools/osm-addresses/OsmParser.cpp
@@ -11,6 +11,7 @@
#include "OsmParser.h"
#include "OsmRegionTree.h"
+#include "GeoDataLatLonAltBox.h"
#include "GeoDataLinearRing.h"
#include "GeoDataLineString.h"
#include "GeoDataPolygon.h"
@@ -23,7 +24,8 @@
#include "GeoDataLineStyle.h"
#include "GeoDataFeature.h"
#include "geodata/writer/GeoDataDocumentWriter.h"
-#include "geodata/data/GeoDataExtendedData.h"
+#include <GeoDataExtendedData.h>
+#include <GeoDataData.h>
#include <geodata/handlers/kml/KmlElementDictionary.h>
#include <QDebug>
diff --git a/tools/osm-addresses/OsmParser.h b/tools/osm-addresses/OsmParser.h
index 29b605b..30822d3 100644
--- a/tools/osm-addresses/OsmParser.h
+++ b/tools/osm-addresses/OsmParser.h
@@ -16,9 +16,6 @@
#include "OsmPlacemark.h"
#include "OsmRegionTree.h"
-#include "GeoDataLineString.h"
-#include "GeoDataPolygon.h"
-
#include <QObject>
#include <QFileInfo>
#include <QHash>
@@ -28,6 +25,8 @@
namespace Marble
{
+class GeoDataLineString;
+
enum ElementType {
NoType,
NodeType,
diff --git a/tools/osm-addresses/xml/XmlParser.h b/tools/osm-addresses/xml/XmlParser.h
index 0b84d85..4f43eb8 100644
--- a/tools/osm-addresses/xml/XmlParser.h
+++ b/tools/osm-addresses/xml/XmlParser.h
@@ -18,9 +18,6 @@
#include "OsmPlacemark.h"
#include "OsmRegionTree.h"
-#include "GeoDataLineString.h"
-#include "GeoDataPolygon.h"
-
#include <QFileInfo>
#include <QXmlDefaultHandler>
diff --git a/tools/poly2kml/main.cpp b/tools/poly2kml/main.cpp
index 0193387..724de52 100644
--- a/tools/poly2kml/main.cpp
+++ b/tools/poly2kml/main.cpp
@@ -16,6 +16,7 @@
#include <QDebug>
#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"
diff --git a/tools/shp2pn2/shp2pn2.cpp b/tools/shp2pn2/shp2pn2.cpp
index ba014a3..1f90a4d 100644
--- a/tools/shp2pn2/shp2pn2.cpp
+++ b/tools/shp2pn2/shp2pn2.cpp
@@ -56,7 +56,8 @@
#include <GeoDataPolygon.h>
#include <GeoDataPoint.h>
#include <GeoDataGeometry.h>
-
+#include <GeoDataMultiGeometry.h>
+
using namespace Marble;
qreal epsilon = 1.0;
diff --git a/tools/vectorosm-tilecreator/BaseFilter.h b/tools/vectorosm-tilecreator/BaseFilter.h
index d19479b..bbae50a 100644
--- a/tools/vectorosm-tilecreator/BaseFilter.h
+++ b/tools/vectorosm-tilecreator/BaseFilter.h
@@ -14,9 +14,7 @@
#include <QList>
#include <QDebug>
-#include "GeoDataObject.h"
#include "GeoDataDocument.h"
-#include "GeoDataTypes.h"
namespace Marble {
diff --git a/tools/vectorosm-tilecreator/NodeReducer.cpp b/tools/vectorosm-tilecreator/NodeReducer.cpp
index 706f57b..c325c97 100644
--- a/tools/vectorosm-tilecreator/NodeReducer.cpp
+++ b/tools/vectorosm-tilecreator/NodeReducer.cpp
@@ -12,6 +12,7 @@
#include "GeoDataPlacemark.h"
#include "GeoDataTypes.h"
#include "GeoDataLineString.h"
+#include "GeoDataPolygon.h"
#include "GeoDataCoordinates.h"
#include "MarbleMath.h"
#include "NodeReducer.h"
diff --git a/tools/vectorosm-tilecreator/NodeReducer.h b/tools/vectorosm-tilecreator/NodeReducer.h
index 32f85b2..c1a64b8 100644
--- a/tools/vectorosm-tilecreator/NodeReducer.h
+++ b/tools/vectorosm-tilecreator/NodeReducer.h
@@ -12,7 +12,6 @@
#define MARBLE_NODEREDUCER_H
#include "BaseFilter.h"
-#include "GeoDataLineString.h"
#include "MarbleMath.h"
namespace Marble {
diff --git a/tools/vectorosm-tilecreator/VectorClipper.cpp b/tools/vectorosm-tilecreator/VectorClipper.cpp
index 0cbee8e..ba19f2f 100644
--- a/tools/vectorosm-tilecreator/VectorClipper.cpp
+++ b/tools/vectorosm-tilecreator/VectorClipper.cpp
@@ -13,6 +13,9 @@
#include "BaseClipper.h"
#include "TileId.h"
+#include "GeoDataTypes.h"
+#include "GeoDataLatLonAltBox.h"
+#include "GeoDataPolygon.h"
#include "GeoDataPlacemark.h"
#include "OsmPlacemarkData.h"
#include "OsmObjectManager.h"
diff --git a/tools/vectorosm-tilecreator/WayChunk.h b/tools/vectorosm-tilecreator/WayChunk.h
index a055cf4..d02033e 100644
--- a/tools/vectorosm-tilecreator/WayChunk.h
+++ b/tools/vectorosm-tilecreator/WayChunk.h
@@ -12,7 +12,6 @@
#define MARBLE_WAYCHUNK_H
#include "GeoDataFeature.h"
-#include "GeoDataLineString.h"
#include <QList>
diff --git a/tools/vectorosm-tilecreator/WayConcatenator.cpp b/tools/vectorosm-tilecreator/WayConcatenator.cpp
index 9021365..8a5a7a0 100644
--- a/tools/vectorosm-tilecreator/WayConcatenator.cpp
+++ b/tools/vectorosm-tilecreator/WayConcatenator.cpp
@@ -11,9 +11,11 @@
#include <QList>
#include <QHash>
+#include "GeoDataTypes.h"
#include "GeoDataPlacemark.h"
#include "GeoDataDocument.h"
#include "GeoDataObject.h"
+#include "GeoDataLineString.h"
#include "OsmPlacemarkData.h"
#include "StyleBuilder.h"
diff --git a/tools/vectorosm-tilecreator/main.cpp b/tools/vectorosm-tilecreator/main.cpp
index 8abbdd5..8b69792 100644
--- a/tools/vectorosm-tilecreator/main.cpp
+++ b/tools/vectorosm-tilecreator/main.cpp
@@ -8,10 +8,13 @@
// Copyright 2016 David Kolozsvari <freedawson@gmail.com>
//
+#include "GeoDataTypes.h"
#include "GeoDataDocumentWriter.h"
#include "MarbleModel.h"
#include "ParsingRunnerManager.h"
+#include "GeoDataGeometry.h"
#include "GeoDataPlacemark.h"
+#include "GeoDataLatLonAltBox.h"
#include <QApplication>
#include <QCommandLineParser>