X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/86df5ae994e96483559020befd96b838aee4d3ee..1d04d04cf301e82971d90cceb541f368192e2167:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0f10a7769..575c30417 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -16,23 +16,24 @@
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"
 
-#include <KPluginMetaData>
 #include <KActionCollection>
 #include <KAuthorized>
 #include <KConfigGroup>
 #include <KDialogJobUiDelegate>
 #include <KDirLister>
 #include <KFileItemListProperties>
+#include <KIO/CommandLauncherJob>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KMimeTypeEditor>
-#include <KNS3/KMoreToolsMenuFactory>
+#include <KMoreToolsMenuFactory>
 #include <KPluginFactory>
-#include <KIO/CommandLauncherJob>
+#include <KPluginMetaData>
 #include <KSharedConfig>
 #include <KTerminalLauncherJob>
+#include <kio_version.h>
 
 #include <QActionGroup>
 #include <QApplication>
@@ -109,7 +110,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent,
     connect(m_view, &DolphinView::itemCountChanged, this, &DolphinPart::updateStatusBar);
     connect(m_view,  &DolphinView::selectionChanged, this, &DolphinPart::updateStatusBar);
 
-    m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+    m_actionHandler = new DolphinViewActionHandler(actionCollection(), nullptr, this);
     m_actionHandler->setCurrentView(m_view);
     connect(m_actionHandler, &DolphinViewActionHandler::createDirectoryTriggered, this, &DolphinPart::createDirectory);
 
@@ -589,7 +590,11 @@ void DolphinPart::updateNewMenu()
     // As requested by KNewFileMenu :
     m_newFileMenu->checkUpToDate();
     // And set the files that the menu apply on :
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(url());
+#else
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
+#endif
 }
 
 void DolphinPart::updateStatusBar()
@@ -604,7 +609,11 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 97, 0)
+    m_newFileMenu->setWorkingDirectory(url());
+#else
     m_newFileMenu->setPopupFiles(QList<QUrl>() << url());
+#endif
     m_newFileMenu->createDirectory();
 }