Don't rely on konsole sources.

If compilation fails, update and install kdelibs/interfaces/terminal

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cf2676c3230941dfc74f48a062e641f1c7901e1..ed064f4e5e7f8a06fadc721ec164ca9a3b117607 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,7 @@
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/apps/konsole/src/
-       )
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
 add_definitions (-DQT3_SUPPORT)
 

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index ff410711cb540c06d891e5255cd795acb4e3ba98..9331961bcd466d06349e6354463b3fca379d6e50 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -22,7 +22,6 @@
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
-#include <Part.h>
 
 #include <QVBoxLayout>
 
@@ -56,12 +55,7 @@ void TerminalSidebarPage::showEvent(QShowEvent* event)
         KParts::Part* part = static_cast<KParts::Part*>(factory->create(this, "KParts::ReadOnlyPart"));
         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) {