[vlc-commits] qt4: preferences: Removing useless parameter.
Hugo Beauzée-Luyssen
git at videolan.org
Fri Apr 22 17:14:35 CEST 2011
vlc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri Apr 22 17:07:21 2011 +0200| [955cbc6019287488969363044bedecbfc4b83929] | committer: Jean-Baptiste Kempf
qt4: preferences: Removing useless parameter.
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=955cbc6019287488969363044bedecbfc4b83929
---
.../gui/qt4/components/complete_preferences.cpp | 2 +-
modules/gui/qt4/components/preferences_widgets.cpp | 14 +++++++-------
modules/gui/qt4/components/preferences_widgets.hpp | 12 ++++++------
modules/gui/qt4/components/simple_preferences.cpp | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 9f875cf..49a217b 100644
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -504,7 +504,7 @@ AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
void AdvPrefsPanel::apply()
{
foreach ( ConfigControl *cfg, controls )
- cfg->doApply( p_intf );
+ cfg->doApply();
}
void AdvPrefsPanel::clean()
diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index dfea83f..530f6fb 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -197,9 +197,9 @@ void InterfacePreviewWidget::setPreview( enum_style e_style )
*************************************************************************/
void
-VStringConfigControl::doApply( intf_thread_t *p_intf )
+VStringConfigControl::doApply()
{
- config_PutPsz( p_intf, getName(), qtu( getValue() ) );
+ config_PutPsz( p_this, getName(), qtu( getValue() ) );
}
/*********** String **************/
@@ -806,9 +806,9 @@ void ModuleListConfigControl::onUpdate()
*************************************************************************/
void
-VIntConfigControl::doApply( intf_thread_t *p_intf )
+VIntConfigControl::doApply()
{
- config_PutInt( p_intf, getName(), getValue() );
+ config_PutInt( p_this, getName(), getValue() );
}
/*********** Integer **************/
@@ -1091,9 +1091,9 @@ int BoolConfigControl::getValue() const
*************************************************************************/
void
-VFloatConfigControl::doApply( intf_thread_t *p_intf )
+VFloatConfigControl::doApply()
{
- config_PutFloat( p_intf, getName(), getValue() );
+ config_PutFloat( p_this, getName(), getValue() );
}
/*********** Float **************/
@@ -1389,7 +1389,7 @@ void KeySelectorControl::setTheKey()
Qt::UserRole, shortcutValue->getValue() );
}
-void KeySelectorControl::doApply( intf_thread_t* )
+void KeySelectorControl::doApply()
{
QTreeWidgetItem *it;
for( int i = 0; i < table->topLevelItemCount() ; i++ )
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index 785e17c..e0dc46f 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -75,7 +75,7 @@ public slots:
* Variable controls
*******************************************************/
-class ConfigControl : public QObject
+class ConfigControl : public QObject
{
Q_OBJECT
public:
@@ -99,7 +99,7 @@ public:
static ConfigControl * createControl( vlc_object_t*,
module_config_t*,QWidget*,
QGridLayout *, int line = 0 );
- virtual void doApply( intf_thread_t *) = 0;
+ virtual void doApply() = 0;
protected:
vlc_object_t *p_this;
module_config_t *p_item;
@@ -125,7 +125,7 @@ public:
ConfigControl(a,b) {};
virtual int getValue() const = 0;
virtual int getType() const { return CONFIG_ITEM_INTEGER; }
- virtual void doApply( intf_thread_t *);
+ virtual void doApply();
};
class IntegerConfigControl : public VIntConfigControl
@@ -222,7 +222,7 @@ public:
ConfigControl(a,b) {};
virtual float getValue() const = 0;
virtual int getType() const { return CONFIG_ITEM_FLOAT; }
- virtual void doApply( intf_thread_t *);
+ virtual void doApply();
};
class FloatConfigControl : public VFloatConfigControl
@@ -270,7 +270,7 @@ public:
ConfigControl(a,b) {};
virtual QString getValue() const = 0;
virtual int getType() const { return CONFIG_ITEM_STRING; }
- virtual void doApply( intf_thread_t *);
+ virtual void doApply();
};
class StringConfigControl : public VStringConfigControl
@@ -455,7 +455,7 @@ public:
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(); }
- virtual void doApply( intf_thread_t *);
+ virtual void doApply();
private:
void finish();
QLabel *label;
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 4f1a932..d3ad7db 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -768,7 +768,7 @@ void SPrefsPanel::apply()
for( i = controls.begin() ; i != controls.end() ; ++i )
{
ConfigControl *c = qobject_cast<ConfigControl *>(*i);
- c->doApply( p_intf );
+ c->doApply();
}
switch( number )
More information about the vlc-commits
mailing list