X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3e14a97a0f139a07e7fe3f6dcdb3b6ee689aa214..5ce01c864f4ab9848a54ee982f6ac18e63f04773:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 0ecd7376d..af283cf00 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,8 +27,7 @@
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
-#include <kfileitemactionplugin.h>
-#include <kabstractfileitemactionplugin.h>
+#include <KAbstractFileItemActionPlugin>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KIO/RestoreJob>
@@ -38,7 +37,6 @@
 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
-#include <konq_operations.h>
 #include <KService>
 #include <KLocalizedString>
 #include <KStandardAction>
@@ -288,8 +286,9 @@ void DolphinContextMenu::openItemContextMenu()
 
     // insert 'Copy To' and 'Move To' sub menus
     if (GeneralSettings::showCopyMoveMenu()) {
-        m_copyToMenu.setItems(m_selectedItems);
+        m_copyToMenu.setUrls(m_selectedItems.urlList());
         m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting());
+        m_copyToMenu.setAutoErrorHandlingEnabled(true);
         m_copyToMenu.addActionsTo(this);
     }
 
@@ -306,6 +305,7 @@ void DolphinContextMenu::openItemContextMenu()
                 const QString text = selectedUrl.fileName();
                 PlacesItem* item = model.createPlacesItem(text, selectedUrl);
                 model.appendItemToGroup(item);
+                model.saveBookmarks();
             }
         } else if (activatedAction == openParentAction) {
             m_command = OpenParentFolder;
@@ -371,6 +371,7 @@ void DolphinContextMenu::openViewportContextMenu()
             PlacesItem* item = model.createPlacesItem(container->placesText(),
                                                       container->url());
             model.appendItemToGroup(item);
+            model.saveBookmarks();
         }
     }
 }
@@ -468,7 +469,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {
-        m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+        m_baseFileItem = new KFileItem(m_baseUrl);
     }
     return *m_baseFileItem;
 }
@@ -512,13 +513,6 @@ void DolphinContextMenu::addFileItemPluginActions()
             continue;
         }
 
-        // Old API (kdelibs-4.6.0 only)
-        KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
-        if (plugin) {
-            plugin->setParent(this);
-            addActions(plugin->actions(props, m_mainWindow));
-        }
-        // New API (kdelibs >= 4.6.1)
         KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
         if (abstractPlugin) {
             abstractPlugin->setParent(this);
@@ -532,17 +526,13 @@ void DolphinContextMenu::addVersionControlPluginActions()
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
-        foreach (QAction* action, versionControlActions) {
-            addAction(action);
-        }
+        addActions(versionControlActions);
         addSeparator();
     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {
-    foreach (QAction* action, m_customActions) {
-        addAction(action);
-    }
+    addActions(m_customActions);
 }