summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-11-14 18:49:04 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-12-12 16:40:28 +0100
commitb111a11cb46bfd572c2fed9c67d648bcff10a3ce (patch)
treea5a12a0ac980f6af2fe245d8cdd8575dd8e95601 /src/mainwindow.cpp
parentlet history, bookmarks and passwords sync on change (first bits) (diff)
downloadrekonq-b111a11cb46bfd572c2fed9c67d648bcff10a3ce.tar.xz
BookmarkProvider --> BookmarkManager
We have 7 managers and 1 provider... finally fixing this strange thing!
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c46fbc68..b1556ed5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -38,7 +38,7 @@
#include "adblockmanager.h"
#include "analyzerpanel.h"
#include "application.h"
-#include "bookmarkprovider.h"
+#include "bookmarkmanager.h"
#include "bookmarkspanel.h"
#include "bookmarkstoolbar.h"
#include "downloadmanager.h"
@@ -226,8 +226,8 @@ MainWindow::~MainWindow()
{
m_hidePopupTimer->stop();
- rApp->bookmarkProvider()->removeBookmarkBar(m_bookmarksBar);
- rApp->bookmarkProvider()->removeBookmarkPanel(m_bookmarksPanel);
+ rApp->bookmarkManager()->removeBookmarkBar(m_bookmarksBar);
+ rApp->bookmarkManager()->removeBookmarkPanel(m_bookmarksPanel);
rApp->removeMainWindow(this);
}
@@ -255,7 +255,7 @@ void MainWindow::initBookmarkBar()
if (m_bookmarksBar)
{
- rApp->bookmarkProvider()->removeBookmarkBar(m_bookmarksBar);
+ rApp->bookmarkManager()->removeBookmarkBar(m_bookmarksBar);
delete m_bookmarksBar;
}
m_bookmarksBar = new BookmarkToolBar(XMLGUIBkBar, this);
@@ -495,7 +495,7 @@ void MainWindow::setupActions()
connect(a, SIGNAL(triggered(bool)), m_view->tabBar(), SLOT(detachTab()));
// Bookmark Menu
- KActionMenu *bmMenu = rApp->bookmarkProvider()->bookmarkActionMenu(this);
+ KActionMenu *bmMenu = rApp->bookmarkManager()->bookmarkActionMenu(this);
bmMenu->setIcon(KIcon("bookmarks"));
bmMenu->setDelayed(false);
bmMenu->setShortcutConfigurable(true);
@@ -582,7 +582,7 @@ void MainWindow::setupPanels()
addDockWidget(Qt::LeftDockWidgetArea, m_bookmarksPanel);
- rApp->bookmarkProvider()->registerBookmarkPanel(m_bookmarksPanel);
+ rApp->bookmarkManager()->registerBookmarkPanel(m_bookmarksPanel);
// setup bookmarks panel action
a = (KAction *) m_bookmarksPanel->toggleViewAction();