Skip to content

V
vlc-2-2
Commit 9ad1dde8 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

qt4: missing const for QString.

parent 0ca0b5f9
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
modules/gui/qt4/components/extended_panels.cpp
View file @ 9ad1dde8
...@@ -133,10 +133,10 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ...@@ -133,10 +133,10 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) ) SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) )
SETUP_VFILTER( extract ) SETUP_VFILTER( extract )
SETUP_VFILTER_OPTION( extractComponentText, textChanged( QString ) ) SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) )
SETUP_VFILTER( colorthres ) SETUP_VFILTER( colorthres )
SETUP_VFILTER_OPTION( colorthresColorText, textChanged( QString ) ) SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) )
...@@ -196,7 +196,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ...@@ -196,7 +196,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) ) SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) )
SETUP_VFILTER( marq ) SETUP_VFILTER( marq )
SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( QString ) ) SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) ) SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) )
SETUP_VFILTER( logo ) SETUP_VFILTER( logo )
......
modules/gui/qt4/components/open_panels.cpp
View file @ 9ad1dde8
...@@ -99,7 +99,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -99,7 +99,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT( ui.subCheckBox, toggled( bool ), this, toggleSubtitleFrame( bool ) ); CONNECT( ui.subCheckBox, toggled( bool ), this, toggleSubtitleFrame( bool ) );
CONNECT( ui.fileListWidg, itemChanged( QListWidgetItem * ), this, updateMRL() ); CONNECT( ui.fileListWidg, itemChanged( QListWidgetItem * ), this, updateMRL() );
CONNECT( ui.subInput, textChanged( QString ), this, updateMRL() ); CONNECT( ui.subInput, textChanged( const QString& ), this, updateMRL() );
CONNECT( ui.alignSubComboBox, currentIndexChanged( int ), this, updateMRL() ); CONNECT( ui.alignSubComboBox, currentIndexChanged( int ), this, updateMRL() );
CONNECT( ui.sizeSubComboBox, currentIndexChanged( int ), this, updateMRL() ); CONNECT( ui.sizeSubComboBox, currentIndexChanged( int ), this, updateMRL() );
} }
...@@ -151,7 +151,7 @@ inline void FileOpenPanel::BuildOldPanel() ...@@ -151,7 +151,7 @@ inline void FileOpenPanel::BuildOldPanel()
// Add the DialogBox to the layout // Add the DialogBox to the layout
ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 ); ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 );
CONNECT( lineFileEdit, textChanged( QString ), this, updateMRL() ); CONNECT( lineFileEdit, textChanged( const QString& ), this, updateMRL() );
dialogBox->installEventFilter( this ); dialogBox->installEventFilter( this );
} }
...@@ -474,7 +474,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) : ...@@ -474,7 +474,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT( ui.protocolCombo, activated( int ), CONNECT( ui.protocolCombo, activated( int ),
this, updateProtocol( int ) ); this, updateProtocol( int ) );
CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() ); CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
CONNECT( ui.addressText, textChanged( QString ), this, updateMRL()); CONNECT( ui.addressText, textChanged( const QString& ), this, updateMRL());
ui.protocolCombo->addItem( "" ); ui.protocolCombo->addItem( "" );
ui.protocolCombo->addItem("HTTP", QVariant("http")); ui.protocolCombo->addItem("HTTP", QVariant("http"));
...@@ -700,7 +700,7 @@ void CaptureOpenPanel::initialize() ...@@ -700,7 +700,7 @@ void CaptureOpenPanel::initialize()
/* dshow CONNECTs */ /* dshow CONNECTs */
CuMRL( vdevDshowW->combo, currentIndexChanged ( int ) ); CuMRL( vdevDshowW->combo, currentIndexChanged ( int ) );
CuMRL( adevDshowW->combo, currentIndexChanged ( int ) ); CuMRL( adevDshowW->combo, currentIndexChanged ( int ) );
CuMRL( dshowVSizeLine, textChanged( QString ) ); CuMRL( dshowVSizeLine, textChanged( const QString& ) );
} }
/************** /**************
...@@ -802,8 +802,8 @@ void CaptureOpenPanel::initialize() ...@@ -802,8 +802,8 @@ void CaptureOpenPanel::initialize()
1, 0, 3, 1 ); 1, 0, 3, 1 );
/* v4l2 CONNECTs */ /* v4l2 CONNECTs */
CuMRL( v4l2VideoDevice, textChanged( QString ) ); CuMRL( v4l2VideoDevice, textChanged( const QString& ) );
CuMRL( v4l2AudioDevice, textChanged( QString ) ); CuMRL( v4l2AudioDevice, textChanged( const QString& ) );
CuMRL( v4l2StdBox, currentIndexChanged ( int ) ); CuMRL( v4l2StdBox, currentIndexChanged ( int ) );
} }
...@@ -846,8 +846,8 @@ void CaptureOpenPanel::initialize() ...@@ -846,8 +846,8 @@ void CaptureOpenPanel::initialize()
2, 0, 2, 1 ); 2, 0, 2, 1 );
/* v4l CONNECTs */ /* v4l CONNECTs */
CuMRL( v4lVideoDevice, textChanged( QString ) ); CuMRL( v4lVideoDevice, textChanged( const QString& ) );
CuMRL( v4lAudioDevice, textChanged( QString ) ); CuMRL( v4lAudioDevice, textChanged( const QString& ) );
CuMRL( v4lFreq, valueChanged ( int ) ); CuMRL( v4lFreq, valueChanged ( int ) );
CuMRL( v4lNormBox, currentIndexChanged ( int ) ); CuMRL( v4lNormBox, currentIndexChanged ( int ) );
} }
...@@ -903,7 +903,7 @@ void CaptureOpenPanel::initialize() ...@@ -903,7 +903,7 @@ void CaptureOpenPanel::initialize()
CuMRL( jackCaching, valueChanged( int ) ); CuMRL( jackCaching, valueChanged( int ) );
CuMRL( jackPace, stateChanged( int ) ); CuMRL( jackPace, stateChanged( int ) );
CuMRL( jackConnect, stateChanged( int ) ); CuMRL( jackConnect, stateChanged( int ) );
CuMRL( jackPortsSelected, textChanged( QString ) ); CuMRL( jackPortsSelected, textChanged( const QString& ) );
} }
/************ /************
...@@ -954,8 +954,8 @@ void CaptureOpenPanel::initialize() ...@@ -954,8 +954,8 @@ void CaptureOpenPanel::initialize()
3, 0, 1, 1 ); 3, 0, 1, 1 );
/* PVR CONNECTs */ /* PVR CONNECTs */
CuMRL( pvrDevice, textChanged( QString ) ); CuMRL( pvrDevice, textChanged( const QString& ) );
CuMRL( pvrRadioDevice, textChanged( QString ) ); CuMRL( pvrRadioDevice, textChanged( const QString& ) );
CuMRL( pvrFreq, valueChanged ( int ) ); CuMRL( pvrFreq, valueChanged ( int ) );
CuMRL( pvrBitr, valueChanged ( int ) ); CuMRL( pvrBitr, valueChanged ( int ) );
......
modules/gui/qt4/components/open_panels.hpp
View file @ 9ad1dde8
...@@ -91,8 +91,8 @@ protected: ...@@ -91,8 +91,8 @@ protected:
public slots: public slots:
virtual void updateMRL() = 0; virtual void updateMRL() = 0;
signals: signals:
void mrlUpdated( QStringList, QString ); void mrlUpdated( const QStringList&, const QString& );
void methodChanged( QString method ); void methodChanged( const QString& method );
}; };
class FileOpenBox: public QFileDialog class FileOpenBox: public QFileDialog
......
modules/gui/qt4/components/playlist/panels.hpp
View file @ 9ad1dde8
...@@ -86,7 +86,7 @@ private slots: ...@@ -86,7 +86,7 @@ private slots:
void toggleRepeat(); void toggleRepeat();
void gotoPlayingItem(); void gotoPlayingItem();
void doPopup( QModelIndex index, QPoint point ); void doPopup( QModelIndex index, QPoint point );
void search( QString search ); void search( const QString& searchText );
void setCurrentRootId( int ); void setCurrentRootId( int );
void popupAdd(); void popupAdd();
void popupSelectColumn( QPoint ); void popupSelectColumn( QPoint );
......
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @ 9ad1dde8
...@@ -162,7 +162,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent, ...@@ -162,7 +162,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
SearchLineEdit *search = new SearchLineEdit( this ); SearchLineEdit *search = new SearchLineEdit( this );
buttons->addWidget( search ); buttons->addWidget( search );
filter->setBuddy( search ); filter->setBuddy( search );
CONNECT( search, textChanged( QString ), this, search( QString ) ); CONNECT( search, textChanged( const QString& ), this, search( const QString& ) );
/* Finish the layout */ /* Finish the layout */
layout->addWidget( view ); layout->addWidget( view );
...@@ -278,7 +278,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos ) ...@@ -278,7 +278,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
} }
/* Search in the playlist */ /* Search in the playlist */
void StandardPLPanel::search( QString searchText ) void StandardPLPanel::search( const QString& searchText )
{ {
model->search( searchText ); model->search( searchText );
} }
......
modules/gui/qt4/components/sout/sout_widgets.cpp
View file @ 9ad1dde8
...@@ -76,7 +76,7 @@ void SoutInputBox::setMRL( const QString& mrl ) ...@@ -76,7 +76,7 @@ void SoutInputBox::setMRL( const QString& mrl )
sourceValueLabel->setText( type ); sourceValueLabel->setText( type );
} }
#define CT( x ) connect( x, SIGNAL( textChanged( const QString ) ), this, SIGNAL( mrlUpdated() ) ); #define CT( x ) connect( x, SIGNAL( textChanged( const QString& ) ), this, SIGNAL( mrlUpdated() ) );
#define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) ); #define CS( x ) connect( x, SIGNAL( valueChanged( int ) ), this, SIGNAL( mrlUpdated() ) );
/* FileDest Box */ /* FileDest Box */
......
modules/gui/qt4/dialogs/open.cpp
View file @ 9ad1dde8
...@@ -142,27 +142,27 @@ OpenDialog::OpenDialog( QWidget *parent, ...@@ -142,27 +142,27 @@ OpenDialog::OpenDialog( QWidget *parent,
/* Force MRL update on tab change */ /* Force MRL update on tab change */
CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent( int ) ); CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent( int ) );
CONNECT( fileOpenPanel, mrlUpdated( QStringList, QString ), CONNECT( fileOpenPanel, mrlUpdated( const QStringList&, const QString& ),
this, updateMRL( const QStringList&, const QString& ) ); this, updateMRL( const QStringList&, const QString& ) );
CONNECT( netOpenPanel, mrlUpdated( QStringList, QString ), CONNECT( netOpenPanel, mrlUpdated( const QStringList&, const QString& ),
this, updateMRL( const QStringList&, const QString& ) ); this, updateMRL( const QStringList&, const QString& ) );
CONNECT( discOpenPanel, mrlUpdated( QStringList, QString ), CONNECT( discOpenPanel, mrlUpdated( const QStringList&, const QString& ),
this, updateMRL( const QStringList&, const QString& ) ); this, updateMRL( const QStringList&, const QString& ) );
CONNECT( captureOpenPanel, mrlUpdated( QStringList, QString ), CONNECT( captureOpenPanel, mrlUpdated( const QStringList&, const QString& ),
this, updateMRL( const QStringList&, const QString& ) ); this, updateMRL( const QStringList&, const QString& ) );
CONNECT( fileOpenPanel, methodChanged( QString ), CONNECT( fileOpenPanel, methodChanged( const QString& ),
this, newCachingMethod( const QString& ) ); this, newCachingMethod( const QString& ) );
CONNECT( netOpenPanel, methodChanged( QString ), CONNECT( netOpenPanel, methodChanged( const QString& ),
this, newCachingMethod( const QString& ) ); this, newCachingMethod( const QString& ) );
CONNECT( discOpenPanel, methodChanged( QString ), CONNECT( discOpenPanel, methodChanged( const QString& ),
this, newCachingMethod( const QString& ) ); this, newCachingMethod( const QString& ) );
CONNECT( captureOpenPanel, methodChanged( QString ), CONNECT( captureOpenPanel, methodChanged( const QString& ),
this, newCachingMethod( const QString& ) ); this, newCachingMethod( const QString& ) );
/* Advanced frame Connects */ /* Advanced frame Connects */
CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() ); CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() );
CONNECT( ui.slaveText, textChanged( QString ), this, updateMRL() ); CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() );
CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() ); CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() );
CONNECT( ui.startTimeSpinBox, valueChanged( int ), this, updateMRL() ); CONNECT( ui.startTimeSpinBox, valueChanged( int ), this, updateMRL() );
BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() ); BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );
......
modules/gui/qt4/dialogs/plugins.cpp
View file @ 9ad1dde8
...@@ -76,7 +76,7 @@ PluginDialog::PluginDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf ) ...@@ -76,7 +76,7 @@ PluginDialog::PluginDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
layout->addWidget( label, 1, 0 ); layout->addWidget( label, 1, 0 );
layout->addWidget( edit, 1, 1, 1, -1 ); layout->addWidget( edit, 1, 1, 1, -1 );
CONNECT( edit, textChanged( QString ), CONNECT( edit, textChanged( const QString& ),
this, search( const QString& ) ); this, search( const QString& ) );
QDialogButtonBox *box = new QDialogButtonBox; QDialogButtonBox *box = new QDialogButtonBox;
......
modules/gui/qt4/dialogs/sout.cpp
View file @ 9ad1dde8
...@@ -80,7 +80,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString& ...@@ -80,7 +80,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
// /* Connect everything to the updateMRL function */ // /* Connect everything to the updateMRL function */
#define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() ); #define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
#define CT( x ) CONNECT( ui.x, textChanged( const QString ), this, updateMRL() ); #define CT( x ) CONNECT( ui.x, textChanged( const QString& ), this, updateMRL() );
#define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() ); #define CS( x ) CONNECT( ui.x, valueChanged( int ), this, updateMRL() );
#define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() ); #define CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
......
modules/gui/qt4/util/customwidgets.cpp
View file @ 9ad1dde8
...@@ -125,8 +125,8 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent ) ...@@ -125,8 +125,8 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent )
searchLine->setFrame( false ); searchLine->setFrame( false );
searchLine->setMinimumWidth( 80 ); searchLine->setMinimumWidth( 80 );
CONNECT( searchLine, textChanged( const QString ), CONNECT( searchLine, textChanged( const QString& ),
this, updateText( const QString ) ); this, updateText( const QString& ) );
frameLayout->addWidget( searchLine ); frameLayout->addWidget( searchLine );
clearButton = new QToolButton; clearButton = new QToolButton;
...@@ -140,7 +140,7 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent ) ...@@ -140,7 +140,7 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent )
frameLayout->addWidget( clearButton ); frameLayout->addWidget( clearButton );
} }
void SearchLineEdit::updateText( const QString text ) void SearchLineEdit::updateText( const QString& text )
{ {
clearButton->setVisible( !text.isEmpty() ); clearButton->setVisible( !text.isEmpty() );
emit textChanged( text ); emit textChanged( text );
......
modules/gui/qt4/util/customwidgets.hpp
View file @ 9ad1dde8
...@@ -68,10 +68,10 @@ private: ...@@ -68,10 +68,10 @@ private:
QToolButton *clearButton; QToolButton *clearButton;
private slots: private slots:
void updateText( const QString ); void updateText( const QString& );
signals: signals:
void textChanged( const QString ); void textChanged( const QString& );
}; };
/***************************************************************** /*****************************************************************
......
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