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

[Thibaut Gridel]

SVN commit 1150821 by tgridel:

drop the MarbleGeometryModel

 M  +0 -1      CMakeLists.txt  
 M  +0 -8      FileManager.cpp  
 M  +0 -9      MarbleDataFacade.cpp  
 M  +0 -3      MarbleDataFacade.h  
 D             MarbleGeometryModel.cpp  
 D             MarbleGeometryModel.h  
 M  +0 -2      MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1150820:1150821
@@ -76,7 +76,6 @@
     MarbleWidgetPopupMenu.cpp
     MarblePlacemarkModel.cpp
     MarbleGeoDataModel.cpp
-    MarbleGeometryModel.cpp
     GeoDataTreeModel.cpp
     MarbleDataFacade.cpp
     MarbleDebug.cpp
--- trunk/KDE/kdeedu/marble/src/lib/FileManager.cpp #1150820:1150821
@@ -19,7 +19,6 @@
 #include "KmlFileViewItem.h"
 #include "MarbleDebug.h"
 #include "MarbleDataFacade.h"
-#include "MarbleGeometryModel.h"
 #include "GeoDataTreeModel.h"
 
 #include "GeoDataDocument.h"
@@ -154,10 +153,6 @@
         KmlFileViewItem *file =
                 static_cast<KmlFileViewItem*>( d->m_fileItemList.at( index ));
         if ( file ) {
-            MarbleGeometryModel *geometryModel = d->m_datafacade->geometryModel();
-            if ( geometryModel->geoDataRoot() == file->document() ) {
-                geometryModel->setGeoDataRoot( 0 );
-            }
             delete file->document();
         }
         delete d->m_fileItemList.at( index );
@@ -197,9 +192,6 @@
         }
     }
 
-    // do not set this file if it only contains points
-    if ( doc->isVisible() && d->m_datafacade->geometryModel() )
-        d->m_datafacade->geometryModel()->setGeoDataRoot( doc );
 }
 
 void FileManager::cleanupLoader( FileLoader* loader )
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDataFacade.cpp #1150820:1150821
@@ -22,7 +22,6 @@
 #include "MarbleDebug.h"
 #include "MarbleModel.h"
 #include "MarbleGeoDataModel.h"
-#include "MarbleGeometryModel.h"
 #include "MarblePlacemarkModel.h"
 #include "Planet.h"
 
@@ -44,7 +43,6 @@
         : m_model( model ),
         m_fileviewmodel( new FileViewModel() ),
         m_geodatamodel( new MarbleGeoDataModel() ),
-        m_geometrymodel( new MarbleGeometryModel() ),
         m_placemarkmodel( new MarblePlacemarkModel ),
         m_treemodel( new GeoDataTreeModel)
     {
@@ -54,7 +52,6 @@
     {
         delete m_fileviewmodel;
         delete m_geodatamodel;
-        delete m_geometrymodel;
         delete m_placemarkmodel;
         delete m_treemodel;
     }
@@ -62,7 +59,6 @@
     MarbleModel  *m_model;
     FileViewModel *m_fileviewmodel;
     MarbleGeoDataModel *m_geodatamodel;
-    MarbleGeometryModel *m_geometrymodel;
     MarblePlacemarkModel *m_placemarkmodel;
     GeoDataTreeModel *m_treemodel;
 };
@@ -114,11 +110,6 @@
     return d->m_geodatamodel;
 }
 
-MarbleGeometryModel* MarbleDataFacade::geometryModel()
-{
-    return d->m_geometrymodel;
-}
-
 MarblePlacemarkModel* MarbleDataFacade::placemarkModel()
 {
     return d->m_placemarkmodel;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDataFacade.h #1150820:1150821
@@ -38,7 +38,6 @@
 
 class MarbleModel;
 class MarbleGeoDataModel;
-class MarbleGeometryModel;
 class MarblePlacemarkModel;
 class GeoDataTreeModel;
 class FileViewModel;
@@ -82,8 +81,6 @@
 
     MarbleGeoDataModel* geoDataModel();
     
-    MarbleGeometryModel* geometryModel();
-
     MarblePlacemarkModel* placemarkModel();
 
     FileViewModel* fileViewModel() const;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1150820:1150821
@@ -58,7 +58,6 @@
 #include "MarbleDataFacade.h"
 #include "MarbleDirs.h"
 #include "MarblePlacemarkModel.h"
-#include "MarbleGeometryModel.h"
 #include "MergedLayerDecorator.h"
 #include "FileManager.h"
 #include "PlacemarkManager.h"
@@ -397,7 +396,6 @@
             }
         }
     }
-    d->m_dataFacade->geometryModel()->setGeoDataRoot( 0 );
     QStringList loadedContainers = d->m_fileManager->containers();
     QStringList loadList;
     const QVector<GeoSceneLayer*> & layers = d->m_mapTheme->map()->layers();