Adapt to new konsole api

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54e59583d2e616728b0ee125f3fdd2b4c3e7a50b..5cf2676c3230941dfc74f48a062e641f1c7901e1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,8 @@
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 

-include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/apps/konsole/src/
+       )

 
 add_definitions (-DQT3_SUPPORT)
 
 
 add_definitions (-DQT3_SUPPORT)
 

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 2d2b3a5bbafb92e87747ba3f62baeddab3e2c871..ff410711cb540c06d891e5255cd795acb4e3ba98 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -22,7 +22,7 @@
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>

-#include <konsole_part.h>
+#include <Part.h>

 
 #include <QVBoxLayout>
 
 
 #include <QVBoxLayout>
 


@@ -61,7 +61,7 @@ void TerminalSidebarPage::showEvent(QShowEvent* event)
             //     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*>(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<konsolePart*>(part));
+            m_terminal = static_cast<TerminalInterface*>(reinterpret_cast<Konsole::Part*>(part));

         }
     }
     if (m_terminal != 0) {
         }
     }
     if (m_terminal != 0) {