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

[Thibaut Gridel]

SVN commit 1022477 by tgridel:

dead code

 M  +0 -1      FileManager.cpp  
 M  +0 -1      FileManager.h  
 M  +0 -1      KmlFileViewItem.cpp  
 M  +0 -16     MarbleModel.cpp  
 M  +0 -1      MarbleModel.h  
 M  +0 -6      MarblePlacemarkModel.h  
 M  +0 -1      MarbleRunnerManager.h  
 M  +0 -1      PlacemarkManager.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/FileManager.cpp #1022476:1022477
@@ -200,7 +200,6 @@
     // do not set this file if it only contains points
     if( doc->isVisible() && d->m_datafacade->geometryModel() )
         d->m_datafacade->geometryModel()->setGeoDataRoot( doc );
-    emit geoDataDocumentAdded( *doc );
 
     if( d->m_loaderList.isEmpty() ) {
         emit finalize();
--- trunk/KDE/kdeedu/marble/src/lib/FileManager.h #1022476:1022477
@@ -88,7 +88,6 @@
 
 
  Q_SIGNALS:
-    void geoDataDocumentAdded( const GeoDataDocument &document );
     void fileAdded( int index );
     void fileRemoved( int index );
     void finalize();
--- trunk/KDE/kdeedu/marble/src/lib/KmlFileViewItem.cpp #1022476:1022477
@@ -15,7 +15,6 @@
 #include "FileManager.h"
 #include "MarbleDataFacade.h"
 #include "MarblePlacemarkModel.h"
-#include "MarbleGeometryModel.h"
 
 #include <QtCore/QDebug>
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1022476:1022477
@@ -100,7 +100,6 @@
 
     void resize( int width, int height );
     void notifyModelChanged();
-    void geoDataDocumentAdded( const GeoDataDocument& document );
 
     static QAtomicInt       refCounter;
     MarbleModel             *m_parent;
@@ -172,8 +171,6 @@
 
     d->m_placemarkmanager = new PlacemarkManager();
     d->m_placemarkmanager->setDataFacade(d->m_dataFacade);
-    connect( d->m_fileManager, SIGNAL( geoDataDocumentAdded( const GeoDataDocument& ) ),
-             this,             SLOT( geoDataDocumentAdded( const GeoDataDocument& ) ) );
     d->m_placemarkmanager->setFileManager(d->m_fileManager);
 
     d->m_popSortModel = new QSortFilterProxyModel( this );
@@ -741,19 +738,6 @@
     emit m_parent->modelChanged();
 }
 
-void MarbleModelPrivate::geoDataDocumentAdded( const GeoDataDocument& document )
-{
-    Q_UNUSED(document);
-/*    QVector<GeoDataFeature>::Iterator end = document->end();
-    QVector<GeoDataFeature>::Iterator itr = document->begin();
-    for ( ; itr != end; ++itr ) {
-        // use *itr (or itr.value()) here
-        QString styleUrl = itr->styleUrl().remove('#');
-        itr->setStyle( &document->style( styleUrl ) );
-    }
-*/
-}
-
 void MarbleModel::update()
 {
     qDebug() << "MarbleModel::update()";
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h #1022476:1022477
@@ -367,7 +367,6 @@
     MarbleModelPrivate  * const d;
 
     Q_PRIVATE_SLOT( d, void notifyModelChanged() )
-    Q_PRIVATE_SLOT( d, void geoDataDocumentAdded( const GeoDataDocument& ) )
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/MarblePlacemarkModel.h #1022476:1022477
@@ -110,12 +110,6 @@
                            int start,
                            int length );
 
- Q_SIGNALS:
-    /**
-     * @brief Signal that the persistant Index has been updated
-     */
-    void indexUpdated();
-
  private:
 
     void createFilterProperties( QVector<Marble::GeoDataPlacemark> &container );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleRunnerManager.h #1022476:1022477
@@ -43,7 +43,6 @@
 public slots:
     void newText(QString text);
 signals:
-    void allDone();
     void modelChanged( MarblePlacemarkModel *model );
 
 private slots:
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkManager.cpp #1022476:1022477
@@ -24,7 +24,6 @@
 #include "FileViewModel.h"
 #include "MarbleDirs.h"
 #include "MarblePlacemarkModel.h"
-#include "MarbleGeometryModel.h"
 #include "MarbleDataFacade.h"
 
 #include "GeoDataDocument.h"