summaryrefslogtreecommitdiff
path: root/src/bookmarks/bookmarkowner.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-01-17 19:05:20 +0100
committerAndrea Diamantini <adjam7@gmail.com>2013-01-17 19:05:20 +0100
commit45f75ad2e9e9fffc730d2a99889be21fac9907e3 (patch)
treecc2296e85e1610967ace1b89fc689ace6bb9bc23 /src/bookmarks/bookmarkowner.cpp
parentfix url icon when dragging from bk toolbar. (diff)
downloadrekonq-45f75ad2e9e9fffc730d2a99889be21fac9907e3.tar.xz
Clean up BookmarkOwner API, restore bk middle click action
BUG: 313127
Diffstat (limited to 'src/bookmarks/bookmarkowner.cpp')
-rw-r--r--src/bookmarks/bookmarkowner.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index ba2d8f63..f1f0aefb 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -71,16 +71,16 @@ KAction* BookmarkOwner::createAction(const KBookmark &bookmark, const BookmarkAc
{
case OPEN:
return createAction(i18n("Open"), "tab-new",
- i18n("Open bookmark in current tab"), SLOT(openBookmark(KBookmark)), bookmark);
+ i18n("Open bookmark in current tab"), SLOT(loadBookmark(KBookmark)), bookmark);
case OPEN_IN_TAB:
return createAction(i18n("Open in New Tab"), "tab-new",
- i18n("Open bookmark in new tab"), SLOT(openBookmarkInNewTab(KBookmark)), bookmark);
+ i18n("Open bookmark in new tab"), SLOT(loadBookmarkInNewTab(KBookmark)), bookmark);
case OPEN_IN_WINDOW:
return createAction(i18n("Open in New Window"), "window-new",
- i18n("Open bookmark in new window"), SLOT(openBookmarkInNewWindow(KBookmark)), bookmark);
+ i18n("Open bookmark in new window"), SLOT(loadBookmarkInNewWindow(KBookmark)), bookmark);
case OPEN_FOLDER:
return createAction(i18n("Open Folder in Tabs"), "tab-new",
- i18n("Open all the bookmarks in folder in tabs"), SLOT(openBookmarkFolder(KBookmark)), bookmark);
+ i18n("Open all the bookmarks in folder in tabs"), SLOT(loadBookmarkFolder(KBookmark)), bookmark);
case BOOKMARK_PAGE:
return createAction(i18n("Add Bookmark"), "bookmark-new",
i18n("Bookmark current page"), SLOT(bookmarkCurrentPage(KBookmark)), bookmark);
@@ -152,9 +152,9 @@ void BookmarkOwner::openBookmark(const KBookmark &bookmark,
Qt::KeyboardModifiers keyboardModifiers)
{
if (keyboardModifiers & Qt::ControlModifier || mouseButtons & Qt::MidButton)
- openBookmarkInNewTab(bookmark);
+ loadBookmarkInNewTab(bookmark);
else
- openBookmark(bookmark);
+ loadBookmark(bookmark);
}
@@ -181,25 +181,25 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bkGoup)
}
-void BookmarkOwner::openBookmark(const KBookmark &bookmark)
+void BookmarkOwner::loadBookmark(const KBookmark &bookmark)
{
emit openUrl(bookmark.url(), Rekonq::CurrentTab);
}
-void BookmarkOwner::openBookmarkInNewTab(const KBookmark &bookmark)
+void BookmarkOwner::loadBookmarkInNewTab(const KBookmark &bookmark)
{
emit openUrl(bookmark.url(), Rekonq::NewTab);
}
-void BookmarkOwner::openBookmarkInNewWindow(const KBookmark &bookmark)
+void BookmarkOwner::loadBookmarkInNewWindow(const KBookmark &bookmark)
{
emit openUrl(bookmark.url(), Rekonq::NewWindow);
}
-void BookmarkOwner::openBookmarkFolder(const KBookmark &bookmark)
+void BookmarkOwner::loadBookmarkFolder(const KBookmark &bookmark)
{
Q_ASSERT(bookmark.isGroup());
openFolderinTabs(bookmark.toGroup());