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

[Thibaut Gridel]

SVN commit 1214095 by tgridel:

FileManager: perfo improvements and model/view signals

 M  +0 -4      FileManager.cpp  
 M  +0 -3      FileViewModel.cpp  
 M  +0 -3      FileViewModel.h  
 M  +3 -17     MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/FileManager.cpp #1214094:1214095
@@ -57,10 +57,6 @@
         }
     }
 
-    foreach ( GeoDataDocument *document, d->m_fileItemList ) {
-        closeFile( d->m_fileItemList.indexOf( document ) );
-    }
-
     delete d;
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/FileViewModel.cpp #1214094:1214095
@@ -87,7 +87,6 @@
 
                     document->setVisible( newValue );
                     emit dataChanged( index, index );
-                    emit modelChanged();
                     return true;
                 }
             }
@@ -132,14 +131,12 @@
 {
     beginInsertRows(QModelIndex(), order, order);
     endInsertRows();
-    emit modelChanged();
 }
 
 void FileViewModel::remove( int index )
 {
     beginRemoveRows(QModelIndex(), index, index);
     endRemoveRows();
-    emit modelChanged();
 }
 
 #include "FileViewModel.moc"
--- trunk/KDE/kdeedu/marble/src/lib/FileViewModel.h #1214094:1214095
@@ -40,9 +40,6 @@
     void setFileManager( FileManager * fileManager );
     QItemSelectionModel * selectionModel();
 
-  Q_SIGNALS:
-    void modelChanged();
-
   public slots:
     void saveFile();
     void closeFile();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1214094:1214095
@@ -151,8 +151,10 @@
     t.start();
 
     d->m_dataFacade = new MarbleDataFacade( this );
-    connect(d->m_dataFacade->treeModel(), SIGNAL( dataChanged(QModelIndex,QModelIndex) ),
+    connect(d->m_dataFacade->treeModel(), SIGNAL( layoutChanged() ),
             this, SIGNAL( modelChanged() ) );
+    connect(d->m_dataFacade->treeModel(), SIGNAL( modelReset() ),
+            this, SIGNAL( modelChanged() ) );
 
     // A new instance of FileStorageWatcher.
     // The thread will be started at setting persistent tile cache size.
@@ -176,12 +178,6 @@
     d->m_placemarkmanager->setFileManager(d->m_fileManager);
 
 
-    /*
-     * Create FileViewModel
-     */
-    connect( d->m_dataFacade->fileViewModel(), SIGNAL( modelChanged() ),
-             this,            SIGNAL( modelChanged() ) );
-
     d->m_positionTracking = new PositionTracking( d->m_fileManager, this );
 
     d->m_routingManager = new RoutingManager( d->m_parent, this );
@@ -325,13 +321,9 @@
         loadList.pop_front();
         d->m_fileManager->addFile( container );
     }
-    d->notifyModelChanged();
 
-
     mDebug() << "THEME CHANGED: ***" << mapTheme->head()->mapThemeId();
     emit themeChanged( mapTheme->head()->mapThemeId() );
-
-    d->notifyModelChanged();
 }
 
 void MarbleModel::home( qreal &lon, qreal &lat, int& zoom )
@@ -589,22 +581,16 @@
 void MarbleModel::addGeoDataFile( const QString& filename )
 {
     d->m_fileManager->addFile( filename );
-
-    d->notifyModelChanged();
 }
 
 void MarbleModel::addGeoDataString( const QString& data, const QString& key )
 {
     d->m_fileManager->addData( key, data );
-
-    d->notifyModelChanged();
 }
 
 void MarbleModel::removeGeoData( const QString& fileName )
 {
     d->m_fileManager->removeFile( fileName );
-
-    d->notifyModelChanged();
 }
 
 }