[Marble-commits] KDE/kdeedu/marble
Bernhard Beschow
bbeschow at cs.tu-berlin.de
Fri Mar 25 13:23:26 CET 2011
SVN commit 1225973 by beschow:
provide data via MarbleModel only; do not forward in MarbleWidget and MarbleMap (patch 5 of 5)
* Remove the following method from MarbleWidget:
void addBookmark( const GeoDataPlacemark &bookmark, const QString &folderName ) const;
QString bookmarkFile() const;
bool loadBookmarkFile( const QString& relativeFileName);
QVector<GeoDataFolder*> bookmarkFolders();
void removeAllBookmarks();
void addNewBookmarkFolder( const QString& name ) const;
Instead, use the respective methods of BookmarkManager, accessible through MarbleModel.
Hint: The methods bookmarkFolders() and loadBookmarkFile() are named folders() and loadFile() in BookmarkManager.
M +13 -0 docs/release_notes/APIChanges-0.12.txt
M +2 -2 src/QtMainWindow.cpp
M +1 -0 src/lib/BookmarkManager.cpp
M +4 -2 src/lib/BookmarkManager.h
M +1 -0 src/lib/CMakeLists.txt
M +2 -2 src/lib/EditBookmarkDialog.cpp
M +0 -32 src/lib/MarbleWidget.cpp
M +0 -20 src/lib/MarbleWidget.h
M +6 -6 src/lib/NewBookmarkFolderDialog.cpp
M +3 -3 src/lib/NewBookmarkFolderDialog.h
M +2 -2 src/marble_part.cpp
--- trunk/KDE/kdeedu/marble/docs/release_notes/APIChanges-0.12.txt #1225972:1225973
@@ -48,3 +48,16 @@
* Remove the following method from MarbleMap and MarbleWidget, use the respective method of MarbleModel:
SunLocator* sunLocator();
+
+
+2011-03-25 Bernhard Beschow <bbeschow at cs.tu-berlin.de>
+
+* Remove the following method from MarbleWidget:
+ void addBookmark( const GeoDataPlacemark &bookmark, const QString &folderName ) const;
+ QString bookmarkFile() const;
+ bool loadBookmarkFile( const QString& relativeFileName);
+ QVector<GeoDataFolder*> bookmarkFolders();
+ void removeAllBookmarks();
+ void addNewBookmarkFolder( const QString& name ) const;
+ Instead, use the respective methods of BookmarkManager, accessible through MarbleModel.
+ Hint: The methods bookmarkFolders() and loadBookmarkFile() are named folders() and loadFile() in BookmarkManager.
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1225972:1225973
@@ -124,7 +124,7 @@
m_controlView->marbleWidget()->model(), SLOT( clearPersistentTileCache() ) );
// Load bookmark file. If it does not exist, a default one will be used.
- m_controlView->marbleWidget()->loadBookmarkFile( "bookmarks/bookmarks.kml" );
+ m_controlView->marbleWidget()->model()->bookmarkManager()->loadFile( "bookmarks/bookmarks.kml" );
createActions();
createMenus();
@@ -491,7 +491,7 @@
void MainWindow::createFolderList()
{
- QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->bookmarkFolders();
+ QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->model()->bookmarkManager()->folders();
QVector<GeoDataFolder*>::const_iterator i = folders.constBegin();
QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
--- trunk/KDE/kdeedu/marble/src/lib/BookmarkManager.cpp #1225972:1225973
@@ -9,6 +9,7 @@
//
#include "BookmarkManager.h"
+#include "BookmarkManager_p.h"
#include "GeoDataParser.h"
#include "GeoDataDocument.h"
#include "GeoDataFolder.h"
--- trunk/KDE/kdeedu/marble/src/lib/BookmarkManager.h #1225972:1225973
@@ -13,11 +13,13 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include "BookmarkManager_p.h"
+#include <QtCore/QVector>
+#include "global.h"
namespace Marble
{
+ class BookmarkManagerPrivate;
class GeoDataPlacemark;
class GeoDataFolder;
/**
@@ -26,7 +28,7 @@
* book mark operations
*/
-class BookmarkManager : public QObject
+class MARBLE_EXPORT BookmarkManager : public QObject
{
Q_OBJECT
--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1225972:1225973
@@ -318,6 +318,7 @@
else (APPLE AND QTONLY)
install( FILES
${graphicsview_HDRS}
+ BookmarkManager.h
DownloadRegionDialog.h
LatLonBoxWidget.h
MarbleWidget.h
--- trunk/KDE/kdeedu/marble/src/lib/EditBookmarkDialog.cpp #1225972:1225973
@@ -179,7 +179,7 @@
{
QPointer<NewBookmarkFolderDialog> dialog = new NewBookmarkFolderDialog( this );
if ( d->m_widget ) {
- dialog->setMarbleWidget( d->m_widget );
+ dialog->setBookmarkManager( d->m_widget->model()->bookmarkManager() );
}
if ( dialog->exec() == QDialog::Accepted ) {
d->initComboBox();
@@ -191,7 +191,7 @@
void EditBookmarkDialog::addBookmark()
{
if ( d->m_widget ) {
- d->m_widget->addBookmark( bookmark(), folderName() );
+ d->m_widget->model()->bookmarkManager()->addBookmark( bookmark(), folderName() );
}
}
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1225972:1225973
@@ -30,7 +30,6 @@
#include "AbstractProjection.h"
#include "DataMigration.h"
-#include "FileViewModel.h"
#include "GeoDataLatLonAltBox.h"
#include "GeoPainter.h"
#include "MarbleDebug.h"
@@ -46,7 +45,6 @@
#include "SunLocator.h"
#include "TileCreatorDialog.h"
#include "ViewportParams.h"
-#include "BookmarkManager.h"
#include "routing/RoutingLayer.h"
#include "routing/RoutingManager.h"
#include "routing/AlternativeRoutesModel.h"
@@ -1263,36 +1261,6 @@
return d->m_map->lookAt();
}
-void MarbleWidget::addBookmark( const GeoDataPlacemark &bookmark, const QString &folderName ) const
-{
- d->m_model->bookmarkManager()->addBookmark( bookmark, folderName );
-}
-
-QString MarbleWidget::bookmarkFile() const
-{
- return d->m_model->bookmarkManager()->bookmarkFile();
-}
-
-bool MarbleWidget::loadBookmarkFile( const QString &relativeFileName )
-{
- return d->m_model->bookmarkManager()->loadFile( relativeFileName );
-}
-
-QVector<GeoDataFolder*> MarbleWidget::bookmarkFolders()
-{
- return d->m_model->bookmarkManager()->folders();
-}
-
-void MarbleWidget::removeAllBookmarks()
-{
- d->m_model->bookmarkManager()->removeAllBookmarks();
-}
-
-void MarbleWidget::addNewBookmarkFolder( const QString &name ) const
-{
- d->m_model->bookmarkManager()->addNewBookmarkFolder( name );
-}
-
RoutingLayer* MarbleWidget::routingLayer()
{
return d->m_routingLayer;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1225972:1225973
@@ -548,26 +548,6 @@
//@}
- /// @name Bookmark management
- //@{
-
- void addBookmark( const GeoDataPlacemark &bookmark, const QString &folderName ) const;
-
- /**
- * @brief Returns path of file where bookmarks are saved
- */
- QString bookmarkFile() const;
-
- bool loadBookmarkFile( const QString& relativeFileName);
-
- QVector<GeoDataFolder*> bookmarkFolders();
-
- void removeAllBookmarks();
-
- void addNewBookmarkFolder( const QString& name ) const;
-
- //@}
-
/// @name Miscellaneous
//@{
--- trunk/KDE/kdeedu/marble/src/lib/NewBookmarkFolderDialog.cpp #1225972:1225973
@@ -11,14 +11,14 @@
#include "NewBookmarkFolderDialog.h"
#include "MarbleDebug.h"
-#include "MarbleWidget.h"
+#include "BookmarkManager.h"
#include <QtGui/QLineEdit>
namespace Marble {
NewBookmarkFolderDialog::NewBookmarkFolderDialog( QWidget *parent )
- : QDialog(parent), m_widget( 0 )
+ : QDialog(parent), m_manager( 0 )
{
setupUi(this);
connect( this, SIGNAL( accepted() ), this, SLOT( addNewBookmarkFolder() ) );
@@ -28,9 +28,9 @@
{
}
-void NewBookmarkFolderDialog::setMarbleWidget( MarbleWidget* widget )
+void NewBookmarkFolderDialog::setBookmarkManager( BookmarkManager* manager )
{
- m_widget = widget;
+ m_manager = manager;
}
QString NewBookmarkFolderDialog::folderName() const
@@ -46,9 +46,9 @@
void NewBookmarkFolderDialog::addNewBookmarkFolder()
{
- if ( m_widget ) {
+ if ( m_manager ) {
mDebug() << " Adding New Bookmark Folder "<< m_name->text() ;
- m_widget->addNewBookmarkFolder( m_name->text() );
+ m_manager->addNewBookmarkFolder( m_name->text() );
}
}
--- trunk/KDE/kdeedu/marble/src/lib/NewBookmarkFolderDialog.h #1225972:1225973
@@ -17,7 +17,7 @@
namespace Marble
{
-class MarbleWidget;
+class BookmarkManager;
class MARBLE_EXPORT NewBookmarkFolderDialog : public QDialog, private Ui::UiNewBookmarkFolderDialog
{
@@ -29,7 +29,7 @@
~NewBookmarkFolderDialog();
- void setMarbleWidget( MarbleWidget* widget );
+ void setBookmarkManager( BookmarkManager* manager );
void setFolderName( const QString &name );
@@ -41,7 +41,7 @@
private:
Q_DISABLE_COPY( NewBookmarkFolderDialog )
- MarbleWidget *m_widget;
+ BookmarkManager *m_manager;
};
}
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1225972:1225973
@@ -153,7 +153,7 @@
m_statusBarExtension->statusBar()->setUpdatesEnabled( false );
// Load bookmark file. If it does not exist, a default one will be used.
- m_controlView->marbleWidget()->loadBookmarkFile( "bookmarks/bookmarks.kml" );
+ m_controlView->marbleWidget()->model()->bookmarkManager()->loadFile( "bookmarks/bookmarks.kml" );
initializeCustomTimezone();
@@ -879,7 +879,7 @@
QList<QAction*> actionList;
- QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->bookmarkFolders();
+ QVector<GeoDataFolder*> folders = m_controlView->marbleWidget()->model()->bookmarkManager()->folders();
QVector<GeoDataFolder*>::const_iterator i = folders.constBegin();
QVector<GeoDataFolder*>::const_iterator end = folders.constEnd();
More information about the Marble-commits
mailing list