Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 4 insertions, 0 deletions

diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index a16a619e3..e51d8cb7a 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -25,6 +25,7 @@
 #define __SHORTCUTS_MODULE_H
 
 #include <qbuttongroup.h>
+#include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qtabwidget.h>
@@ -61,6 +62,7 @@ class ShortcutsModule : public QWidget
 	void slotSelectScheme( int = 0 );
 	void slotSaveSchemeAs();
 	void slotRemoveScheme();
+	void slotUseRmWinKeysClicked();
 
  private:
 	QTabWidget* m_pTab;
@@ -72,6 +74,8 @@ class ShortcutsModule : public QWidget
 	KAccelActions m_actionsGeneral, m_actionsSequence;//, m_actionsApplication;
 	KShortcutList* m_pListGeneral, * m_pListSequence, * m_pListApplication;
 	KKeyChooser* m_pkcGeneral, * m_pkcSequence, * m_pkcApplication;
+	QCheckBox* m_useRmWinKeys;
+	bool m_bUseRmWinKeys;
 };
 
 #endif // __SHORTCUTS_MODULE_H