Merge remote-tracking branch 'origin/master' into kf6

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 4dc54946f6f869586de4f9cb3f6ae9fdb2257b0c..34d2102ef0e83df6e5a90fb3fc09cf105c11436b 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,7 +27,6 @@
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KStandardAction>
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KStandardAction>

-#include <kio_version.h>

 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>


@@ -138,7 +137,7 @@ void DolphinContextMenu::addTrashItemContextMenu()
     addAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), [this]() {
         QList<QUrl> selectedUrls;
         selectedUrls.reserve(m_selectedItems.count());
     addAction(QIcon::fromTheme("restoration"), i18nc("@action:inmenu", "Restore"), [this]() {
         QList<QUrl> selectedUrls;
         selectedUrls.reserve(m_selectedItems.count());

-        for (const KFileItem &item : qAsConst(m_selectedItems)) {
+        for (const KFileItem &item : std::as_const(m_selectedItems)) {

             selectedUrls.append(item.url());
         }
 
             selectedUrls.append(item.url());
         }
 


@@ -173,7 +172,7 @@ void DolphinContextMenu::addDirectoryItemContextMenu()
     addOpenWithActions();
 
     // set up 'Create New' menu
     addOpenWithActions();
 
     // set up 'Create New' menu

-    DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
+    DolphinNewFileMenu *newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection()->action(QStringLiteral("create_dir")), m_mainWindow);

     newFileMenu->checkUpToDate();
     newFileMenu->setWorkingDirectory(m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
     newFileMenu->checkUpToDate();
     newFileMenu->setWorkingDirectory(m_fileInfo.url());
     newFileMenu->setEnabled(selectedItemsProps.supportsWriting());


@@ -236,7 +235,7 @@ void DolphinContextMenu::addItemContextMenu()
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;
     } else {
         // multiple files
         bool selectionHasOnlyDirs = true;

-        for (const auto &item : qAsConst(m_selectedItems)) {
+        for (const auto &item : std::as_const(m_selectedItems)) {

             const QUrl &url = DolphinView::openItemAsFolderUrl(item);
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
             const QUrl &url = DolphinView::openItemAsFolderUrl(item);
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;