[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib: make BookmarkManager::openFile() static
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2012-10-31 19:40:34
Message-ID: 20121031194034.A08BBA60CB () git ! kde ! org
[Download RAW message or body]

Git commit d37155d6eda47e3380e6f812eb45490011697911 by Bernhard Beschow.
Committed on 31/10/2012 at 13:34.
Pushed by beschow into branch 'master'.

make BookmarkManager::openFile() static

M  +2    -2    src/lib/BookmarkManager.cpp
M  +1    -1    src/lib/BookmarkManager.h
M  +1    -1    src/lib/BookmarkManagerDialog.cpp
M  +1    -1    src/lib/BookmarkManager_p.h

http://commits.kde.org/marble/d37155d6eda47e3380e6f812eb45490011697911

diff --git a/src/lib/BookmarkManager.cpp b/src/lib/BookmarkManager.cpp
index bbb71cb..0cd3d14 100644
--- a/src/lib/BookmarkManager.cpp
+++ b/src/lib/BookmarkManager.cpp
@@ -249,7 +249,7 @@ bool BookmarkManager::updateBookmarkFile()
     return false;
 }
 
-GeoDataDocument* BookmarkManager::openFile( const QString &fileName ) const
+GeoDataDocument* BookmarkManager::openFile( const QString &fileName )
 {
     GeoDataParser parser( GeoData_KML );
     QFile file( fileName );
@@ -270,7 +270,7 @@ GeoDataDocument* BookmarkManager::openFile( const QString &fileName ) const
 
     result->setDocumentRole( BookmarkDocument );
     foreach( GeoDataFolder* folder, result->folderList() ) {
-        d->setVisualCategory( folder );
+        BookmarkManagerPrivate::setVisualCategory( folder );
     }
 
     return result;
diff --git a/src/lib/BookmarkManager.h b/src/lib/BookmarkManager.h
index dc590ef..bfe0d6f 100644
--- a/src/lib/BookmarkManager.h
+++ b/src/lib/BookmarkManager.h
@@ -104,7 +104,7 @@ Q_SIGNALS:
     */
     bool updateBookmarkFile();
 
-    GeoDataDocument* openFile( const QString& fileName ) const;
+    static GeoDataDocument* openFile( const QString& fileName );
 
     BookmarkManagerPrivate* const d;
 
diff --git a/src/lib/BookmarkManagerDialog.cpp b/src/lib/BookmarkManagerDialog.cpp
index e7ad6ac..2dcb7cf 100644
--- a/src/lib/BookmarkManagerDialog.cpp
+++ b/src/lib/BookmarkManagerDialog.cpp
@@ -418,7 +418,7 @@ void BookmarkManagerDialog::importBookmarks()
         return;
     }
 
-    GeoDataDocument *import = d->m_manager->openFile( file );
+    GeoDataDocument *import = BookmarkManager::openFile( file );
     if ( !import ) {
         QString const text = tr( "The file %1 cannot be opened as a KML file." ).arg( file );
         QMessageBox::warning( this, tr( "Bookmark Import - Marble" ), text );
diff --git a/src/lib/BookmarkManager_p.h b/src/lib/BookmarkManager_p.h
index c8870e6..55ade27 100644
--- a/src/lib/BookmarkManager_p.h
+++ b/src/lib/BookmarkManager_p.h
@@ -31,7 +31,7 @@ public:
 
     void resetBookmarkDocument();
 
-    void setVisualCategory( GeoDataContainer *container );
+    static void setVisualCategory( GeoDataContainer *container );
 
     GeoDataTreeModel *m_treeModel;
 

[prev in list] [next in list] [prev in thread] [next in thread]