summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bookmarks/bookmarkowner.cpp2
-rw-r--r--src/bookmarks/bookmarkowner.h4
-rw-r--r--src/bookmarks/bookmarkscontextmenu.cpp42
-rw-r--r--src/bookmarks/bookmarkstoolbar.cpp2
4 files changed, 25 insertions, 25 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index 820e01b5..962d1c84 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -55,7 +55,7 @@ BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent)
}
-KAction* BookmarkOwner::action(const KBookmark &bookmark, const BookmarkAction &bmAction)
+KAction* BookmarkOwner::createAction(const KBookmark &bookmark, const BookmarkAction &bmAction)
{
switch (bmAction)
{
diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h
index cbd4bd0e..c291bf2a 100644
--- a/src/bookmarks/bookmarkowner.h
+++ b/src/bookmarks/bookmarkowner.h
@@ -66,9 +66,9 @@ public:
};
/**
- * @return the action connected to the bookmark or 0 if it doesn't exist.
+ * @return A new action for the given bookmark.
*/
- KAction* action(const KBookmark &bookmark, const BookmarkAction &bmAction);
+ KAction* createAction(const KBookmark &bookmark, const BookmarkAction &bmAction);
// @{
/**
diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp
index 93df6ce3..6e6fa830 100644
--- a/src/bookmarks/bookmarkscontextmenu.cpp
+++ b/src/bookmarks/bookmarkscontextmenu.cpp
@@ -45,23 +45,23 @@ 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 +80,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));
}
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 4449d926..c5ece026 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -139,7 +139,7 @@ void BookmarkMenu::addOpenFolderInTabs()
if (!bookmark.isNull())
{
- parentMenu()->addAction(Application::bookmarkProvider()->bookmarkOwner()->action(group, BookmarkOwner::OPEN_FOLDER));
+ parentMenu()->addAction(Application::bookmarkProvider()->bookmarkOwner()->createAction(group, BookmarkOwner::OPEN_FOLDER));
}
}
}