Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


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

1 files changed, 39 insertions, 0 deletions

diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
new file mode 100644
index 000000000..5140b1110
--- /dev/null
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+
+ KHotKeys
+ 
+ Copyright (C) 2003 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+ 
+****************************************************************************/
+
+#ifndef _GENERAL_SETTINGS_TAB_H_
+#define _GENERAL_SETTINGS_TAB_H_
+
+#include <general_settings_tab_ui.h>
+
+namespace KHotKeys
+{
+
+class General_settings_tab
+    : public General_settings_tab_ui
+    {
+    Q_OBJECT
+    public:
+        General_settings_tab( QWidget* parent = NULL, const char* name = NULL );
+        void read_data();
+        void write_data() const;
+    public slots:
+        void clear_data();
+    protected slots:
+        virtual void import_clicked();
+    };
+
+//***************************************************************************
+// Inline
+//***************************************************************************
+
+} // namespace KHotKeys
+
+#endif