Fix a QDateTime porting bug (different format expressions) in KFileItemModel::dateRol...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index c227be6d8fb574960e7db205f6ab0d7070d6dd63..27ad19924ccfb4e598a3e9be1378a04523aa5ee8 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -37,7 +37,6 @@
 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
-#include <konq_operations.h>
 #include <KService>
 #include <KLocalizedString>
 #include <KStandardAction>
@@ -287,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);
     }
 
@@ -524,17 +524,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);
 }