[vlc-commits] Qt: kill unused_parameters warnings
Jean-Baptiste Kempf
git at videolan.org
Sat May 14 14:23:32 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 14 14:01:57 2011 +0200| [5feabe6bc640d4c3af39227177781c59004511f9] | committer: Jean-Baptiste Kempf
Qt: kill unused_parameters warnings
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5feabe6bc640d4c3af39227177781c59004511f9
---
modules/gui/qt4/dialogs/ml_configuration.cpp | 2 +-
modules/gui/qt4/dialogs/plugins.cpp | 4 ++--
modules/gui/qt4/input_manager.cpp | 21 +++++++++++++++++++++
modules/gui/qt4/main_interface.cpp | 7 ++++++-
modules/gui/qt4/menus.cpp | 6 +++---
modules/gui/qt4/menus.hpp | 2 +-
6 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/modules/gui/qt4/dialogs/ml_configuration.cpp b/modules/gui/qt4/dialogs/ml_configuration.cpp
index 2380b7b..191f470 100644
--- a/modules/gui/qt4/dialogs/ml_configuration.cpp
+++ b/modules/gui/qt4/dialogs/ml_configuration.cpp
@@ -148,7 +148,7 @@ bool MLDirModel::setData( const QModelIndex &index, const QVariant &value,
return QDirModel::setData( index, value, role );
}
-int MLDirModel::columnCount( const QModelIndex &parent ) const
+int MLDirModel::columnCount( const QModelIndex & ) const
{
return 1;
}
diff --git a/modules/gui/qt4/dialogs/plugins.cpp b/modules/gui/qt4/dialogs/plugins.cpp
index 30e0910..effda54 100644
--- a/modules/gui/qt4/dialogs/plugins.cpp
+++ b/modules/gui/qt4/dialogs/plugins.cpp
@@ -334,7 +334,7 @@ void ExtensionListModel::updateList()
emit dataChanged( index( 0 ), index( rowCount() - 1 ) );
}
-int ExtensionListModel::rowCount( const QModelIndex& parent ) const
+int ExtensionListModel::rowCount( const QModelIndex& ) const
{
int count = 0;
ExtensionsManager *EM = ExtensionsManager::getInstance( p_intf );
@@ -363,7 +363,7 @@ QVariant ExtensionListModel::data( const QModelIndex& index, int role ) const
}
QModelIndex ExtensionListModel::index( int row, int column,
- const QModelIndex& parent ) const
+ const QModelIndex& ) const
{
if( column != 0 )
return QModelIndex();
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 003f0fd..e8bdea4 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -285,6 +285,8 @@ inline void InputManager::delCallbacks()
static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+
InputManager *im = (InputManager*)param;
input_item_t *p_item = static_cast<input_item_t *>(newval.p_address);
@@ -296,6 +298,8 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
static int InputEvent( vlc_object_t *p_this, const char *,
vlc_value_t, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this );
+
InputManager *im = (InputManager*)param;
IMEvent *event;
@@ -1179,6 +1183,8 @@ bool MainInputManager::getPlayExitState()
static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( ItemChanged_Type );
@@ -1189,6 +1195,7 @@ static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval );
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( LeafToParent_Type,
@@ -1200,6 +1207,8 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
static int VolumeChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( newval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( VolumeChanged_Type );
@@ -1210,6 +1219,8 @@ static int VolumeChanged( vlc_object_t *p_this, const char *psz_var,
static int SoundMuteChanged( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( newval );
+
MainInputManager *mim = (MainInputManager*)param;
IMEvent *event = new IMEvent( SoundMuteChanged_Type );
@@ -1220,6 +1231,8 @@ static int SoundMuteChanged( vlc_object_t *p_this, const char *psz_var,
static int PLItemAppended
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old );
+
MainInputManager *mim = static_cast<MainInputManager*>(data);
playlist_add_t *p_add = static_cast<playlist_add_t*>( cur.p_address );
@@ -1230,6 +1243,8 @@ static int PLItemAppended
static int PLItemRemoved
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old );
+
MainInputManager *mim = static_cast<MainInputManager*>(data);
PLEvent *event = new PLEvent( PLItemRemoved_Type, cur.i_int, 0 );
@@ -1240,6 +1255,8 @@ static int PLItemRemoved
static int RandomChanged
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old ); VLC_UNUSED( cur );
+
MainInputManager *mim = static_cast<MainInputManager*>(data);
IMEvent *event = new IMEvent( RandomChanged_Type );
@@ -1251,6 +1268,8 @@ static int RandomChanged
static int LoopChanged
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old ); VLC_UNUSED( cur );
+
MainInputManager *mim = static_cast<MainInputManager*>(data);
IMEvent *event = new IMEvent( LoopChanged_Type );
@@ -1261,6 +1280,8 @@ static int LoopChanged
static int RepeatChanged
( vlc_object_t * obj, const char *var, vlc_value_t old, vlc_value_t cur, void *data )
{
+ VLC_UNUSED( obj ); VLC_UNUSED( var ); VLC_UNUSED( old ); VLC_UNUSED( cur );
+
MainInputManager *mim = static_cast<MainInputManager*>(data);
IMEvent *event = new IMEvent( RepeatChanged_Type );
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 9148950..38a4258 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -553,7 +553,7 @@ void MainInterface::destroyPopupMenu()
QVLCMenu::PopupMenu( p_intf, false );
}
-void MainInterface::popupMenu( const QPoint &p )
+void MainInterface::popupMenu( const QPoint & )
{
QVLCMenu::PopupMenu( p_intf, true );
}
@@ -1272,6 +1272,8 @@ void MainInterface::toggleInterfaceFullScreen()
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
if( p_intf->pf_show_dialog )
@@ -1289,6 +1291,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+ VLC_UNUSED( new_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
p_intf->p_sys->p_mi->toggleFSC();
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 037ecaa..76a18e0 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -601,7 +601,7 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
}
/* Subtitles */
-QMenu *QVLCMenu::SubtitleMenu( intf_thread_t *p_intf, QMenu *current )
+QMenu *QVLCMenu::SubtitleMenu( QMenu *current )
{
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
@@ -628,7 +628,7 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current, bool b_subtit
{
addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) );
if( b_subtitle)
- SubtitleMenu( p_intf, current );
+ SubtitleMenu( current );
current->addSeparator();
@@ -984,7 +984,7 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
if( action->menu()->isEmpty() )
action->setEnabled( false );
- submenu = SubtitleMenu( p_intf, menu );
+ submenu = SubtitleMenu( menu );
submenu->setTitle( qtr( "Subti&tle") );
UpdateItem( p_intf, menu, "spu-es", VLC_OBJECT(p_input), true );
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index b28df6d..a1ec8f5 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -113,7 +113,7 @@ private:
static QMenu *VideoMenu( intf_thread_t *p_intf, QWidget *parent ) {
return VideoMenu( p_intf, new QMenu( parent ) );
}
- static QMenu *SubtitleMenu(intf_thread_t *p_intf, QMenu *current);
+ static QMenu *SubtitleMenu( QMenu *current);
static QMenu *AudioMenu( intf_thread_t *, QMenu * );
static QMenu *AudioMenu( intf_thread_t *p_intf, QWidget *parent ) {
More information about the vlc-commits
mailing list