diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2011-11-14 18:49:04 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2011-12-12 16:40:28 +0100 |
commit | b111a11cb46bfd572c2fed9c67d648bcff10a3ce (patch) | |
tree | a5a12a0ac980f6af2fe245d8cdd8575dd8e95601 /src/urlbar/urlbar.cpp | |
parent | let history, bookmarks and passwords sync on change (first bits) (diff) | |
download | rekonq-b111a11cb46bfd572c2fed9c67d648bcff10a3ce.tar.xz |
BookmarkProvider --> BookmarkManager
We have 7 managers and 1 provider... finally fixing this strange
thing!
Diffstat (limited to 'src/urlbar/urlbar.cpp')
-rw-r--r-- | src/urlbar/urlbar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 9460cf8a..e95c5c33 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -41,7 +41,7 @@ #include "webpage.h" #include "webview.h" #include "completionwidget.h" -#include "bookmarkprovider.h" +#include "bookmarkmanager.h" #include "bookmarkowner.h" #include "bookmarkwidget.h" #include "iconmanager.h" @@ -397,11 +397,11 @@ void UrlBar::showBookmarkInfo(QPoint pos) if (_tab->url().scheme() == QL1S("about")) return; - KBookmark bookmark = rApp->bookmarkProvider()->bookmarkForUrl(_tab->url()); + KBookmark bookmark = rApp->bookmarkManager()->bookmarkForUrl(_tab->url()); if (bookmark.isNull()) { - bookmark = rApp->bookmarkProvider()->bookmarkOwner()->bookmarkCurrentPage(); + bookmark = rApp->bookmarkManager()->owner()->bookmarkCurrentPage(); updateRightIcons(); } else @@ -549,7 +549,7 @@ IconButton *UrlBar::addRightIcon(UrlBar::icon ic) rightIcon->setToolTip(i18n("Show SSL Info")); break; case UrlBar::BK: - if (rApp->bookmarkProvider()->bookmarkForUrl(_tab->url()).isNull()) + if (rApp->bookmarkManager()->bookmarkForUrl(_tab->url()).isNull()) { rightIcon->setIcon(KIcon("bookmarks").pixmap(32, 32, QIcon::Disabled)); rightIcon->setToolTip(i18n("Bookmark this page")); @@ -678,7 +678,7 @@ void UrlBar::bookmarkContextMenu(QPoint pos) KMenu menu(this); QAction *qa; - if (!rApp->bookmarkProvider()->bookmarkForUrl(_tab->url()).isNull()) + if (!rApp->bookmarkManager()->bookmarkForUrl(_tab->url()).isNull()) { qa = new KAction(KIcon("bookmarks"), i18n("Edit Bookmark"), this); connect(qa, SIGNAL(triggered(bool)), this, SLOT(showBookmarkDialog())); |