1 files changed, 36 insertions, 21 deletions

diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 18949ba75..803057f61 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -31,7 +31,12 @@ DESCRIPTION
 #include <tqdict.h>
 #include <tqptrqueue.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
+#ifdef WITH_TDEHWLIB
+#include <tdegenericdevice.h>
+#else
+#define TDEGenericDevice void
+#endif
 
 #include "kxkbtraywindow.h"
 #include "kxkbconfig.h"
@@ -47,50 +52,60 @@ class LayoutMap;
     and switching layouts
 */
 
-class KXKBApp : public KUniqueApplication
+class KXKBApp : public TDEUniqueApplication
 {
-    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 slotGroupChanged(uint group);
 
     void slotSettingsChanged(int category);
+    void showLayoutNotification();
+    void showErrorNotification(TQString layout);
+
+    void hardwareChanged(TDEGenericDevice *dev);
+
+    void readSettings();
+    void applyXkbOptions();
+    void slotSyncXkbOptions();
+    void syncXkbOptions();
 
-protected:
-    // Read settings, and apply them.
-    bool settingsRead();
-    void layoutApply();
-    
 private:
-	void initTray();
+    void initTray();
+    bool x11EventFilter(XEvent *e);
+    bool isKMiloAvailable();
 
 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;
-    KxkbLabelController *m_tray;
+    KxkbSystemTray *m_tray;
     TDEGlobalAccel *keys;
     KWinModule* kWinModule;
     bool m_forceSetXKBMap;