From b111a11cb46bfd572c2fed9c67d648bcff10a3ce Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Nov 2011 18:49:04 +0100
Subject: BookmarkProvider --> BookmarkManager

We have 7 managers and 1 provider... finally fixing this strange
thing!
---
 src/webview.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/webview.cpp')

diff --git a/src/webview.cpp b/src/webview.cpp
index e524ae24..012f77eb 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -34,8 +34,7 @@
 
 // Local Includes
 #include "application.h"
-#include "bookmarkprovider.h"
-#include "bookmarkowner.h"
+#include "bookmarkmanager.h"
 #include "iconmanager.h"
 #include "mainview.h"
 #include "mainwindow.h"
@@ -117,6 +116,7 @@ WebView::~WebView()
     preview.save(path);
 }
 
+
 void WebView::changeWindowIcon()
 {
     if (ReKonfig::useFavicon())
@@ -130,6 +130,7 @@ void WebView::changeWindowIcon()
     }
 }
 
+
 WebPage *WebView::page()
 {
     WebPage *const page = qobject_cast<WebPage *>(KWebView::page());
@@ -483,10 +484,10 @@ void WebView::dropEvent(QDropEvent *event)
     if (event->mimeData()->hasFormat("application/rekonq-bookmark"))
     {
         QByteArray addresses = event->mimeData()->data("application/rekonq-bookmark");
-        KBookmark bookmark =  rApp->bookmarkProvider()->bookmarkManager()->findByAddress(QString::fromLatin1(addresses.data()));
+        KBookmark bookmark =  rApp->bookmarkManager()->findByAddress(QString::fromLatin1(addresses.data()));
         if (bookmark.isGroup())
         {
-            rApp->bookmarkProvider()->bookmarkOwner()->openFolderinTabs(bookmark.toGroup());
+            rApp->bookmarkManager()->openFolderinTabs(bookmark.toGroup());
         }
         else
         {
@@ -603,8 +604,8 @@ void WebView::bookmarkLink()
     KAction *a = qobject_cast<KAction*>(sender());
     KUrl url(a->data().toUrl());
 
-    rApp->bookmarkProvider()->rootGroup().addBookmark(url.prettyUrl(), url);
-    rApp->bookmarkProvider()->bookmarkManager()->emitChanged();
+    rApp->bookmarkManager()->rootGroup().addBookmark(url.prettyUrl(), url);
+    rApp->bookmarkManager()->emitChanged();
 }
 
 
-- 
cgit v1.2.1