1 files changed, 9 insertions, 11 deletions
diff --git a/kxkb/rules.h b/kxkb/rules.h
index a4955317e..0a68f3dbf 100644
--- a/kxkb/rules.h
+++ b/kxkb/rules.h
@@ -3,8 +3,10 @@
 
 #include <tqstring.h>
 #include <tqdict.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
 
 class XkbRules
 {
@@ -15,30 +17,26 @@ public:
   const TQDict<char> &models() const { return m_models; };
   const TQDict<char> &layouts() const { return m_layouts; };
   const TQDict<char> &options() const { return m_options; };
-  
+
   TQStringList getAvailableVariants(const TQString& layout);
-  unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup);
 
-  bool isSingleGroup(const TQString& layout);
+  TQString getLayoutName(LayoutUnit layout) const;
 
-protected:
+  /// A helper to translate option description
+  static TQString trOpt(TQString opt);
 
+protected:
   void loadRules(TQString filename, bool layoutsOnly=false);
-  void loadGroups(TQString filename);
-  void loadOldLayouts(TQString filename);
 
 private:
 
   TQDict<char> m_models;
   TQDict<char> m_layouts;
   TQDict<char> m_options;
-  TQMap<TQString, unsigned int> m_initialGroups;
   TQDict<TQStringList> m_varLists;
-  TQStringList m_oldLayouts;
-  TQStringList m_nonLatinLayouts;
-  
+
   TQString X11_DIR;	// pseudo-constant
-  
+
 //  void fixLayouts();
 };