diff options
Diffstat (limited to 'kkbswitch/kbswitchapp.cpp')
| -rw-r--r-- | kkbswitch/kbswitchapp.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kkbswitch/kbswitchapp.cpp b/kkbswitch/kbswitchapp.cpp index 7798be3..50ce80a 100644 --- a/kkbswitch/kbswitchapp.cpp +++ b/kkbswitch/kbswitchapp.cpp @@ -22,13 +22,13 @@ #include "windowclasswatcher.h" #include <kdebug.h> -#include <klocale.h> -#include <kwinmodule.h> +#include <tdelocale.h> +#include <twinmodule.h> KBSwitchApp::KBSwitchApp() { #ifndef HAVE_LIBXKLAVIER - //m_kwin_module = NULL; + //m_twin_module = NULL; m_watcher = NULL; #endif if (!m_xkb.xkbAvailable()) return; // oops! No XKB in the server @@ -87,7 +87,7 @@ KBSwitchApp::~KBSwitchApp(){ bool KBSwitchApp::x11EventFilter(XEvent *e){ // let m_xkb process the event and emit signals if necessary m_xkb.processEvent(e); - return KApplication::x11EventFilter(e); + return TDEApplication::x11EventFilter(e); } /** Update the tray icon to show the flag corresponding to the current keyboard group */ @@ -295,7 +295,7 @@ void KBSwitchApp::resetWindowMap() m_window_map.clear(); - if (m_kwin_module && (active_window_id = m_kwin_module->activeWindow())) + if (m_twin_module && (active_window_id = m_twin_module->activeWindow())) addWindowToMap(active_window_id); else m_active_window = m_window_map.end(); @@ -304,10 +304,10 @@ void KBSwitchApp::resetWindowMap() /** Enable window manager notifications */ /*void KBSwitchApp::enableKWinModule() { - if (m_kwin_module == NULL) { - m_kwin_module = new KWinModule(); - connect(m_kwin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId))); - connect(m_kwin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId))); + if (m_twin_module == NULL) { + m_twin_module = new KWinModule(); + connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId))); + connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId))); resetWindowMap(); if (m_cur_groupno != -1 && m_cur_groupno != m_kbconf.default_groupno()) setStartGroup(m_kbconf.default_groupno()); @@ -317,10 +317,10 @@ void KBSwitchApp::resetWindowMap() /** Disable window manager notifications */ /*void KBSwitchApp::disableKWinModule() { - if (m_kwin_module) { - m_kwin_module->disconnect(); - delete m_kwin_module; - m_kwin_module = NULL; + if (m_twin_module) { + m_twin_module->disconnect(); + delete m_twin_module; + m_twin_module = NULL; resetWindowMap(); } }*/ |