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/bookmarks/bookmarkscontextmenu.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/bookmarks/bookmarkscontextmenu.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index 735e3412..355a6d7f 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -29,14 +29,19 @@ // Local Includes #include "bookmarkowner.h" -#include "bookmarkprovider.h" +#include "bookmarkmanager.h" #include "application.h" // KDE Includes #include <KBookmarkManager> -BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, KBookmarkManager *manager, BookmarkOwner *owner, bool nullForced, QWidget *parent) +BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, + KBookmarkManager *manager, + BookmarkOwner *owner, + bool nullForced, + QWidget *parent + ) : KBookmarkContextMenu(bookmark, manager, owner, parent) , m_bmOwner(owner) , m_nullForced(nullForced) @@ -120,8 +125,8 @@ void BookmarksContextMenu::addSeparatorActions() void BookmarksContextMenu::addNullActions() { - KBookmarkManager *manager = rApp->bookmarkProvider()->bookmarkManager(); - if (manager->toolbar().hasParent()) + KBookmarkManager *mngr = rApp->bookmarkManager()->manager(); + if (mngr->toolbar().hasParent()) { addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::UNSET_TOOLBAR_FOLDER)); } |