diff options
| author | David Faure <[email protected]> | 2007-05-07 12:01:37 +0000 |
|---|---|---|
| committer | David Faure <[email protected]> | 2007-05-07 12:01:37 +0000 |
| commit | 6ea851f0308a9f3e269649294796579e47b50edd (patch) | |
| tree | 9df295b0fa7a0aa48022b1ea2127cc1528ba3045 /src | |
| parent | a4713e9ea4e7af747f4a406f68c907c1f09aac95 (diff) | |
Don't rely on konsole sources.
If compilation fails, update and install kdelibs/interfaces/terminal
svn path=/trunk/KDE/kdebase/apps/; revision=662060
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/terminalsidebarpage.cpp | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5cf2676c3..ed064f4e5 100644 --- 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 ff410711c..9331961bc 100644 --- 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) { |