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

[Dennis Nienhüser]

SVN commit 1181368 by nienhueser:

Rename MarbleWidget::folders() to MarbleWidget::bookmarkFolders().
There are six new bookmark related methods in MarbleWidget. Some of them look like removal candidates to me: They won't be needed commonly and can be accessed via BookmarkManager as well.
CCMAIL: marble-devel at kde.org

 M  +1 -1      QtMainWindow.cpp  
 M  +1 -1      lib/BookmarkInfoDialog.cpp  
 M  +1 -1      lib/MarbleWidget.cpp  
 M  +1 -1      lib/MarbleWidget.h  
 M  +1 -1      marble_part.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1181367:1181368
@@ -459,7 +459,7 @@
 
 void MainWindow::createFolderList()
 {
-    QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->folders();
+    QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->bookmarkFolders();
 
     QVector<GeoDataFolder*>::const_iterator i = folders.constBegin();
     QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
--- trunk/KDE/kdeedu/marble/src/lib/BookmarkInfoDialog.cpp #1181367:1181368
@@ -67,7 +67,7 @@
 void BookmarkInfoDialogPrivate::initComboBox()
 {
     q->m_folders->clear();
-    QVector<GeoDataFolder*> folders =  m_widget->folders();
+    QVector<GeoDataFolder*> folders =  m_widget->bookmarkFolders();
     QVector<GeoDataFolder*>::const_iterator i = folders.constBegin();
     QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1181367:1181368
@@ -1389,7 +1389,7 @@
     return d->m_model->bookmarkManager()->loadFile( relativeFileName );
 }
 
-QVector<GeoDataFolder*> MarbleWidget::folders()
+QVector<GeoDataFolder*> MarbleWidget::bookmarkFolders()
 {
     return d->m_model->bookmarkManager()->folders();
 }
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1181367:1181368
@@ -580,7 +580,7 @@
 
     bool loadBookmarkFile( const QString& relativeFileName);
 
-    QVector<GeoDataFolder*> folders();
+    QVector<GeoDataFolder*> bookmarkFolders();
     
     void removeAllBookmarks();
 
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1181367:1181368
@@ -824,7 +824,7 @@
 
     QList<QAction*> actionList;
 
-   QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->folders();
+   QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->bookmarkFolders();
    QVector<GeoDataFolder*>::const_iterator i = folders.constBegin();
    QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();