Rebase fix

3 files changed, 3 insertions, 3 deletions

diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 56793248..1c184055 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -547,7 +547,7 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event)
             {
                 if (mouseEvent->button() == Qt::MidButton)
                 {
-                    rApp->bookmarkProvider()->bookmarkOwner()->openBookmarkFolder(action->bookmark());
+                    rApp->bookmarkManager()->owner()->openBookmarkFolder(action->bookmark());
                 }
                 else if (distance < QApplication::startDragDistance())
                 {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b1556ed5..d02f75f5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -259,7 +259,7 @@ void MainWindow::initBookmarkBar()
         delete m_bookmarksBar;
     }
     m_bookmarksBar = new BookmarkToolBar(XMLGUIBkBar, this);
-    rApp->bookmarkProvider()->registerBookmarkBar(m_bookmarksBar);
+    rApp->bookmarkManager()->registerBookmarkBar(m_bookmarksBar);
 
     QAction *a = actionByName(QL1S("show_bookmarks_toolbar"));
     a->setChecked(XMLGUIBkBar->isVisible());
diff --git a/src/webview.cpp b/src/webview.cpp
index 012f77eb..096b412d 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -370,7 +370,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     }
     else
     {
-        a = rApp->bookmarkProvider()->actionByName("rekonq_add_bookmark");
+        a = rApp->bookmarkManager()->actionByName("rekonq_add_bookmark");
         menu.addAction(a);
     }
     menu.addAction(sendByMailAction);