From 45b1e4d624e36de4e21cb647706d9b46091210bf Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 20 Jan 2012 19:26:32 +0100 Subject: [PATCH] We really don't want to depend on qtui in uisupport It's also not needed, we can access the ActionCollection through GraphicalUi. --- src/uisupport/CMakeLists.txt | 4 +--- src/uisupport/tabcompleter.cpp | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt index 3d135d9e..5afab319 100644 --- a/src/uisupport/CMakeLists.txt +++ b/src/uisupport/CMakeLists.txt @@ -86,9 +86,7 @@ endif(HAVE_KDE) qt4_wrap_cpp(MOC ${MOC_HDRS}) include_directories(${CMAKE_SOURCE_DIR}/src/common - ${CMAKE_SOURCE_DIR}/src/client - ${CMAKE_SOURCE_DIR}/src/qtui - ${CMAKE_SOURCE_DIR}/src/uisupport) + ${CMAKE_SOURCE_DIR}/src/client) add_library(mod_uisupport STATIC ${SOURCES} ${MOC} ${HEADERS}) add_dependencies(mod_uisupport mod_common mod_client) diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp index 527eb795..2c15fdb1 100644 --- a/src/uisupport/tabcompleter.cpp +++ b/src/uisupport/tabcompleter.cpp @@ -30,7 +30,7 @@ #include "uisettings.h" #include "action.h" #include "actioncollection.h" -#include "qtui.h" +#include "graphicalui.h" #include @@ -48,7 +48,7 @@ TabCompleter::TabCompleter(MultiLineEdit *_lineEdit) // use both an Action and generic eventFilter, to make the shortcut configurable // yet still be able to reset() when required _lineEdit->installEventFilter(this); - ActionCollection *coll = QtUi::actionCollection("General"); + ActionCollection *coll = GraphicalUi::actionCollection("General"); coll->addAction("TabCompletionKey", new Action(tr("Tab completion"), coll, this, SLOT(onTabCompletionKey()), QKeySequence(Qt::Key_Tab))); } @@ -165,7 +165,7 @@ bool TabCompleter::eventFilter(QObject *obj, QEvent *event) { QKeyEvent *keyEvent = static_cast(event); - if(keyEvent->key() != QtUi::actionCollection("General")->action("TabCompletionKey")->shortcut()) { + if(keyEvent->key() != GraphicalUi::actionCollection("General")->action("TabCompletionKey")->shortcut()) { reset(); } return false; -- 2.20.1