[Marble-commits] KDE/kdeedu/marble/src

[Thibaut Gridel]

SVN commit 1168463 by tgridel:

move PositionTracking out of gps/ and export it correctly

 M  +2 -1      lib/CMakeLists.txt  
 M  +1 -1      lib/CurrentLocationWidget.cpp  
 M  +1 -0      lib/MarbleDataFacade.cpp  
 M  +0 -1      lib/MarbleMap.cpp  
 M  +1 -1      lib/MarbleModel.cpp  
 M  +0 -1      lib/MarbleWidget.cpp  
 A             lib/PositionTracking.cpp   lib/gps/PositionTracking.cpp#1168402 [License: LGPL]
 A             lib/PositionTracking.h   lib/gps/PositionTracking.h#1168402 [License: LGPL]
 D             lib/gps/PositionTracking.cpp  
 D             lib/gps/PositionTracking.h  
 M  +1 -1      lib/routing/AdjustNavigation.cpp  
 M  +0 -1      lib/routing/RoutingLayer.cpp  
 M  +1 -1      lib/routing/RoutingModel.cpp  
 M  +1 -1      plugins/render/positionmarker/PositionMarker.cpp  
 M  +7 -1      plugins/render/routing/RoutingPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1168462:1168463
@@ -145,7 +145,7 @@
     FileManager.cpp
     FileViewModel.cpp
     KmlFileViewItem.cpp
-    gps/PositionTracking.cpp
+    PositionTracking.cpp
     DataMigration.cpp
 
     AbstractDataPlugin.cpp
@@ -317,6 +317,7 @@
     Projections/SphericalProjection.h
     Projections/EquirectProjection.h
     Projections/MercatorProjection.h
+    PositionTracking.h
     Quaternion.h
     SunLocator.h
     ClipPainter.h
--- trunk/KDE/kdeedu/marble/src/lib/CurrentLocationWidget.cpp #1168462:1168463
@@ -22,7 +22,7 @@
 #include "GeoDataCoordinates.h"
 #include "PositionProviderPlugin.h"
 #include "PluginManager.h"
-#include "gps/PositionTracking.h"
+#include "PositionTracking.h"
 #include "routing/RoutingManager.h"
 
 using namespace Marble;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDataFacade.cpp #1168462:1168463
@@ -28,6 +28,7 @@
 #include "PluginManager.h"
 #include "GeoDataTreeModel.h"
 #include "GeoDataParser.h"
+#include "PositionTracking.h"
 
 #include "GeoSceneDocument.h"
 #include "GeoSceneHead.h"
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1168462:1168463
@@ -54,7 +54,6 @@
 #include "TextureColorizer.h"
 #include "ViewParams.h"
 #include "ViewportParams.h"
-#include "gps/PositionTracking.h"
 
 using namespace Marble;
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1168462:1168463
@@ -51,7 +51,7 @@
 #include "SphericalScanlineTextureMapper.h"
 #include "EquirectScanlineTextureMapper.h"
 #include "MercatorScanlineTextureMapper.h"
-#include "gps/PositionTracking.h"
+#include "PositionTracking.h"
 #include "HttpDownloadManager.h"
 #include "LayerManager.h"
 #include "MarbleDataFacade.h"
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1168462:1168463
@@ -46,7 +46,6 @@
 #include "SunLocator.h"
 #include "TileCreatorDialog.h"
 #include "ViewportParams.h"
-#include "gps/PositionTracking.h"
 #include "BookmarkManager.h"
 namespace Marble
 {
--- trunk/KDE/kdeedu/marble/src/lib/routing/AdjustNavigation.cpp #1168462:1168463
@@ -13,7 +13,7 @@
 
 #include "MarbleWidget.h"
 #include "GeoDataCoordinates.h"
-#include "gps/PositionTracking.h"
+#include "PositionTracking.h"
 #include "MarbleDebug.h"
 #include "MarbleModel.h"
 #include "ViewportParams.h"
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.cpp #1168462:1168463
@@ -20,7 +20,6 @@
 #include "MarbleWidgetPopupMenu.h"
 #include "RoutingModel.h"
 #include "RouteSkeleton.h"
-#include "gps/PositionTracking.h"
 #include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "AlternativeRoutesModel.h"
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingModel.cpp #1168462:1168463
@@ -20,7 +20,7 @@
 #include "GeoDataParser.h"
 #include "GeoDataPlacemark.h"
 #include "RouteSkeleton.h"
-#include "gps/PositionTracking.h"
+#include "PositionTracking.h"
 #include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "MarbleWidget.h"
--- trunk/KDE/kdeedu/marble/src/plugins/render/positionmarker/PositionMarker.cpp #1168462:1168463
@@ -19,7 +19,7 @@
 #include "AbstractProjection.h"
 #include "MarbleDataFacade.h"
 #include "GeoPainter.h"
-#include "gps/PositionTracking.h"
+#include "PositionTracking.h"
 #include "ViewportParams.h"
 
 namespace Marble
--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.cpp #1168462:1168463
@@ -21,7 +21,13 @@
 #include "routing/AdjustNavigation.h"
 #include "routing/RoutingManager.h"
 #include "routing/RoutingModel.h"
-#include "gps/PositionTracking.h"
+#include "MarbleDirs.h"
+#include "MarbleWidget.h"
+#include "MarbleModel.h"
+#include "MarbleMap.h"
+#include "MarbleDataFacade.h"
+#include "PositionTracking.h"
+#include "GeoPainter.h"
 #include "ViewportParams.h"
 #include "MarbleDataFacade.h"
 #include "GeoDataCoordinates.h"