minor adjustments for working together with Max after the BIC Monday...

svn path=/trunk/KDE/kdebase/apps/; revision=661899

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 8c8dcedeff7f7e85d73cfcdcd1bad508dcea5ee3..841959097b578b1b23ff477db77c78d6fd96a543 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -42,6 +42,7 @@ void TerminalSidebarPage::setUrl(const KUrl& url)
 {
     SidebarPage::setUrl(url);
     // TODO: synchronize terminal
+    // m_terminal->showShellInDir(...);
 }
 
 void TerminalSidebarPage::showEvent(QShowEvent* event)
@@ -50,9 +51,13 @@ void TerminalSidebarPage::showEvent(QShowEvent* event)
         KLibFactory* factory = KLibLoader::self()->factory("libkonsolepart");
         KParts::Part* part = static_cast<KParts::Part*>(factory->create(this, "KParts::ReadOnlyPart"));
         if (part != 0) {
-            m_terminal = part->widget();
-            m_layout->addWidget(m_terminal);
+            m_layout->addWidget(part->widget());
         }
+
+        // TODO: port to KDE4
+        //TerminalInterface* m_terminal = static_cast<TerminalInterface*>(part->qt_cast("TerminalInterface"));
+        // like this?
+        //m_terminal = qobject_cast<TerminalInterface*>(part);
     }
     SidebarPage::showEvent(event);
 }

diff --git a/src/terminalsidebarpage.h b/src/terminalsidebarpage.h
index ddefad9e5612ad54902eb949b9b51eaafb96f6bd..5113f1833dae4685c330b7734db5818979e6f462 100644 (file)
--- a/src/terminalsidebarpage.h
+++ b/src/terminalsidebarpage.h
@@ -22,6 +22,7 @@
 
 #include <sidebarpage.h>
 
+class TerminalInterface;
 class QVBoxLayout;
 
 /**
@@ -46,7 +47,7 @@ protected:
 
 private:
     QVBoxLayout* m_layout;
-    QWidget* m_terminal;
+    TerminalInterface* m_terminal;
 };
 
 #endif // TERMINALSIDEBARPAGE_H