1 files changed, 19 insertions, 5 deletions

diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h
index 987fff2b0..0d2e153b2 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -11,52 +11,66 @@
 
 
 class OptionListItem;
+class LayoutIconManager;
 class LayoutConfigWidget;
 class XkbRules;
 
 class LayoutConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~LayoutConfig();
 
+  void initUI(bool modified = false);
+  virtual TQString handbookDocPath() const;
+
+public slots:
   void load();
   void save();
   void defaults();
-  void initUI();
-  virtual TQString handbookDocPath() const;
-  
+
 protected:
   TQString createOptionString();
   void updateIndicator(TQListViewItem* selLayout);
+  OptionListItem* itemForOption(TQString option);
 
 protected slots:
   void moveUp();
   void moveDown();
+  void hotkeyComboChanged();
   void variantChanged();
   void displayNameChanged(const TQString& name);
-  void latinChanged();
   void layoutSelChanged(TQListViewItem *);
   void loadRules();
   void updateLayoutCommand();
   void updateOptionsCommand();
+  void updateHotkeyCombo();
+  void updateHotkeyCombo(bool initial);
   void add();
   void remove();
+  void resolveConflicts(TQListViewItem *lvi);
 
   void changed();
 
 private:
+  LayoutIconManager *m_icoMgr;
   LayoutConfigWidget* widget;
 
   XkbRules *m_rules;
   KxkbConfig m_kxkbConfig;
   TQDict<OptionListItem> m_optionGroups;
+  bool m_forceGrpOverwrite;
+  KKeyChooser *m_keyChooser;
+  TDEGlobalAccel *keys;
 
   TQWidget* makeOptionsTab();
+  TQWidget* makeShortcutsTab();
   void updateStickyLimit();
   static LayoutUnit getLayoutUnitKey(TQListViewItem *sel);
+  void checkConflicts(OptionListItem *current, TQStringList conflicting,
+                      TQStringList &conflicts);
 };