Qt4 - Add Q_OBJECT Macros when needed. Patch from Benjamin Meyer.

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 73ec4f48d923f0738d947c94dd96d6da45ff77f1..0466e561d9d5539d7c27d50bbd2f05bd29fdcdee 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -46,7 +46,7 @@ class QGridLayout;
 
 class ConfigControl : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
     ConfigControl( vlc_object_t *_p_this, module_config_t *_p_conf,
                    QWidget *p ) : p_this( _p_this ), p_item( _p_conf )
@@ -87,6 +87,7 @@ signals:
  *******************************************************/
 class VIntConfigControl : public ConfigControl
 {
+Q_OBJECT
 public:
     VIntConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
             ConfigControl(a,b,c) {};
@@ -99,6 +100,7 @@ public:
 
 class IntegerConfigControl : public VIntConfigControl
 {
+Q_OBJECT
 public:
     IntegerConfigControl( vlc_object_t *, module_config_t *, QWidget *,
                           QGridLayout *, int& );
@@ -181,6 +183,7 @@ private:
  *******************************************************/
 class VFloatConfigControl : public ConfigControl
 {
+    Q_OBJECT
 public:
     VFloatConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
                 ConfigControl(a,b,c) {};
@@ -193,6 +196,7 @@ public:
 
 class FloatConfigControl : public VFloatConfigControl
 {
+    Q_OBJECT
 public:
     FloatConfigControl( vlc_object_t *, module_config_t *, QWidget *,
                         QGridLayout *, int& );
@@ -213,6 +217,7 @@ private:
 
 class FloatRangeConfigControl : public FloatConfigControl
 {
+    Q_OBJECT
 public:
     FloatRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
                              QGridLayout *, int& );
@@ -227,6 +232,7 @@ private:
  *******************************************************/
 class VStringConfigControl : public ConfigControl
 {
+    Q_OBJECT
 public:
     VStringConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
                 ConfigControl(a,b,c) {};
@@ -239,6 +245,7 @@ public:
 
 class StringConfigControl : public VStringConfigControl
 {
+    Q_OBJECT
 public:
     StringConfigControl( vlc_object_t *, module_config_t *, QWidget *,
                          QGridLayout *, int&,  bool pwd );

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 7109bd404f272f0d90f3d0d9bf8e69391cf64de9..b87daffc384dc62e3e049623466008e12efdf2dc 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -34,6 +34,9 @@ class QMenuBar;
 
 class MenuItemData : public QObject
 {
+
+Q_OBJECT
+
 public:
     MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
     {
@@ -94,6 +97,8 @@ private:
 
 class MenuFunc : public QObject
 {
+Q_OBJECT
+
 public:
     MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
     void doFunc( intf_thread_t *p_intf)