DolphinView: rename copySelectedItems to copySelectedItemsToClipboard

[dolphin.git] / src / dolphinbookmarkhandler.cpp

diff --git a/src/dolphinbookmarkhandler.cpp b/src/dolphinbookmarkhandler.cpp
index bb8f641ec091a13b3e99df0b61a8c78dc6dc0191..0d31b8984d56a76af46840027a8f70fb427f7593 100644 (file)
--- a/src/dolphinbookmarkhandler.cpp
+++ b/src/dolphinbookmarkhandler.cpp
@@ -21,6 +21,7 @@
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 #include "global.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 #include "global.h"

+#include <KActionCollection>

 #include <KBookmarkMenu>
 #include <KIO/Global>
 #include <QDebug>
 #include <KBookmarkMenu>
 #include <KIO/Global>
 #include <QDebug>


@@ -47,16 +48,15 @@ DolphinBookmarkHandler::DolphinBookmarkHandler(DolphinMainWindow *mainWindow,
     }
     m_bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile, QStringLiteral("dolphin"));
     m_bookmarkManager->setUpdate(true);
     }
     m_bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile, QStringLiteral("dolphin"));
     m_bookmarkManager->setUpdate(true);

-    m_bookmarkMenu.reset(new KBookmarkMenu(m_bookmarkManager, this, menu, collection));
-}
+    m_bookmarkMenu.reset(new KBookmarkMenu(m_bookmarkManager, this, menu));

 
 

-DolphinBookmarkHandler::~DolphinBookmarkHandler()
-{
+    collection->addAction(QStringLiteral("add_bookmark"), m_bookmarkMenu->addBookmarkAction());
+    collection->addAction(QStringLiteral("edit_bookmarks"), m_bookmarkMenu->editBookmarksAction());
+    collection->addAction(QStringLiteral("add_bookmarks_list"), m_bookmarkMenu->bookmarkTabsAsFolderAction());

 }
 
 }
 

-void DolphinBookmarkHandler::fillControlMenu(QMenu* menu, KActionCollection* collection)
+DolphinBookmarkHandler::~DolphinBookmarkHandler()

 {
 {

-    m_bookmarkControlMenu.reset(new KBookmarkMenu(m_bookmarkManager, this, menu, collection));

 }
 
 QString DolphinBookmarkHandler::currentTitle() const
 }
 
 QString DolphinBookmarkHandler::currentTitle() const