Fix configure hotkeys behaviour on keyboard seection.

[vlc] / modules / gui / qt4 / components / preferences_widgets.hpp

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index d8b108a57ebe7d82f253b05154853be2cbf45772..715f26afd1204206f0be6cb832a32dce7ed094b3 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -26,7 +26,11 @@
 #ifndef _PREFERENCESWIDGETS_H_
 #define _PREFERENCESWIDGETS_H_
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include "qt4.hpp"
 #include <assert.h>
@@ -159,6 +163,7 @@ private:
 
 class IntegerListConfigControl : public VIntConfigControl
 {
+Q_OBJECT
 public:
     IntegerListConfigControl( vlc_object_t *, module_config_t *, QWidget *,
                               bool, QGridLayout*, int& );
@@ -169,9 +174,12 @@ public:
     virtual void hide() { combo->hide(); if( label ) label->hide(); }
     virtual void show() { combo->show(); if( label ) label->show(); }
 private:
-    void finish( bool );
+    void finish(module_config_t *, bool );
     QLabel *label;
     QComboBox *combo;
+private slots:
+    void actionRequested( int );
+
 };
 
 class BoolConfigControl : public VIntConfigControl
@@ -308,6 +316,7 @@ public slots:
     virtual void updateField();
 };
 
+#if 0
 class FontConfigControl : public FileConfigControl
 {
     Q_OBJECT;
@@ -320,6 +329,7 @@ public:
 public slots:
     virtual void updateField();
 };
+#endif
 
 class ModuleConfigControl : public VStringConfigControl
 {
@@ -378,7 +388,7 @@ public:
     virtual void show() { combo->show(); if( label ) label->show(); }
        QComboBox *combo;
 private:
-    void finish( bool );
+    void finish(module_config_t *, bool );
     QLabel *label;
 private slots:
     void actionRequested( int );
@@ -417,7 +427,9 @@ class KeyShortcutEdit: public QLineEdit
     Q_OBJECT
 public:
     void setValue( int _value ){ value = _value; }
-    int getValue(){ return value; }
+    int getValue() const { return value; }
+public slots:
+    virtual void clear(void) { value = 0; QLineEdit::clear(); }
 private:
     int value;
     virtual void mousePressEvent( QMouseEvent *event );
@@ -445,7 +457,7 @@ private:
 private slots:
     void setTheKey();
     void selectKey( QTreeWidgetItem * = NULL );
-    void select1Key( QTreeWidgetItem *);
+    void select1Key();
 };
 
 class KeyInputDialog : public QDialog