Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0d28f3f1ad2a462b39919b06eab33807720272c4..c8bc8b647d526c3bb94ed671188b42b694674cae 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -21,30 +21,24 @@
 #include "dolphinremoveaction.h"
 
 #include <KFileItemListProperties>
 #include "dolphinremoveaction.h"
 
 #include <KFileItemListProperties>

-#include <konq_operations.h>

 
 #include <KAboutData>
 #include <KActionCollection>
 
 #include <KAboutData>
 #include <KActionCollection>

-#include <KConfigGroup>
-#include <KDebug>
-#include <KGlobalSettings>
+#include "dolphindebug.h"

 #include <KIconLoader>
 #include <KIconLoader>

-#include <KLocale>
+#include <KLocalizedString>

 #include <KMessageBox>
 #include <KPluginFactory>
 #include <KRun>
 #include <KMessageBox>
 #include <KPluginFactory>
 #include <KRun>

-#include <KToggleAction>
-#include <KGlobal>
-#include <KIO/NetAccess>

 #include <KToolInvocation>
 #include <KToolInvocation>

-#include <kauthorized.h>
-#include <KMenu>
-#include <KInputDialog>
-#include <KProtocolInfo>
-#include <kdeversion.h>
+#include <KAuthorized>
+#include <QMenu>
+#include <KSharedConfig>
+#include <KConfigGroup>
+#include <KMimeTypeEditor>
+#include <KJobWidgets>

 
 #include "dolphinpart_ext.h"
 
 #include "dolphinpart_ext.h"

-

 #include "dolphinnewfilemenu.h"
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"
 #include "dolphinnewfilemenu.h"
 #include "views/dolphinview.h"
 #include "views/dolphinviewactionhandler.h"


@@ -53,29 +47,30 @@
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodeldirlister.h"
 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodeldirlister.h"
 

+#include <QStandardPaths>

 #include <QActionGroup>
 #include <QActionGroup>

+#include <QTextDocument>

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

-#include <QTextDocument>
+#include <QKeyEvent>
+#include <QInputDialog>

 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)

-K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))

 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)

-      ,m_openTerminalAction(0)
-      ,m_removeAction(0)
+      ,m_openTerminalAction(nullptr)
+      ,m_removeAction(nullptr)

 {
     Q_UNUSED(args)
 {
     Q_UNUSED(args)

-#pragma message("TODO: port to KF5")
-    //setComponentData(DolphinPartFactory::componentData(), false);
+    setComponentData(*createAboutData(), false);

     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons

-    KIconLoader::global()->addAppDir("dolphin");
+    KIconLoader::global()->addAppDir(QStringLiteral("dolphin"));

 
 

-    m_view = new DolphinView(KUrl(), parentWidget);
+    m_view = new DolphinView(QUrl(), parentWidget);

     m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 
     m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 


@@ -83,10 +78,11 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, &DolphinPart::slotErrorMessage);
 
     connect(m_view, &DolphinView::directoryLoadingCompleted, this, static_cast<void(DolphinPart::*)()>(&DolphinPart::completed));
             this, &DolphinPart::slotErrorMessage);
 
     connect(m_view, &DolphinView::directoryLoadingCompleted, this, static_cast<void(DolphinPart::*)()>(&DolphinPart::completed));

+    connect(m_view, &DolphinView::directoryLoadingCompleted, this, &DolphinPart::updatePasteAction);

     connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinPart::updateProgress);
     connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage);
 
     connect(m_view, &DolphinView::directoryLoadingProgress, this, &DolphinPart::updateProgress);
     connect(m_view, &DolphinView::errorMessage, this, &DolphinPart::slotErrorMessage);
 

-    setXMLFile("dolphinpart.rc");
+    setXMLFile(QStringLiteral("dolphinpart.rc"));

 
     connect(m_view, &DolphinView::infoMessage,
             this, &DolphinPart::slotMessage);
 
     connect(m_view, &DolphinView::infoMessage,
             this, &DolphinPart::slotMessage);


@@ -142,7 +138,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
         connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems);
         connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted);
     } else {
         connect(lister, &KDirLister::newItems, notifyExt, &DolphinPartListingNotificationExtension::slotNewItems);
         connect(lister, &KDirLister::itemsDeleted, notifyExt, &DolphinPartListingNotificationExtension::slotItemsDeleted);
     } else {

-        kWarning() << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported";
+        qCWarning(DolphinDebug) << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported";

     }
 
     createActions();
     }
 
     createActions();


@@ -172,26 +168,26 @@ void DolphinPart::createActions()
     connect(m_newFileMenu->menu(), &QMenu::aboutToShow,
             this, &DolphinPart::updateNewMenu);
 
     connect(m_newFileMenu->menu(), &QMenu::aboutToShow,
             this, &DolphinPart::updateNewMenu);
 

-    QAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
+    QAction *editMimeTypeAction = actionCollection()->addAction( QStringLiteral("editMimeType") );

     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, &QAction::triggered, this, &DolphinPart::slotEditMimeType);
 
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, &QAction::triggered, this, &DolphinPart::slotEditMimeType);
 

-    QAction* selectItemsMatching = actionCollection()->addAction("select_items_matching");
+    QAction* selectItemsMatching = actionCollection()->addAction(QStringLiteral("select_items_matching"));

     selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching..."));
     actionCollection()->setDefaultShortcut(selectItemsMatching, Qt::CTRL | Qt::Key_S);
     connect(selectItemsMatching, &QAction::triggered, this, &DolphinPart::slotSelectItemsMatchingPattern);
 
     selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching..."));
     actionCollection()->setDefaultShortcut(selectItemsMatching, Qt::CTRL | Qt::Key_S);
     connect(selectItemsMatching, &QAction::triggered, this, &DolphinPart::slotSelectItemsMatchingPattern);
 

-    QAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching");
+    QAction* unselectItemsMatching = actionCollection()->addAction(QStringLiteral("unselect_items_matching"));

     unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching..."));
     connect(unselectItemsMatching, &QAction::triggered, this, &DolphinPart::slotUnselectItemsMatchingPattern);
 
     unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching..."));
     connect(unselectItemsMatching, &QAction::triggered, this, &DolphinPart::slotUnselectItemsMatchingPattern);
 

-    actionCollection()->addAction(KStandardAction::SelectAll, "select_all", m_view, SLOT(selectAll()));
+    actionCollection()->addAction(KStandardAction::SelectAll, QStringLiteral("select_all"), m_view, SLOT(selectAll()));

 
 

-    QAction* unselectAll = actionCollection()->addAction("unselect_all");
+    QAction* unselectAll = actionCollection()->addAction(QStringLiteral("unselect_all"));

     unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All"));
     connect(unselectAll, &QAction::triggered, m_view, &DolphinView::clearSelection);
 
     unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All"));
     connect(unselectAll, &QAction::triggered, m_view, &DolphinView::clearSelection);
 

-    QAction* invertSelection = actionCollection()->addAction("invert_selection");
+    QAction* invertSelection = actionCollection()->addAction(QStringLiteral("invert_selection"));

     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, &QAction::triggered, m_view, &DolphinView::invertSelection);
     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, &QAction::triggered, m_view, &DolphinView::invertSelection);


@@ -205,31 +201,31 @@ void DolphinPart::createActions()
             this, &DolphinPart::slotGoTriggered);
 
     createGoAction("go_applications", "start-here-kde",
             this, &DolphinPart::slotGoTriggered);
 
     createGoAction("go_applications", "start-here-kde",

-                   i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"),
+                   i18nc("@action:inmenu Go", "App&lications"), QStringLiteral("programs:/"),

                    goActionGroup);
     createGoAction("go_network_folders", "folder-remote",
                    goActionGroup);
     createGoAction("go_network_folders", "folder-remote",

-                   i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"),
+                   i18nc("@action:inmenu Go", "&Network Folders"), QStringLiteral("remote:/"),

                    goActionGroup);
     createGoAction("go_settings", "preferences-system",
                    goActionGroup);
     createGoAction("go_settings", "preferences-system",

-                   i18nc("@action:inmenu Go", "Sett&ings"), QString("settings:/"),
+                   i18nc("@action:inmenu Go", "Sett&ings"), QStringLiteral("settings:/"),

                    goActionGroup);
     createGoAction("go_trash", "user-trash",
                    goActionGroup);
     createGoAction("go_trash", "user-trash",

-                   i18nc("@action:inmenu Go", "Trash"), QString("trash:/"),
+                   i18nc("@action:inmenu Go", "Trash"), QStringLiteral("trash:/"),

                    goActionGroup);
     createGoAction("go_autostart", "",
                    i18nc("@action:inmenu Go", "Autostart"), QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart",
                    goActionGroup);
 
     // Tools menu
                    goActionGroup);
     createGoAction("go_autostart", "",
                    i18nc("@action:inmenu Go", "Autostart"), QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart",
                    goActionGroup);
 
     // Tools menu

-    m_findFileAction = actionCollection()->addAction("find_file");
+    m_findFileAction = actionCollection()->addAction(QStringLiteral("find_file"));

     m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File..."));
     actionCollection()->setDefaultShortcut(m_findFileAction, Qt::CTRL | Qt::Key_F);
     m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File..."));
     actionCollection()->setDefaultShortcut(m_findFileAction, Qt::CTRL | Qt::Key_F);

-    m_findFileAction->setIcon(QIcon::fromTheme("edit-find"));
+    m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));

     connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile);
 
     connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile);
 

-    if (KAuthorized::authorizeKAction("shell_access")) {
-        m_openTerminalAction = actionCollection()->addAction("open_terminal");
-        m_openTerminalAction->setIcon(QIcon::fromTheme("utilities-terminal"));
+    if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
+        m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal"));
+        m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));

         m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
         connect(m_openTerminalAction, &QAction::triggered, this, &DolphinPart::slotOpenTerminal);
         actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4);
         m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
         connect(m_openTerminalAction, &QAction::triggered, this, &DolphinPart::slotOpenTerminal);
         actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4);


@@ -250,29 +246,29 @@ void DolphinPart::createGoAction(const char* name, const char* iconName,
 void DolphinPart::slotGoTriggered(QAction* action)
 {
     const QString url = action->data().toString();
 void DolphinPart::slotGoTriggered(QAction* action)
 {
     const QString url = action->data().toString();

-    emit m_extension->openUrlRequest(KUrl(url));
+    emit m_extension->openUrlRequest(QUrl(url));

 }
 
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
     const bool hasSelection = !selection.isEmpty();
 
 }
 
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
 {
     const bool hasSelection = !selection.isEmpty();
 

-    QAction* renameAction  = actionCollection()->action("rename");
-    QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
-    QAction* deleteAction = actionCollection()->action("delete");
-    QAction* editMimeTypeAction = actionCollection()->action("editMimeType");
-    QAction* propertiesAction = actionCollection()->action("properties");
-    QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler
+    QAction* renameAction  = actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile));
+    QAction* moveToTrashAction = actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash));
+    QAction* deleteAction = actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile));
+    QAction* editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType"));
+    QAction* propertiesAction = actionCollection()->action(QStringLiteral("properties"));
+    QAction* deleteWithTrashShortcut = actionCollection()->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler

 
     if (!hasSelection) {
 
     if (!hasSelection) {

-        stateChanged("has_no_selection");
+        stateChanged(QStringLiteral("has_no_selection"));

 
         emit m_extension->enableAction("cut", false);
         emit m_extension->enableAction("copy", false);
         deleteWithTrashShortcut->setEnabled(false);
         editMimeTypeAction->setEnabled(false);
     } else {
 
         emit m_extension->enableAction("cut", false);
         emit m_extension->enableAction("copy", false);
         deleteWithTrashShortcut->setEnabled(false);
         editMimeTypeAction->setEnabled(false);
     } else {

-        stateChanged("has_selection");
+        stateChanged(QStringLiteral("has_selection"));

 
         // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code)
         // in libkonq
 
         // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code)
         // in libkonq


@@ -299,7 +295,7 @@ void DolphinPart::updatePasteAction()
 
 KAboutData* DolphinPart::createAboutData()
 {
 
 KAboutData* DolphinPart::createAboutData()
 {

-    return new KAboutData("dolphinpart", i18nc("@title", "Dolphin Part"), "0.1");
+    return new KAboutData(QStringLiteral("dolphinpart"), i18nc("@title", "Dolphin Part"), QStringLiteral("0.1"));

 }
 
 bool DolphinPart::openUrl(const QUrl &url)
 }
 
 bool DolphinPart::openUrl(const QUrl &url)


@@ -313,14 +309,14 @@ bool DolphinPart::openUrl(const QUrl &url)
         return true;
     }
     setUrl(url); // remember it at the KParts level
         return true;
     }
     setUrl(url); // remember it at the KParts level

-    KUrl visibleUrl(url);
+    QUrl visibleUrl(url);

     if (!m_nameFilter.isEmpty()) {
     if (!m_nameFilter.isEmpty()) {

-        visibleUrl.addPath(m_nameFilter);
+        visibleUrl.setPath(visibleUrl.path() + '/' + m_nameFilter);

     }
     }

-    QString prettyUrl = visibleUrl.pathOrUrl();
+    QString prettyUrl = visibleUrl.toDisplayString(QUrl::PreferLocalFile);

     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);

-    emit started(0); // get the wheel to spin
+    emit started(nullptr); // get the wheel to spin

     m_view->setNameFilter(m_nameFilter);
     m_view->setUrl(url);
     updatePasteAction();
     m_view->setNameFilter(m_nameFilter);
     m_view->setUrl(url);
     updatePasteAction();


@@ -344,7 +340,7 @@ void DolphinPart::slotMessage(const QString& msg)
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {

-    kDebug() << msg;
+    qCDebug(DolphinDebug) << msg;

     emit canceled(msg);
     //KMessageBox::error(m_view, msg);
 }
     emit canceled(msg);
     //KMessageBox::error(m_view, msg);
 }


@@ -356,7 +352,7 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
         updateStatusBar();
     } else {
         const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo());
         updateStatusBar();
     } else {
         const QString escapedText = Qt::convertFromPlainText(item.getStatusBarInfo());

-        ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
+        emit ReadOnlyPart::setStatusBarText(QStringLiteral("<qt>%1</qt>").arg(escapedText));

     }
 }
 
     }
 }
 


@@ -383,7 +379,7 @@ void DolphinPart::slotItemsActivated(const KFileItemList& items)
     }
 }
 
     }
 }
 

-void DolphinPart::createNewWindow(const KUrl& url)
+void DolphinPart::createNewWindow(const QUrl& url)

 {
     // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
     // should be moved into DolphinPart::slotItemActivated()
 {
     // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
     // should be moved into DolphinPart::slotItemActivated()


@@ -392,7 +388,7 @@ void DolphinPart::createNewWindow(const KUrl& url)
 
 void DolphinPart::slotOpenContextMenu(const QPoint& pos,
                                       const KFileItem& _item,
 
 void DolphinPart::slotOpenContextMenu(const QPoint& pos,
                                       const KFileItem& _item,

-                                      const KUrl&,
+                                      const QUrl &,

                                       const QList<QAction*>& customActions)
 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                       const QList<QAction*>& customActions)
 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems


@@ -402,10 +398,9 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
     KFileItem item(_item);
 
     if (item.isNull()) { // viewport context menu
     KFileItem item(_item);
 
     if (item.isNull()) { // viewport context menu

-        popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;

         item = m_view->rootItem();
         if (item.isNull())
         item = m_view->rootItem();
         if (item.isNull())

-            item = KFileItem( S_IFDIR, (mode_t)-1, url() );
+            item = KFileItem(url());

         else
             item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
         else
             item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }


@@ -430,17 +425,17 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         const bool supportsMoving = capabilities.supportsMoving();
 
         if (capabilities.supportsDeleting()) {
         const bool supportsMoving = capabilities.supportsMoving();
 
         if (capabilities.supportsDeleting()) {

-            const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+            const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||

                                            !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 
             if (showDeleteAction && showMoveToTrashAction) {
                 delete m_removeAction;
                                            !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 
             if (showDeleteAction && showMoveToTrashAction) {
                 delete m_removeAction;

-                m_removeAction = 0;
-                editActions.append(actionCollection()->action("move_to_trash"));
-                editActions.append(actionCollection()->action("delete"));
+                m_removeAction = nullptr;
+                editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash)));
+                editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));

             } else if (showDeleteAction && !showMoveToTrashAction) {
             } else if (showDeleteAction && !showMoveToTrashAction) {

-                editActions.append(actionCollection()->action("delete"));
+                editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)));

             } else {
                 if (!m_removeAction)
                     m_removeAction = new DolphinRemoveAction(this, actionCollection());
             } else {
                 if (!m_removeAction)
                     m_removeAction = new DolphinRemoveAction(this, actionCollection());


@@ -452,7 +447,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
         }
 
         if (supportsMoving) {
         }
 
         if (supportsMoving) {

-            editActions.append(actionCollection()->action("rename"));
+            editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::RenameFile)));

         }
 
         // Normally KonqPopupMenu only shows the "Create new" submenu in the current view
         }
 
         // Normally KonqPopupMenu only shows the "Create new" submenu in the current view


@@ -463,7 +458,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
 
     }
 
 
     }
 

-    actionGroups.insert("editactions", editActions);
+    actionGroups.insert(QStringLiteral("editactions"), editActions);

 
     emit m_extension->popupMenu(pos,
                                 items,
 
     emit m_extension->popupMenu(pos,
                                 items,


@@ -473,12 +468,12 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos,
                                 actionGroups);
 }
 
                                 actionGroups);
 }
 

-void DolphinPart::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinPart::slotDirectoryRedirection(const QUrl &oldUrl, const QUrl &newUrl)

 {
 {

-    //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
-    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {
+    qCDebug(DolphinDebug) << oldUrl << newUrl << "currentUrl=" << url();
+    if (oldUrl.matches(url(), QUrl::StripTrailingSlash /* #207572 */)) {

         KParts::ReadOnlyPart::setUrl(newUrl);
         KParts::ReadOnlyPart::setUrl(newUrl);

-        const QString prettyUrl = newUrl.pathOrUrl();
+        const QString prettyUrl = newUrl.toDisplayString(QUrl::PreferLocalFile);

         emit m_extension->setLocationBarUrl(prettyUrl);
     }
 }
         emit m_extension->setLocationBarUrl(prettyUrl);
     }
 }


@@ -488,7 +483,7 @@ void DolphinPart::slotEditMimeType()
 {
     const KFileItemList items = m_view->selectedItems();
     if (!items.isEmpty()) {
 {
     const KFileItemList items = m_view->selectedItems();
     if (!items.isEmpty()) {

-        KonqOperations::editMimeType(items.first().mimetype(), m_view);
+        KMimeTypeEditor::editMimeType(items.first().mimetype(), m_view);

     }
 }
 
     }
 }
 


@@ -509,7 +504,7 @@ void DolphinPart::slotUnselectItemsMatchingPattern()
 void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)
 {
     bool okClicked;
 void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)
 {
     bool okClicked;

-    QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view);
+    const QString pattern = QInputDialog::getText(m_view, title, text, QLineEdit::Normal, QStringLiteral("*"), &okClicked);

 
     if (okClicked && !pattern.isEmpty()) {
         QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
 
     if (okClicked && !pattern.isEmpty()) {
         QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);


@@ -541,11 +536,14 @@ void DolphinPart::slotOpenTerminal()
 {
     QString dir(QDir::homePath());
 
 {
     QString dir(QDir::homePath());
 

-    KUrl u(url());
+    QUrl u(url());

 
     // If the given directory is not local, it can still be the URL of an
     // ioslave using UDS_LOCAL_PATH which to be converted first.
 
     // If the given directory is not local, it can still be the URL of an
     // ioslave using UDS_LOCAL_PATH which to be converted first.

-    u = KIO::NetAccess::mostLocalUrl(u, widget());
+    KIO::StatJob* statJob = KIO::mostLocalUrl(u);
+    KJobWidgets::setWindow(statJob, widget());
+    statJob->exec();
+    u = statJob->mostLocalUrl();

 
     //If the URL is local after the above conversion, set the directory.
     if (u.isLocalFile()) {
 
     //If the URL is local after the above conversion, set the directory.
     if (u.isLocalFile()) {


@@ -557,7 +555,7 @@ void DolphinPart::slotOpenTerminal()
 
 void DolphinPart::slotFindFile()
 {
 
 void DolphinPart::slotFindFile()
 {

-    KRun::run("kfind", QList<QUrl>() << url(), widget());
+    KRun::run(QStringLiteral("kfind"), {url()}, widget());

 }
 
 void DolphinPart::updateNewMenu()
 }
 
 void DolphinPart::updateNewMenu()


@@ -572,12 +570,12 @@ void DolphinPart::updateNewMenu()
 void DolphinPart::updateStatusBar()
 {
     const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText());
 void DolphinPart::updateStatusBar()
 {
     const QString escapedText = Qt::convertFromPlainText(m_view->statusBarText());

-    emit ReadOnlyPart::setStatusBarText(QString("<qt>%1</qt>").arg(escapedText));
+    emit ReadOnlyPart::setStatusBarText(QStringLiteral("<qt>%1</qt>").arg(escapedText));

 }
 
 void DolphinPart::updateProgress(int percent)
 {
 }
 
 void DolphinPart::updateProgress(int percent)
 {

-    m_extension->loadingProgress(percent);
+    emit m_extension->loadingProgress(percent);

 }
 
 void DolphinPart::createDirectory()
 }
 
 void DolphinPart::createDirectory()


@@ -587,7 +585,7 @@ void DolphinPart::createDirectory()
     m_newFileMenu->createDirectory();
 }
 
     m_newFileMenu->createDirectory();
 }
 

-void DolphinPart::setFilesToSelect(const KUrl::List& files)
+void DolphinPart::setFilesToSelect(const QList<QUrl>& files)

 {
     if (files.isEmpty()) {
         return;
 {
     if (files.isEmpty()) {
         return;


@@ -599,6 +597,7 @@ void DolphinPart::setFilesToSelect(const KUrl::List& files)
 
 bool DolphinPart::eventFilter(QObject* obj, QEvent* event)
 {
 
 bool DolphinPart::eventFilter(QObject* obj, QEvent* event)
 {

+    using ShiftState = DolphinRemoveAction::ShiftState;

     const int type = event->type();
 
     if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) {
     const int type = event->type();
 
     if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) {


@@ -606,7 +605,7 @@ bool DolphinPart::eventFilter(QObject* obj, QEvent* event)
         if (menu && menu->parent() == m_view) {
             QKeyEvent* ev = static_cast<QKeyEvent*>(event);
             if (ev->key() == Qt::Key_Shift) {
         if (menu && menu->parent() == m_view) {
             QKeyEvent* ev = static_cast<QKeyEvent*>(event);
             if (ev->key() == Qt::Key_Shift) {

-                m_removeAction->update();
+                m_removeAction->update(type == QEvent::KeyPress ? ShiftState::Pressed : ShiftState::Released);

             }
         }
     }
             }
         }
     }