Allow compiling Dolphin with KF5

[dolphin.git] / src / panels / terminal / terminalpanel.cpp

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index bfd3002f0b14315b0d2176d2d483f23bf88c5dfd..2ddc9f5981e392352ed6732a6604f3a7b8e11049 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -24,11 +24,12 @@
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KService>
 #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 <KParts/Part>
 #include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>

+#include <KJobWidgets>

 
 #include <QBoxLayout>
 #include <QDir>
 
 #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);
             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) {
         }
     }
     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()) {
     } 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*)));
     }
         }
         connect(m_mostLocalUrlJob, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
     }