X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7a593fc92bf28fbdcdec0e241e18ee8ba2ad7334..fc4315d57e8fe64d05aad2a1c24800f0149b21da:/src/panels/folders/treeviewcontextmenu.cpp

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 83ffa87a7..ff0801d1a 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -24,6 +24,9 @@
 #include <KIconLoader>
 #include <KIO/DeleteJob>
 #include <KMenu>
+#include <KIcon>
+#include <KSharedConfig>
+#include <KConfigGroup>
 #include <konqmimedata.h>
 #include <KFileItemListProperties>
 #include <konq_operations.h>
@@ -34,6 +37,7 @@
 
 #include <QApplication>
 #include <QClipboard>
+#include <QMimeData>
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
@@ -57,14 +61,14 @@ void TreeViewContextMenu::open()
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());
-        connect(cutAction, SIGNAL(triggered()), this, SLOT(cut()));
+        connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);
 
         QAction* copyAction = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
-        connect(copyAction, SIGNAL(triggered()), this, SLOT(copy()));
+        connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);
 
         const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileItem.url());
         QAction* pasteAction = new QAction(KIcon("edit-paste"), pasteInfo.second, this);
-        connect(pasteAction, SIGNAL(triggered()), this, SLOT(paste()));
+        connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);
         pasteAction->setEnabled(pasteInfo.first);
 
         popup->addAction(cutAction);
@@ -76,7 +80,7 @@ void TreeViewContextMenu::open()
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         renameAction->setIcon(KIcon("edit-rename"));
-        connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
+        connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
@@ -90,7 +94,7 @@ void TreeViewContextMenu::open()
                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);
-            connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
+            connect(moveToTrashAction, &QAction::triggered, this, &TreeViewContextMenu::moveToTrash);
             popup->addAction(moveToTrashAction);
         } else {
             showDeleteCommand = true;
@@ -99,7 +103,7 @@ void TreeViewContextMenu::open()
         if (showDeleteCommand) {
             QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());
-            connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
+            connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);
             popup->addAction(deleteAction);
         }
 
@@ -111,7 +115,7 @@ void TreeViewContextMenu::open()
     showHiddenFilesAction->setCheckable(true);
     showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
     popup->addAction(showHiddenFilesAction);
-    connect(showHiddenFilesAction, SIGNAL(toggled(bool)), this, SLOT(setShowHiddenFiles(bool)));
+    connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);
 
     // insert 'Automatic Scrolling'
     QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
@@ -120,13 +124,13 @@ void TreeViewContextMenu::open()
     // TODO: Temporary disabled. Horizontal autoscrolling will be implemented later either
     // in KItemViews or manually as part of the FoldersPanel
     //popup->addAction(autoScrollingAction);
-    connect(autoScrollingAction, SIGNAL(toggled(bool)), this, SLOT(setAutoScrolling(bool)));
+    connect(autoScrollingAction, &QAction::toggled, this, &TreeViewContextMenu::setAutoScrolling);
 
     if (!m_fileItem.isNull()) {
         // insert 'Properties' entry
         QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
         propertiesAction->setIcon(KIcon("document-properties"));
-        connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
+        connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);
         popup->addAction(propertiesAction);
     }
 
@@ -181,12 +185,12 @@ void TreeViewContextMenu::rename()
 
 void TreeViewContextMenu::moveToTrash()
 {
-    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileItem.url());
+    KonqOperations::del(m_parent, KonqOperations::TRASH, KUrl::List() << m_fileItem.url());
 }
 
 void TreeViewContextMenu::deleteItem()
 {
-    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileItem.url());
+    KonqOperations::del(m_parent, KonqOperations::DEL, KUrl::List() << m_fileItem.url());
 }
 
 void TreeViewContextMenu::showProperties()
@@ -206,4 +210,3 @@ void TreeViewContextMenu::setAutoScrolling(bool enable)
     m_parent->setAutoScrolling(enable);
 }
 
-#include "treeviewcontextmenu.moc"