diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
| commit | 4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a (patch) | |
| tree | 151d078b89a94ea10142c0979db8306119ad6865 /src/bookmarks/bookmarkscontextmenu.cpp | |
| parent | Let suggestions work also without search engines ones. (diff) | |
| parent | Bug when a bookmark contains a '&' fixed in some cases (diff) | |
| download | rekonq-4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a.tar.xz | |
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/bookmarks/bookmarkscontextmenu.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index 93df6ce3..a55f7777 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -38,30 +38,25 @@ BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, KBookmarkM } -BookmarksContextMenu::~BookmarksContextMenu() -{ -} - - void BookmarksContextMenu::addBookmarkActions() { - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::OPEN_IN_TAB)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::OPEN_IN_WINDOW)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::OPEN_IN_TAB)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::OPEN_IN_WINDOW)); addSeparator(); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_FOLDER)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_SEPARATOR)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_FOLDER)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_SEPARATOR)); addSeparator(); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::COPY)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::COPY)); addSeparator(); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::EDIT)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::DELETE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::EDIT)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::DELETE)); } @@ -80,39 +75,39 @@ void BookmarksContextMenu::addFolderActions() if (!child.isNull()) { - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::OPEN_FOLDER)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::OPEN_FOLDER)); addSeparator(); } } - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_FOLDER)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_SEPARATOR)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_FOLDER)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_SEPARATOR)); addSeparator(); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::EDIT)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::DELETE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::EDIT)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::DELETE)); } void BookmarksContextMenu::addSeparatorActions() { - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_FOLDER)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_SEPARATOR)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_FOLDER)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_SEPARATOR)); addSeparator(); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::DELETE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::DELETE)); } void BookmarksContextMenu::addNullActions() { - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_FOLDER)); - addAction(m_bmOwner->action(bookmark(), BookmarkOwner::NEW_SEPARATOR)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_FOLDER)); + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_SEPARATOR)); } |