qt4: missing const for QString.

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 0a303c0385257b6ac3ce6ee3e06ca57d563a8caf..7fbaf4f4778d705330f6cfe8f036f5b59aa47991 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -133,10 +133,10 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) )
 
     SETUP_VFILTER( extract )
-    SETUP_VFILTER_OPTION( extractComponentText, textChanged( QString ) )
+    SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) )
 
     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( colorthresSimilaritythresSlider, valueChanged( int ) )
 
@@ -196,7 +196,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) )
 
     SETUP_VFILTER( marq )
-    SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( QString ) )
+    SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) )
     SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) )
 
     SETUP_VFILTER( logo )

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 75900fe094d1853401be0abcfcedad9e5dc9b67c..48991440e4e51e9830c8db489645b01845f9cb0d 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -99,7 +99,7 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CONNECT( ui.subCheckBox, toggled( bool ), this, toggleSubtitleFrame( bool ) );
 
     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.sizeSubComboBox, currentIndexChanged( int ), this, updateMRL() );
 }
@@ -151,7 +151,7 @@ inline void FileOpenPanel::BuildOldPanel()
     // Add the DialogBox to the layout
     ui.gridLayout->addWidget( dialogBox, 0, 0, 1, 3 );
 
-    CONNECT( lineFileEdit, textChanged( QString ), this, updateMRL() );
+    CONNECT( lineFileEdit, textChanged( const QString& ), this, updateMRL() );
     dialogBox->installEventFilter( this );
 }
 
@@ -474,7 +474,7 @@ NetOpenPanel::NetOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CONNECT( ui.protocolCombo, activated( int ),
              this, updateProtocol( int ) );
     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("HTTP", QVariant("http"));
@@ -700,7 +700,7 @@ void CaptureOpenPanel::initialize()
     /* dshow CONNECTs */
     CuMRL( vdevDshowW->combo, currentIndexChanged ( int ) );
     CuMRL( adevDshowW->combo, currentIndexChanged ( int ) );
-    CuMRL( dshowVSizeLine, textChanged( QString ) );
+    CuMRL( dshowVSizeLine, textChanged( const QString& ) );
     }
 
     /**************
@@ -802,8 +802,8 @@ void CaptureOpenPanel::initialize()
             1, 0, 3, 1 );
 
     /* v4l2 CONNECTs */
-    CuMRL( v4l2VideoDevice, textChanged( QString ) );
-    CuMRL( v4l2AudioDevice, textChanged( QString ) );
+    CuMRL( v4l2VideoDevice, textChanged( const QString& ) );
+    CuMRL( v4l2AudioDevice, textChanged( const QString& ) );
     CuMRL( v4l2StdBox,  currentIndexChanged ( int ) );
     }
 
@@ -846,8 +846,8 @@ void CaptureOpenPanel::initialize()
             2, 0, 2, 1 );
 
     /* v4l CONNECTs */
-    CuMRL( v4lVideoDevice, textChanged( QString ) );
-    CuMRL( v4lAudioDevice, textChanged( QString ) );
+    CuMRL( v4lVideoDevice, textChanged( const QString& ) );
+    CuMRL( v4lAudioDevice, textChanged( const QString& ) );
     CuMRL( v4lFreq, valueChanged ( int ) );
     CuMRL( v4lNormBox,  currentIndexChanged ( int ) );
     }
@@ -903,7 +903,7 @@ void CaptureOpenPanel::initialize()
     CuMRL( jackCaching, valueChanged( int ) );
     CuMRL( jackPace, stateChanged( int ) );
     CuMRL( jackConnect, stateChanged( int ) );
-    CuMRL( jackPortsSelected, textChanged( QString ) );
+    CuMRL( jackPortsSelected, textChanged( const QString& ) );
     }
 
     /************
@@ -954,8 +954,8 @@ void CaptureOpenPanel::initialize()
             3, 0, 1, 1 );
 
     /* PVR CONNECTs */
-    CuMRL( pvrDevice, textChanged( QString ) );
-    CuMRL( pvrRadioDevice, textChanged( QString ) );
+    CuMRL( pvrDevice, textChanged( const QString& ) );
+    CuMRL( pvrRadioDevice, textChanged( const QString& ) );
 
     CuMRL( pvrFreq, valueChanged ( int ) );
     CuMRL( pvrBitr, valueChanged ( int ) );

diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 76b8c5c39af638cc37f940b918344f97a51963e6..d4f9bf7ea63c0f8758685d1578b099f321061291 100644 (file)
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -91,8 +91,8 @@ protected:
 public slots:
     virtual void updateMRL() = 0;
 signals:
-    void mrlUpdated( QStringList, QString );
-    void methodChanged( QString method );
+    void mrlUpdated( const QStringList&, const QString& );
+    void methodChanged( const QString& method );
 };
 
 class FileOpenBox: public QFileDialog

diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index 671b09289a96f6e3a78276b318895d3391203b6f..18915649393a3c8f8e81a471736b385c9e19508c 100644 (file)
--- a/modules/gui/qt4/components/playlist/panels.hpp
+++ b/modules/gui/qt4/components/playlist/panels.hpp
@@ -86,7 +86,7 @@ private slots:
     void toggleRepeat();
     void gotoPlayingItem();
     void doPopup( QModelIndex index, QPoint point );
-    void search( QString search );
+    void search( const QString& searchText );
     void setCurrentRootId( int );
     void popupAdd();
     void popupSelectColumn( QPoint );

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 15bceb5fc89736aef7fef01a359248f3fe7b6d15..d2eb628f5c80072ad7ac60b68e678b4694a6bf7e 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -162,7 +162,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
     SearchLineEdit *search = new SearchLineEdit( this );
     buttons->addWidget( search );
     filter->setBuddy( search );
-    CONNECT( search, textChanged( QString ), this, search( QString ) );
+    CONNECT( search, textChanged( const QString& ), this, search( const QString& ) );
 
     /* Finish the layout */
     layout->addWidget( view );
@@ -278,7 +278,7 @@ void StandardPLPanel::popupSelectColumn( QPoint pos )
 }
 
 /* Search in the playlist */
-void StandardPLPanel::search( QString searchText )
+void StandardPLPanel::search( const QString& searchText )
 {
     model->search( searchText );
 }

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index b7854970bef45cb0554039d2aa7d4d5847c3f94f..2c770427d5fef3294eef42a232d03f91ae58ee81 100644 (file)
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -76,7 +76,7 @@ void SoutInputBox::setMRL( const QString& mrl )
     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() ) );
 
 /* FileDest Box */

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index e6a996224b8656c990875e806fbc18bc90ec2fc4..90b36244fe77cadc9eb1856cc1c11a73c5edc3b7 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -142,27 +142,27 @@ OpenDialog::OpenDialog( QWidget *parent,
     /* Force MRL update on tab change */
     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& ) );
-    CONNECT( netOpenPanel, mrlUpdated( QStringList, QString ),
+    CONNECT( netOpenPanel, mrlUpdated( 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& ) );
-    CONNECT( captureOpenPanel, mrlUpdated( QStringList, QString ),
+    CONNECT( captureOpenPanel, mrlUpdated( const QStringList&, const QString& ),
              this, updateMRL( const QStringList&, const QString& ) );
 
-    CONNECT( fileOpenPanel, methodChanged( QString ),
+    CONNECT( fileOpenPanel, methodChanged( const QString& ),
              this, newCachingMethod( const QString& ) );
-    CONNECT( netOpenPanel, methodChanged( QString ),
+    CONNECT( netOpenPanel, methodChanged( const QString& ),
              this, newCachingMethod( const QString& ) );
-    CONNECT( discOpenPanel, methodChanged( QString ),
+    CONNECT( discOpenPanel, methodChanged( const QString& ),
              this, newCachingMethod( const QString& ) );
-    CONNECT( captureOpenPanel, methodChanged( QString ),
+    CONNECT( captureOpenPanel, methodChanged( const QString& ),
              this, newCachingMethod( const QString& ) );
 
     /* Advanced frame Connects */
     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.startTimeSpinBox, valueChanged( int ), this, updateMRL() );
     BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );

diff --git a/modules/gui/qt4/dialogs/plugins.cpp b/modules/gui/qt4/dialogs/plugins.cpp
index 3374028a5390789dc8bd9713185190c85bee2949..886bc708b9c35d10f3aec76a308e28bfad161244 100644 (file)
--- a/modules/gui/qt4/dialogs/plugins.cpp
+++ b/modules/gui/qt4/dialogs/plugins.cpp
@@ -76,7 +76,7 @@ PluginDialog::PluginDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 
     layout->addWidget( label, 1, 0 );
     layout->addWidget( edit, 1, 1, 1, -1 );
-    CONNECT( edit, textChanged( QString ),
+    CONNECT( edit, textChanged( const QString& ),
             this, search( const QString& ) );
 
     QDialogButtonBox *box = new QDialogButtonBox;

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 361a6c0191000e2d2900cbd3238b49edc0c1f51c..d7a44f59e47fb2d36692afe2357090bc2a17af2b 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -80,7 +80,7 @@ SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf, const QString&
 
 //     /* Connect everything to the updateMRL function */
  #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 CC( x ) CONNECT( ui.x, currentIndexChanged( int ), this, updateMRL() );
 

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index 52a32f5184423d9673b294f6a424088074ef60d1..3c7b439994e340eeb74b883ef431ecb4526982e4 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -125,8 +125,8 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent )
     searchLine->setFrame( false );
     searchLine->setMinimumWidth( 80 );
 
-    CONNECT( searchLine, textChanged( const QString ),
-             this, updateText( const QString ) );
+    CONNECT( searchLine, textChanged( const QString& ),
+             this, updateText( const QString& ) );
     frameLayout->addWidget( searchLine );
 
     clearButton = new QToolButton;
@@ -140,7 +140,7 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QFrame( parent )
     frameLayout->addWidget( clearButton );
 }
 
-void SearchLineEdit::updateText( const QString text )
+void SearchLineEdit::updateText( const QString& text )
 {
     clearButton->setVisible( !text.isEmpty() );
     emit textChanged( text );

diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp
index 431e857a1f95838b3b2cec3323c471ef53ca2111..d1f1f74809fe72f199e58507ea2a52763f1d62e5 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -68,10 +68,10 @@ private:
     QToolButton   *clearButton;
 
 private slots:
-    void updateText( const QString );
+    void updateText( const QString& );
 
 signals:
-    void textChanged( const QString );
+    void textChanged( const QString& );
 };
 
 /*****************************************************************