Make use of the error messages coming from the places model.

[dolphin.git] / src / terminalsidebarpage.cpp

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index ff410711cb540c06d891e5255cd795acb4e3ba98..cfa55c0d84c80f6e06543f8b92a912214d62cbd4 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -22,9 +22,10 @@
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
-#include <Part.h>
+#include <kshell.h>
 
-#include <QVBoxLayout>
+#include <QBoxLayout>
+#include <QShowEvent>
 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
@@ -44,24 +45,24 @@ void TerminalSidebarPage::setUrl(const KUrl& url)
     if (!SidebarPage::url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
         SidebarPage::setUrl(url);
         if ((m_terminal != 0) && isVisible()) {
-            m_terminal->showShellInDir(url.path());
+            m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
         }
     }
 }
 
 void TerminalSidebarPage::showEvent(QShowEvent* event)
 {
+    if (event->spontaneous()) {
+        SidebarPage::showEvent(event);
+        return;
+    }
+
     if (m_terminal == 0) {
         KLibFactory* factory = KLibLoader::self()->factory("libkonsolepart");
-        KParts::Part* part = static_cast<KParts::Part*>(factory->create(this, "KParts::ReadOnlyPart"));
+        KParts::Part* part = factory ? static_cast<KParts::Part*>(factory->create(this, "KParts::ReadOnlyPart")) : 0;
         if (part != 0) {
             m_layout->addWidget(part->widget());
-
-            // TODO: in KDE3 the following code worked:
-            //     m_terminal = static_cast<TerminalInterface*>(part->qt_cast("TerminalInterface"));
-            // which does not work anymore in Qt4. As temporary workaround <konsole_part.h> is
-            // included directly:
-            m_terminal = static_cast<TerminalInterface*>(reinterpret_cast<Konsole::Part*>(part));
+            m_terminal = qobject_cast<TerminalInterface *>(part);
         }
     }
     if (m_terminal != 0) {