Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index fccd6059ffb032440db6d6f09d902a5dc62ac5b2..27ad19924ccfb4e598a3e9be1378a04523aa5ee8 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -286,8 +286,9 @@ void DolphinContextMenu::openItemContextMenu()
 
     // insert 'Copy To' and 'Move To' sub menus
     if (GeneralSettings::showCopyMoveMenu()) {
 
     // 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.setReadOnly(!selectedItemsProps.supportsWriting());

+        m_copyToMenu.setAutoErrorHandlingEnabled(true);

         m_copyToMenu.addActionsTo(this);
     }
 
         m_copyToMenu.addActionsTo(this);
     }
 


@@ -523,17 +524,13 @@ void DolphinContextMenu::addVersionControlPluginActions()
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
     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()
 {
         addSeparator();
     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {

-    foreach (QAction* action, m_customActions) {
-        addAction(action);
-    }
+    addActions(m_customActions);

 }
 
 }