1 files changed, 21 insertions, 15 deletions

diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 18949ba75..ddde9a6c4 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -49,44 +49,50 @@ class LayoutMap;
 
 class KXKBApp : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
-	KXKBApp(bool allowStyles=true, bool GUIenabled=true);
-	~KXKBApp();
+    KXKBApp(bool allowStyles=true, bool GUIenabled=true);
+    ~KXKBApp();
 
-	virtual int newInstance();
+    virtual int newInstance();
 
-	bool setLayout(const LayoutUnit& layoutUnit, int group=-1);
+    bool setLayout(const LayoutUnit& layoutUnit);
+    bool setLayout(const uint group);
 k_dcop:
-	bool setLayout(const TQString& layoutPair);
-	TQString getCurrentLayout() { return m_currentLayout.toPair(); }
-	TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
-	void forceSetXKBMap( bool set );
+    bool setLayout(const TQString& layoutPair);
+    TQString getCurrentLayout() { return m_currentLayout.toPair(); }
+    TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
+
+public slots:
+    void nextLayout();
+    void prevLayout();
 
 protected slots:
     void menuActivated(int id);
-    void toggled();
     void windowChanged(WId winId);
+    void layoutApply();
+    void slotGroupChanged(uint group);
 
     void slotSettingsChanged(int category);
+    void maybeShowLayoutNotification();
 
 protected:
     // Read settings, and apply them.
     bool settingsRead();
-    void layoutApply();
-    
+
 private:
-	void initTray();
+    void initTray();
+    bool x11EventFilter(XEvent *e);
 
 private:
-	KxkbConfig kxkbConfig;
+    KxkbConfig kxkbConfig;
 
     WId m_prevWinId;	// for tricky part of saving xkb group
     LayoutMap* m_layoutOwnerMap;
 
-	LayoutUnit m_currentLayout;
+    LayoutUnit m_currentLayout;
 
     XKBExtension *m_extension;
     XkbRules *m_rules;