diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:26:14 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:26:14 +0200 |
| commit | 8a752526177e37b7b8fc91abbd2952bdfe77d155 (patch) | |
| tree | b9b503ab044d0d2559668984f89224c6c1afe1bc /src/mainwindow.cpp | |
| parent | Merge branch 'opensearch2' (diff) | |
| parent | BookmarkProvider's code reordered (diff) | |
| download | rekonq-8a752526177e37b7b8fc91abbd2952bdfe77d155.tar.xz | |
Merge commit 'refs/merge-requests/182' of git://gitorious.org/rekonq/mainline into m182
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f0cb5e61..4927ce4e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -37,7 +37,7 @@ // Local Includes #include "settingsdialog.h" #include "historymanager.h" -#include "bookmarksmanager.h" +#include "bookmarkprovider.h" #include "bookmarkstoolbar.h" #include "webtab.h" #include "mainview.h" @@ -163,7 +163,7 @@ MainWindow::MainWindow() MainWindow::~MainWindow() { - Application::bookmarkProvider()->removeToolBar(m_bookmarksBar); + Application::bookmarkProvider()->removeBookmarkBar(m_bookmarksBar); Application::bookmarkProvider()->removeBookmarkPanel(m_bookmarksPanel); Application::instance()->removeMainWindow(this); @@ -211,7 +211,7 @@ void MainWindow::initBookmarkBar() if (m_bookmarksBar) { - Application::bookmarkProvider()->removeToolBar(m_bookmarksBar); + Application::bookmarkProvider()->removeBookmarkBar(m_bookmarksBar); delete m_bookmarksBar; } m_bookmarksBar = new BookmarkToolBar(XMLGUIBkBar, this); |