From 70a73ff707dc62539cc0ecf7b17567bab4391c61 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 14 May 2011 15:00:34 +0200 Subject: [PATCH] Qt: more of the same warnings killing --- modules/gui/qt4/components/open_panels.cpp | 4 ++-- modules/gui/qt4/components/playlist/ml_model.cpp | 11 +++++++++-- modules/gui/qt4/components/playlist/selector.cpp | 6 +++--- modules/gui/qt4/components/playlist/standardpanel.cpp | 4 ++-- modules/gui/qt4/components/playlist/views.cpp | 14 +++++++------- modules/gui/qt4/components/sout/sout_widgets.cpp | 6 +++--- modules/gui/qt4/main_interface_win32.cpp | 6 +++--- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 2c4308aa75..9abc56d37e 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -729,12 +729,12 @@ void CaptureOpenPanel::initialize() module_config_t *p_config = config_FindConfig( VLC_OBJECT(p_intf), "dshow-vdev" ); vdevDshowW = new StringListConfigControl( - VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line ); + VLC_OBJECT(p_intf), p_config, this, dshowDevLayout, line ); line++; p_config = config_FindConfig( VLC_OBJECT(p_intf), "dshow-adev" ); adevDshowW = new StringListConfigControl( - VLC_OBJECT(p_intf), p_config, this, false, dshowDevLayout, line ); + VLC_OBJECT(p_intf), p_config, this, dshowDevLayout, line ); line++; /* dshow Properties */ diff --git a/modules/gui/qt4/components/playlist/ml_model.cpp b/modules/gui/qt4/components/playlist/ml_model.cpp index 3841371e65..2bcf59f5f4 100644 --- a/modules/gui/qt4/components/playlist/ml_model.cpp +++ b/modules/gui/qt4/components/playlist/ml_model.cpp @@ -106,7 +106,7 @@ QModelIndex MLModel::index( int row, int column, } } -QModelIndex MLModel::parent(const QModelIndex &index) const +QModelIndex MLModel::parent(const QModelIndex & ) const { return QModelIndex(); } @@ -215,7 +215,7 @@ QMimeData* MLModel::mimeData( const QModelIndexList &indexes ) const return data; } -int MLModel::columnCount( const QModelIndex & parent ) const +int MLModel::columnCount( const QModelIndex & ) const { return columnFromMeta( COLUMN_END ); } @@ -590,6 +590,8 @@ static int mediaAdded( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *data ) { + VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); + int ret = VLC_SUCCESS; media_library_t *p_ml = ( media_library_t* )p_this; MLModel* p_model = ( MLModel* )data; @@ -609,6 +611,8 @@ static int mediaDeleted( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *data ) { + VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); + MLModel* p_model = ( MLModel* )data; QModelIndex remove_idx = QModelIndex(); for( int i = 0; i < p_model->rowCount( ); i++ ) @@ -630,6 +634,9 @@ static int mediaUpdated( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *data ) { + VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); + VLC_UNUSED( newval ); VLC_UNUSED( data ); + return VLC_SUCCESS; } diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp index c542577ad5..5ea7512283 100644 --- a/modules/gui/qt4/components/playlist/selector.cpp +++ b/modules/gui/qt4/components/playlist/selector.cpp @@ -356,8 +356,8 @@ QStringList PLSelector::mimeTypes() const return types; } -bool PLSelector::dropMimeData ( QTreeWidgetItem * parent, int index, - const QMimeData * data, Qt::DropAction action ) +bool PLSelector::dropMimeData ( QTreeWidgetItem * parent, int, + const QMimeData * data, Qt::DropAction ) { if( !parent ) return false; @@ -464,7 +464,7 @@ void PLSelector::inputItemUpdate( input_item_t *arg ) } } -void PLSelector::podcastAdd( PLSelItem* item ) +void PLSelector::podcastAdd( PLSelItem * ) { bool ok; QString url = QInputDialog::getText( this, qtr( "Subscribe" ), diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp index 240701b645..1e52992a43 100644 --- a/modules/gui/qt4/components/playlist/standardpanel.cpp +++ b/modules/gui/qt4/components/playlist/standardpanel.cpp @@ -130,7 +130,7 @@ void StandardPLPanel::popupPlView( const QPoint &point ) QVLCMenu::PopupMenu( p_intf, true ); } -void StandardPLPanel::popupSelectColumn( QPoint pos ) +void StandardPLPanel::popupSelectColumn( QPoint ) { QMenu menu; assert( treeView ); @@ -228,7 +228,7 @@ void StandardPLPanel::wheelEvent( QWheelEvent *e ) e->accept(); } -bool StandardPLPanel::eventFilter ( QObject * watched, QEvent * event ) +bool StandardPLPanel::eventFilter ( QObject *, QEvent * event ) { if (event->type() == QEvent::KeyPress) { diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp index 70aa3dd806..32009afd0f 100644 --- a/modules/gui/qt4/components/playlist/views.cpp +++ b/modules/gui/qt4/components/playlist/views.cpp @@ -160,7 +160,7 @@ void PlIconViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt painter->restore(); } -QSize PlIconViewItemDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const +QSize PlIconViewItemDelegate::sizeHint ( const QStyleOptionViewItem &, const QModelIndex & index ) const { QFont f( index.data( Qt::FontRole ).value() ); f.setBold( true ); @@ -257,7 +257,7 @@ void PlListViewItemDelegate::paint( QPainter * painter, const QStyleOptionViewIt painter->restore(); } -QSize PlListViewItemDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const +QSize PlListViewItemDelegate::sizeHint ( const QStyleOptionViewItem &, const QModelIndex & ) const { QFont f; f.setBold( true ); @@ -275,7 +275,7 @@ static inline void plViewStartDrag( QAbstractItemView *view, const Qt::DropActio drag->exec( supportedActions ); } -static void plViewDragMoveEvent( QAbstractItemView *view, QDragMoveEvent * event ) +static void plViewDragMoveEvent( QAbstractItemView *, QDragMoveEvent * event ) { if( event->keyboardModifiers() & Qt::ControlModifier && event->possibleActions() & Qt::CopyAction ) @@ -283,7 +283,7 @@ static void plViewDragMoveEvent( QAbstractItemView *view, QDragMoveEvent * event else event->acceptProposedAction(); } -PlIconView::PlIconView( PLModel *model, QWidget *parent ) : QListView( parent ) +PlIconView::PlIconView( PLModel *, QWidget *parent ) : QListView( parent ) { PlIconViewItemDelegate *delegate = new PlIconViewItemDelegate( this ); @@ -313,7 +313,7 @@ void PlIconView::dragMoveEvent ( QDragMoveEvent * event ) QAbstractItemView::dragMoveEvent( event ); } -PlListView::PlListView( PLModel *model, QWidget *parent ) : QListView( parent ) +PlListView::PlListView( PLModel *, QWidget *parent ) : QListView( parent ) { setViewMode( QListView::ListMode ); setUniformItemSizes( true ); @@ -393,7 +393,7 @@ int PicFlowView::verticalOffset() const return 0; } -QRect PicFlowView::visualRect(const QModelIndex &index ) const +QRect PicFlowView::visualRect(const QModelIndex & ) const { return QRect( QPoint(0,0), picFlow->slideSize() ); } @@ -420,7 +420,7 @@ QModelIndex PicFlowView::indexAt(const QPoint &) const // No idea, PictureFlow doesn't provide anything to help this } -QModelIndex PicFlowView::moveCursor(QAbstractItemView::CursorAction action, Qt::KeyboardModifiers) +QModelIndex PicFlowView::moveCursor(QAbstractItemView::CursorAction, Qt::KeyboardModifiers) { return QModelIndex(); } diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp index 1e1d5c1648..ed37d64959 100644 --- a/modules/gui/qt4/components/sout/sout_widgets.cpp +++ b/modules/gui/qt4/components/sout/sout_widgets.cpp @@ -232,7 +232,7 @@ MMSHDestBox::MMSHDestBox( QWidget *_parent ) : VirtualDestBox( _parent ) CT( MMSHEdit ); } -QString MMSHDestBox::getMRL( const QString& mux ) +QString MMSHDestBox::getMRL( const QString& ) { if( MMSHEdit->text().isEmpty() ) return ""; @@ -277,7 +277,7 @@ RTSPDestBox::RTSPDestBox( QWidget *_parent ) : VirtualDestBox( _parent ) CT( RTSPEdit ); } -QString RTSPDestBox::getMRL( const QString& mux ) +QString RTSPDestBox::getMRL( const QString& ) { if( RTSPEdit->text().isEmpty() ) return ""; @@ -435,7 +435,7 @@ ICEDestBox::ICEDestBox( QWidget *_parent ) : VirtualDestBox( _parent ) #undef CS #undef CT -QString ICEDestBox::getMRL( const QString& mux ) +QString ICEDestBox::getMRL( const QString& ) { if( ICEEdit->text().isEmpty() ) return ""; diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp index fb7821322f..002ea65562 100644 --- a/modules/gui/qt4/main_interface_win32.cpp +++ b/modules/gui/qt4/main_interface_win32.cpp @@ -135,12 +135,12 @@ void MainInterface::createTaskBarButtons() HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, winId(), himl ); if(S_OK != hr) - msg_Err( p_intf, "ThumbBarSetImageList failed with error %08x", hr ); + msg_Err( p_intf, "ThumbBarSetImageList failed with error %08lx", hr ); else { hr = p_taskbl->vt->ThumbBarAddButtons(p_taskbl, winId(), 3, thbButtons); if(S_OK != hr) - msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr ); + msg_Err( p_intf, "ThumbBarAddButtons failed with error %08lx", hr ); } CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, changeThumbbarButtons( int ) ); } @@ -288,7 +288,7 @@ void MainInterface::changeThumbbarButtons( int i_status) } HRESULT hr = p_taskbl->vt->ThumbBarUpdateButtons(p_taskbl, this->winId(), 3, thbButtons); if(S_OK != hr) - msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08x", hr ); + msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08lx", hr ); #endif } -- 2.11.4.GIT