Skip to content

V
vlc-2-2
Commit 9c02536b authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf
Browse files
Options

qt4: preferences_widget: Remove useless reference. 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3da5ea41
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 40 deletions
modules/gui/qt4/components/preferences_widgets.cpp
View file @ 9c02536b
......@@ -70,18 +70,10 @@ QString formatTooltip(const QString & tooltip)
return formatted;
}
ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
module_config_t *p_item,
QWidget *parent )
{
int i = 0;
return createControl( p_this, p_item, parent, NULL, i );
}
ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
module_config_t *p_item,
QWidget *parent,
QGridLayout *l, int &line )
QGridLayout *l, int line )
{
ConfigControl *p_control = NULL;
......@@ -214,7 +206,7 @@ VStringConfigControl::doApply( intf_thread_t *p_intf )
StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line, bool pwd ) :
int line, bool pwd ) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -266,7 +258,7 @@ void StringConfigControl::finish()
FileConfigControl::FileConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -345,7 +337,7 @@ void FileConfigControl::finish()
/********* String / Directory **********/
DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_p_widget,
QGridLayout *_p_layout, int& _int ) :
QGridLayout *_p_layout, int _int ) :
FileConfigControl( _p_this, _p_item, _p_widget, _p_layout, _int )
{}
......@@ -370,7 +362,7 @@ void DirectoryConfigControl::updateField()
/********* String / Font **********/
FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent,
QGridLayout *_p_layout, int& line) :
QGridLayout *_p_layout, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -403,7 +395,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
/********* String / choice list **********/
StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, bool bycat,
QGridLayout *l, int &line) :
QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -570,7 +562,7 @@ void setfillVLCConfigCombo( const char *configname, intf_thread_t *p_intf,
/********* Module **********/
ModuleConfigControl::ModuleConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, bool bycat,
QGridLayout *l, int &line) :
QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -662,7 +654,7 @@ QString ModuleConfigControl::getValue() const
/********* Module list **********/
ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, bool bycat,
QGridLayout *l, int &line) :
QGridLayout *l, int line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
groupBox = NULL;
......@@ -823,7 +815,7 @@ VIntConfigControl::doApply( intf_thread_t *p_intf )
IntegerConfigControl::IntegerConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -880,7 +872,7 @@ int IntegerConfigControl::getValue() const
IntegerRangeConfigControl::IntegerRangeConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
IntegerConfigControl( _p_this, _p_item, _parent, l, line )
{
finish();
......@@ -931,7 +923,7 @@ int IntegerRangeSliderConfigControl::getValue() const
/********* Integer / choice list **********/
IntegerListConfigControl::IntegerListConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, bool bycat,
QGridLayout *l, int &line) :
QGridLayout *l, int line) :
VIntConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -1052,7 +1044,7 @@ int IntegerListConfigControl::getValue() const
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
checkbox = new QCheckBox( qtr(p_item->psz_text) );
......@@ -1108,7 +1100,7 @@ VFloatConfigControl::doApply( intf_thread_t *p_intf )
FloatConfigControl::FloatConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
VFloatConfigControl( _p_this, _p_item, _parent )
{
label = new QLabel( qtr(p_item->psz_text) );
......@@ -1168,7 +1160,7 @@ float FloatConfigControl::getValue() const
FloatRangeConfigControl::FloatRangeConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
FloatConfigControl( _p_this, _p_item, _parent, l, line )
{
finish();
......@@ -1196,7 +1188,7 @@ void FloatRangeConfigControl::finish()
KeySelectorControl::KeySelectorControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int &line ) :
int line ) :
ConfigControl( _p_this, _p_item, _parent )
{
......
modules/gui/qt4/components/preferences_widgets.hpp
View file @ 9c02536b
......@@ -96,11 +96,9 @@ public:
virtual void hide() { getWidget()->hide(); };
virtual void show() { getWidget()->show(); };
static ConfigControl * createControl( vlc_object_t*,
module_config_t*,QWidget* );
static ConfigControl * createControl( vlc_object_t*,
module_config_t*,QWidget*,
QGridLayout *, int& );
QGridLayout *, int line = 0 );
virtual void doApply( intf_thread_t *) = 0;
protected:
vlc_object_t *p_this;
......@@ -135,7 +133,7 @@ class IntegerConfigControl : public VIntConfigControl
Q_OBJECT
public:
IntegerConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
IntegerConfigControl( vlc_object_t *, module_config_t *,
QLabel*, QSpinBox* );
IntegerConfigControl( vlc_object_t *, module_config_t *,
......@@ -155,7 +153,7 @@ class IntegerRangeConfigControl : public IntegerConfigControl
{
public:
IntegerRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
IntegerRangeConfigControl( vlc_object_t *, module_config_t *,
QLabel*, QSpinBox* );
private:
......@@ -180,7 +178,7 @@ class IntegerListConfigControl : public VIntConfigControl
Q_OBJECT
public:
IntegerListConfigControl( vlc_object_t *, module_config_t *, QWidget *,
bool, QGridLayout*, int& );
bool, QGridLayout*, int );
IntegerListConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QComboBox*, bool );
virtual int getValue() const;
......@@ -199,7 +197,7 @@ class BoolConfigControl : public VIntConfigControl
{
public:
BoolConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
BoolConfigControl( vlc_object_t *, module_config_t *,
QLabel *, QAbstractButton*, bool );
virtual int getValue() const;
......@@ -232,7 +230,7 @@ class FloatConfigControl : public VFloatConfigControl
Q_OBJECT
public:
FloatConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
FloatConfigControl( vlc_object_t *, module_config_t *,
QLabel*, QDoubleSpinBox* );
virtual float getValue() const;
......@@ -252,7 +250,7 @@ class FloatRangeConfigControl : public FloatConfigControl
Q_OBJECT
public:
FloatRangeConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
FloatRangeConfigControl( vlc_object_t *, module_config_t *,
QLabel*, QDoubleSpinBox* );
private:
......@@ -280,7 +278,7 @@ class StringConfigControl : public VStringConfigControl
Q_OBJECT
public:
StringConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int&, bool pwd );
QGridLayout *, int, bool pwd );
StringConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QLineEdit*, bool pwd );
virtual QString getValue() const { return text->text(); };
......@@ -297,7 +295,7 @@ class FileConfigControl : public VStringConfigControl
Q_OBJECT
public:
FileConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
FileConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QLineEdit *, QPushButton * );
virtual QString getValue() const { return text->text(); };
......@@ -317,7 +315,7 @@ class DirectoryConfigControl : public FileConfigControl
Q_OBJECT
public:
DirectoryConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int& );
QGridLayout *, int );
DirectoryConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QLineEdit *, QPushButton * );
public slots:
......@@ -329,7 +327,7 @@ class FontConfigControl : public VStringConfigControl
Q_OBJECT
public:
FontConfigControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout *, int&);
QGridLayout *, int);
FontConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QFontComboBox *);
virtual QString getValue() const { return font->currentFont().family(); }
......@@ -342,7 +340,7 @@ class ModuleConfigControl : public VStringConfigControl
{
public:
ModuleConfigControl( vlc_object_t *, module_config_t *, QWidget *, bool,
QGridLayout*, int& );
QGridLayout*, int );
ModuleConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QComboBox*, bool );
virtual QString getValue() const;
......@@ -365,7 +363,7 @@ class ModuleListConfigControl : public VStringConfigControl
friend class ConfigControl;
public:
ModuleListConfigControl( vlc_object_t *, module_config_t *, QWidget *,
bool, QGridLayout*, int& );
bool, QGridLayout*, int );
// ModuleListConfigControl( vlc_object_t *, module_config_t *, QLabel *,
// QComboBox*, bool );
virtual ~ModuleListConfigControl();
......@@ -386,7 +384,7 @@ class StringListConfigControl : public VStringConfigControl
Q_OBJECT
public:
StringListConfigControl( vlc_object_t *, module_config_t *, QWidget *,
bool, QGridLayout*, int& );
bool, QGridLayout*, int );
StringListConfigControl( vlc_object_t *, module_config_t *, QLabel *,
QComboBox*, bool );
virtual QString getValue() const;
......@@ -453,7 +451,7 @@ class KeySelectorControl : public ConfigControl
Q_OBJECT
public:
KeySelectorControl( vlc_object_t *, module_config_t *, QWidget *,
QGridLayout*, int& );
QGridLayout*, int );
virtual int getType() const { return CONFIG_ITEM_KEY; }
virtual void hide() { table->hide(); if( label ) label->hide(); }
virtual void show() { table->show(); if( label ) label->show(); }
......
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