Q_DECL_OVERRIDE

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0d28f3f1ad2a462b39919b06eab33807720272c4..1c79a5980e07c42c4cfa6fd65a9e6379dda32b59 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -25,26 +25,23 @@
 
 #include <KAboutData>
 #include <KActionCollection>
 
 #include <KAboutData>
 #include <KActionCollection>

-#include <KConfigGroup>

 #include <KDebug>
 #include <KDebug>

-#include <KGlobalSettings>

 #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 <kauthorized.h>
 #include <KIO/NetAccess>
 #include <KToolInvocation>
 #include <kauthorized.h>

-#include <KMenu>
+#include <QMenu>

 #include <KInputDialog>
 #include <KInputDialog>

-#include <KProtocolInfo>

 #include <kdeversion.h>
 #include <kdeversion.h>

+#include <KSharedConfig>
+#include <KConfigGroup>
+#include <KMimeTypeEditor>

 
 #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,11 +50,14 @@
 #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>
+

 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))


@@ -68,14 +68,13 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
       ,m_removeAction(0)
 {
     Q_UNUSED(args)
       ,m_removeAction(0)
 {
     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
     KIconLoader::global()->addAppDir("dolphin");
 
     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
     KIconLoader::global()->addAppDir("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);
 


@@ -205,16 +204,16 @@ 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);
     createGoAction("go_autostart", "",
                    i18nc("@action:inmenu Go", "Autostart"), QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart",


@@ -250,7 +249,7 @@ 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)
 }
 
 void DolphinPart::slotSelectionChanged(const KFileItemList& selection)


@@ -313,11 +312,11 @@ 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 started(0); // get the wheel to spin
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin


@@ -383,7 +382,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 +391,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


@@ -430,7 +429,7 @@ 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;
 
                                            !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 


@@ -473,12 +472,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();
 {
     //kDebug() << oldUrl << newUrl << "currentUrl=" << url();

-    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {
+    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 +487,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);

     }
 }
 
     }
 }
 


@@ -541,7 +540,7 @@ 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.


@@ -587,7 +586,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;