Commit cd0e462c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent 543b1278
...@@ -46,7 +46,7 @@ class QGridLayout; ...@@ -46,7 +46,7 @@ class QGridLayout;
class ConfigControl : public QObject class ConfigControl : public QObject
{ {
Q_OBJECT; Q_OBJECT
public: public:
ConfigControl( vlc_object_t *_p_this, module_config_t *_p_conf, ConfigControl( vlc_object_t *_p_this, module_config_t *_p_conf,
QWidget *p ) : p_this( _p_this ), p_item( _p_conf ) QWidget *p ) : p_this( _p_this ), p_item( _p_conf )
...@@ -87,6 +87,7 @@ signals: ...@@ -87,6 +87,7 @@ signals:
*******************************************************/ *******************************************************/
class VIntConfigControl : public ConfigControl class VIntConfigControl : public ConfigControl
{ {
Q_OBJECT
public: public:
VIntConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) : VIntConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
ConfigControl(a,b,c) {}; ConfigControl(a,b,c) {};
...@@ -99,6 +100,7 @@ public: ...@@ -99,6 +100,7 @@ public:
class IntegerConfigControl : public VIntConfigControl class IntegerConfigControl : public VIntConfigControl
{ {
Q_OBJECT
public: public:
IntegerConfigControl( vlc_object_t *, module_config_t *, QWidget *, IntegerConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& ); QGridLayout *, int& );
...@@ -181,6 +183,7 @@ private: ...@@ -181,6 +183,7 @@ private:
*******************************************************/ *******************************************************/
class VFloatConfigControl : public ConfigControl class VFloatConfigControl : public ConfigControl
{ {
Q_OBJECT
public: public:
VFloatConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) : VFloatConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
ConfigControl(a,b,c) {}; ConfigControl(a,b,c) {};
...@@ -193,6 +196,7 @@ public: ...@@ -193,6 +196,7 @@ public:
class FloatConfigControl : public VFloatConfigControl class FloatConfigControl : public VFloatConfigControl
{ {
Q_OBJECT
public: public:
FloatConfigControl( vlc_object_t *, module_config_t *, QWidget *, FloatConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& ); QGridLayout *, int& );
...@@ -213,6 +217,7 @@ private: ...@@ -213,6 +217,7 @@ private:
class FloatRangeConfigControl : public FloatConfigControl class FloatRangeConfigControl : public FloatConfigControl
{ {
Q_OBJECT
public: public:
FloatRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *, FloatRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& ); QGridLayout *, int& );
...@@ -227,6 +232,7 @@ private: ...@@ -227,6 +232,7 @@ private:
*******************************************************/ *******************************************************/
class VStringConfigControl : public ConfigControl class VStringConfigControl : public ConfigControl
{ {
Q_OBJECT
public: public:
VStringConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) : VStringConfigControl( vlc_object_t *a, module_config_t *b, QWidget *c ) :
ConfigControl(a,b,c) {}; ConfigControl(a,b,c) {};
...@@ -239,6 +245,7 @@ public: ...@@ -239,6 +245,7 @@ public:
class StringConfigControl : public VStringConfigControl class StringConfigControl : public VStringConfigControl
{ {
Q_OBJECT
public: public:
StringConfigControl( vlc_object_t *, module_config_t *, QWidget *, StringConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int&, bool pwd ); QGridLayout *, int&, bool pwd );
......
...@@ -34,6 +34,9 @@ class QMenuBar; ...@@ -34,6 +34,9 @@ class QMenuBar;
class MenuItemData : public QObject class MenuItemData : public QObject
{ {
Q_OBJECT
public: public:
MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var ) MenuItemData( int i_id, int _i_type, vlc_value_t _val, const char *_var )
{ {
...@@ -94,6 +97,8 @@ private: ...@@ -94,6 +97,8 @@ private:
class MenuFunc : public QObject class MenuFunc : public QObject
{ {
Q_OBJECT
public: public:
MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; }; MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
void doFunc( intf_thread_t *p_intf) void doFunc( intf_thread_t *p_intf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment