diff options
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/kxkb.cpp | 2 | ||||
| -rw-r--r-- | kxkb/kxkb.h | 4 | ||||
| -rw-r--r-- | kxkb/kxkbtraywindow.cpp | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 1d899299f..2b6cbb486 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -62,7 +62,7 @@ DESCRIPTION KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) - : KUniqueApplication(allowStyles, GUIenabled), + : TDEUniqueApplication(allowStyles, GUIenabled), m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID), m_rules(NULL), m_tray(NULL), diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index ddde9a6c4..c4d5bf334 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -31,7 +31,7 @@ DESCRIPTION #include <tqdict.h> #include <tqptrqueue.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include "kxkbtraywindow.h" #include "kxkbconfig.h" @@ -47,7 +47,7 @@ class LayoutMap; and switching layouts */ -class KXKBApp : public KUniqueApplication +class KXKBApp : public TDEUniqueApplication { TQ_OBJECT K_DCOP diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 573b0b4ef..2d45922b6 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -17,7 +17,6 @@ #include <kiconloader.h> #include <tdepopupmenu.h> #include <tdeaction.h> -#include <kuniqueapplication.h> #include "kxkbtraywindow.h" #include "pixmap.h" @@ -67,19 +66,13 @@ void KxkbLabelController::setError(const TQString& layoutInfo) void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules) { TDEPopupMenu* menu = contextMenu; -// TQPopupMenu* menu = contextMenu; -// int index = menu->indexOf(0); m_descriptionMap.clear(); -// menu->clear(); -// menu->insertTitle( kapp->miniIcon(), kapp->caption() ); for(int ii=0; ii<m_prevLayoutCount; ++ii) { menu->removeItem(START_MENU_ID + ii); kdDebug() << "remove item: " << START_MENU_ID + ii << endl; } -/* menu->removeItem(CONFIG_MENU_ID); - menu->removeItem(HELP_MENU_ID);*/ TDEIconEffect iconeffect; |