From 2f045c60109e0a5811f68bcce617236e3478e402 Mon Sep 17 00:00:00 2001
From: Alex Richardson <arichardson.kde@gmail.com>
Date: Sun, 6 Apr 2014 03:32:55 +0200
Subject: Allow compiling Dolphin with KF5

This does not work properly yet, there are probably quite a few bad signal/
slot connections due to KUrl -> QUrl. However dolphin starts without
crashing.

Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5
and I have no idea how it is supposed to be used.

This is the first commit for review 117395
---
 src/panels/terminal/terminalpanel.cpp | 7 ++++---
 src/panels/terminal/terminalpanel.h   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/panels/terminal')

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index bfd3002f0..2ddc9f598 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -24,11 +24,12 @@
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KService>
-#include <kde_terminal_interface_v2.h>
+#include <kde_terminal_interface.h>
 #include <KParts/Part>
 #include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
+#include <KJobWidgets>
 
 #include <QBoxLayout>
 #include <QDir>
@@ -112,7 +113,7 @@ void TerminalPanel::showEvent(QShowEvent* event)
             connect(m_konsolePart, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited()));
             m_terminalWidget = m_konsolePart->widget();
             m_layout->addWidget(m_terminalWidget);
-            m_terminal = qobject_cast<TerminalInterfaceV2 *>(m_konsolePart);
+            m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);
         }
     }
     if (m_terminal) {
@@ -136,7 +137,7 @@ void TerminalPanel::changeDir(const KUrl& url)
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         if (m_mostLocalUrlJob->ui()) {
-            m_mostLocalUrlJob->ui()->setWindow(this);
+            KJobWidgets::setWindow(m_mostLocalUrlJob, this);
         }
         connect(m_mostLocalUrlJob, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
     }
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index 374476e1c..987ee4753 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -22,7 +22,7 @@
 
 #include <panels/panel.h>
 
-class TerminalInterfaceV2;
+class TerminalInterface;
 class QVBoxLayout;
 class QWidget;
 
@@ -78,7 +78,7 @@ private:
     KIO::StatJob* m_mostLocalUrlJob;
 
     QVBoxLayout* m_layout;
-    TerminalInterfaceV2* m_terminal;
+    TerminalInterface* m_terminal;
     QWidget* m_terminalWidget;
     KParts::ReadOnlyPart* m_konsolePart;
     QString m_konsolePartCurrentDirectory;
-- 
cgit v1.3