diff options
Diffstat (limited to 'kxkb/kxkbtraywindow.h')
| -rw-r--r-- | kxkb/kxkbtraywindow.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h index 38e42db5d..46d66c44b 100644 --- a/kxkb/kxkbtraywindow.h +++ b/kxkb/kxkbtraywindow.h @@ -21,21 +21,21 @@ class TQLabel; -class TQPopupMenu; +class TDEPopupMenu; class XkbRules; /* This class is responsible for displaying flag/label for the layout, catching keyboard/mouse events and displaying menu when selected */ -class KxkbLabelController: public QObject +class KxkbLabelController: public TQObject { -// Q_OBJECT +// TQ_OBJECT public: enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 }; - KxkbLabelController(TQLabel *label, TQPopupMenu* contextMenu); + KxkbLabelController(TQLabel *label, TDEPopupMenu* contextMenu); void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule); void setCurrentLayout(const LayoutUnit& layout); @@ -43,6 +43,8 @@ public: void setError(const TQString& layoutInfo=""); void setShowFlag(bool showFlag) { m_showFlag = showFlag; } void show() { label->show(); } + + WId winId() { return label->winId(); } // signals: // @@ -55,7 +57,7 @@ public: private: TQLabel* label; - TQPopupMenu* contextMenu; + TDEPopupMenu* contextMenu; const int m_menuStartIndex; bool m_showFlag; @@ -69,7 +71,7 @@ private: class KxkbSystemTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: KxkbSystemTray(): @@ -78,7 +80,7 @@ class KxkbSystemTray : public KSystemTray void mouseReleaseEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) emit toggled(); KSystemTray::mouseReleaseEvent(ev); } |