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

[Thibaut Gridel]

SVN commit 1150832 by tgridel:

MarbleGeoDataModel is broken and not used

 M  +0 -1      lib/CMakeLists.txt  
 M  +0 -9      lib/MarbleDataFacade.cpp  
 M  +0 -2      lib/MarbleDataFacade.h  
 D             lib/MarbleGeoDataModel.cpp  
 D             lib/MarbleGeoDataModel.h  
 M  +0 -3      lib/geodata/data/GeoDataGeometry.h  
 M  +0 -1      plugins/render/CMakeLists.txt  
 M  +0 -1      plugins/render/dataview/DataViewPlugin.cpp  
 M  +0 -1      plugins/render/geodata/GeoRendererPlugin.cpp  
 D             plugins/render/placemarks/CMakeLists.txt  
 D             plugins/render/placemarks/PlacemarksPlugin.cpp  
 D             plugins/render/placemarks/PlacemarksPlugin.h  
 D             plugins/render/placemarks/jakobsweg.kml  


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1150831:1150832
@@ -75,7 +75,6 @@
     MarbleWidgetInputHandler.cpp
     MarbleWidgetPopupMenu.cpp
     MarblePlacemarkModel.cpp
-    MarbleGeoDataModel.cpp
     GeoDataTreeModel.cpp
     MarbleDataFacade.cpp
     MarbleDebug.cpp
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDataFacade.cpp #1150831:1150832
@@ -21,7 +21,6 @@
 #include "ExtDateTime.h"
 #include "MarbleDebug.h"
 #include "MarbleModel.h"
-#include "MarbleGeoDataModel.h"
 #include "MarblePlacemarkModel.h"
 #include "Planet.h"
 
@@ -42,7 +41,6 @@
     MarbleDataFacadePrivate( MarbleModel *model )
         : m_model( model ),
         m_fileviewmodel( new FileViewModel() ),
-        m_geodatamodel( new MarbleGeoDataModel() ),
         m_placemarkmodel( new MarblePlacemarkModel ),
         m_treemodel( new GeoDataTreeModel)
     {
@@ -51,14 +49,12 @@
     ~MarbleDataFacadePrivate()
     {
         delete m_fileviewmodel;
-        delete m_geodatamodel;
         delete m_placemarkmodel;
         delete m_treemodel;
     }
 
     MarbleModel  *m_model;
     FileViewModel *m_fileviewmodel;
-    MarbleGeoDataModel *m_geodatamodel;
     MarblePlacemarkModel *m_placemarkmodel;
     GeoDataTreeModel *m_treemodel;
 };
@@ -105,11 +101,6 @@
     return d->m_model->positionTracking();
 }
 
-MarbleGeoDataModel* MarbleDataFacade::geoDataModel()
-{
-    return d->m_geodatamodel;
-}
-
 MarblePlacemarkModel* MarbleDataFacade::placemarkModel()
 {
     return d->m_placemarkmodel;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDataFacade.h #1150831:1150832
@@ -79,8 +79,6 @@
 
     PositionTracking* positionTracking() const;
 
-    MarbleGeoDataModel* geoDataModel();
-    
     MarblePlacemarkModel* placemarkModel();
 
     FileViewModel* fileViewModel() const;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataGeometry.h #1150831:1150832
@@ -30,7 +30,6 @@
 class GeoDataPolygon;
 class GeoDataLineString; // LinearRing is the same!
 class GeoDataMultiGeometry;
-class GeoDataModel; // not implemented yet
 
 /**
  * @short A base class for all geodata features
@@ -49,7 +48,6 @@
     friend class GeoDataPolygon;
     friend class GeoDataLineString;
     friend class GeoDataMultiGeometry;
-    friend class GeoDataModel;
  public:
     GeoDataGeometry();
     GeoDataGeometry( const GeoDataGeometry& other );
@@ -57,7 +55,6 @@
     GeoDataGeometry( const GeoDataPoint& other );
     GeoDataGeometry( const GeoDataLineString& other );
     GeoDataGeometry( const GeoDataMultiGeometry& other );
-//    GeoDataGeometry( const GeoDataModel& other );
     virtual bool operator==( const GeoDataGeometry& other ) const { Q_UNUSED(other); return false; };
     GeoDataGeometry& operator=( const GeoDataGeometry& other );
     
--- trunk/KDE/kdeedu/marble/src/plugins/render/CMakeLists.txt #1150831:1150832
@@ -1,7 +1,6 @@
 # add_subdirectory( test )
 add_subdirectory( crosshairs )
 add_subdirectory( geodata )
-# add_subdirectory( placemarks )
 add_subdirectory( compass )
 add_subdirectory( graticule )
 # add_subdirectory( satellites )
--- trunk/KDE/kdeedu/marble/src/plugins/render/dataview/DataViewPlugin.cpp #1150831:1150832
@@ -21,7 +21,6 @@
 #include "MarbleDebug.h"
 #include "MarbleDirs.h"
 #include "MarbleDataFacade.h"
-#include "MarbleGeoDataModel.h"
 #include "GeoPainter.h"
 
 #include "GeoDataCoordinates.h"
--- trunk/KDE/kdeedu/marble/src/plugins/render/geodata/GeoRendererPlugin.cpp #1150831:1150832
@@ -20,7 +20,6 @@
 #include "MarbleDebug.h"
 #include "MarbleDirs.h"
 #include "MarbleDataFacade.h"
-#include "MarbleGeoDataModel.h"
 #include "GeoDataTreeModel.h"
 #include "GeoPainter.h"