Qt4 - Cleaning trailing spaces...

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index eb8a996338a737b0576d69b847e1897d80ebd880..38325dc6d1cb296f09f58a350cc84821f4cf5ce6 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -417,7 +417,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
             sprintf( str, "%06X", val.i_int );
             lineedit->setText( str );
         }
-        else if( combobox ) combobox->setCurrentIndex( 
+        else if( combobox ) combobox->setCurrentIndex(
                             combobox->findData( val.i_int ) );
         else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
     }
@@ -431,7 +431,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
     else if( i_type == VLC_VAR_STRING )
     {
         if( lineedit ) lineedit->setText( qfu( val.psz_string ) );
-        else if( combobox ) combobox->setCurrentIndex( 
+        else if( combobox ) combobox->setCurrentIndex(
                             combobox->findData( qfu( val.psz_string ) ) );
         else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
         free( val.psz_string );
@@ -517,7 +517,7 @@ void ExtVideo::updateFilterOptions()
     {
         char *psz_string = NULL;
         if( lineedit ) psz_string = strdup( qtu( lineedit->text() ) );
-        else if( combobox ) psz_string = strdup( qtu( combobox->itemData( 
+        else if( combobox ) psz_string = strdup( qtu( combobox->itemData(
                                          combobox->currentIndex() ).toString() ) );
         else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
         config_PutPsz( p_intf, option.toStdString().c_str(), psz_string );

diff --git a/modules/gui/qt4/components/infopanels.hpp b/modules/gui/qt4/components/infopanels.hpp
index 0242723665cdaed342af75104cb40d1b3218c508..e8098998c0393a41cc5251d70873ed29846901df 100644 (file)
--- a/modules/gui/qt4/components/infopanels.hpp
+++ b/modules/gui/qt4/components/infopanels.hpp
@@ -56,7 +56,7 @@ public:
     virtual ~MetaPanel();
     void saveMeta();
     void setInput( input_item_t * );
- 
+
     bool isInEditMode();
     void setEditMode( bool );
 
@@ -88,7 +88,7 @@ public slots:
 
 private slots:
     void enterEditMode();
- 
+
 signals:
     void uriSet( QString );
     void editing();

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index b8b26a3804d9c7013951578ac667754d095366c1..6a558e96c337ba6411349b889b5a1af6e6cb0836 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -771,7 +771,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) :
     sizeList << 180 << 420 ;
     setSizes( sizeList );
     setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
-    
+
     /* In case we want to keep the splitter informations */
     settings->beginGroup( "playlist" );
     restoreState( settings->value("splitterSizes").toByteArray());

diff --git a/modules/gui/qt4/components/open.cpp b/modules/gui/qt4/components/open.cpp
index c55c6e97f172f83d0b08a36616a25c8bb8f8d3bd..cd496d1166e270560a5da405629461bf0c762e20 100644 (file)
--- a/modules/gui/qt4/components/open.cpp
+++ b/modules/gui/qt4/components/open.cpp
@@ -263,7 +263,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     CONNECT( ui.audioSpin, valueChanged( int ), this, updateMRL());
     CONNECT( ui.subtitlesSpin, valueChanged( int ), this, updateMRL());
 
-    /* Run once the updateButtons function in order to fill correctly the comboBoxes */    
+    /* Run once the updateButtons function in order to fill correctly the comboBoxes */
     updateButtons();
 }
 
@@ -390,7 +390,7 @@ void DiscOpenPanel::updateMRL()
 
 void DiscOpenPanel::browseDevice()
 {
-    QString dir = QFileDialog::getExistingDirectory( 0, 
+    QString dir = QFileDialog::getExistingDirectory( 0,
             qtr("Open a device or a VIDEO_TS directory") );
     if (!dir.isEmpty()) {
         ui.deviceCombo->setEditText( dir );

diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index f94f8c41650b65144953455a7d189403ee4b81a3..bc7d31a43f7a409f7e876177b1ec39255c0d5dad 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -63,7 +63,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
     layout->addWidget( closeButton, 1, 4, 1, 1);
     CONNECT( closeButton, clicked(), this, close() );
-    
+
     readSettings( "EPanel", QSize( 400, 300 ), QPoint( 450, 0 ) );
 }
 

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index 7bee623ce584566490f0f4d03b56305bc8f956c2..0195640176817d8b776ad81059049169fca5bf6b 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -51,9 +51,9 @@ public:
 
     void showTab( int );
     void setInput( input_item_t * );
- 
+
     bool b_need_update;
- 
+
 private:
     input_thread_t *p_input;
     static MediaInfoDialog *instance;
@@ -61,7 +61,7 @@ private:
     int i_runs;
     bool mainInput;
     bool stats;
- 
+
 
     QTabWidget *IT;
     InputStatsPanel *ISP;
@@ -75,7 +75,7 @@ private:
 public slots:
     void update();
     void update( input_item_t *, bool, bool );
- 
+
 
 private slots:
     void close();

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index b960d35c4ace478964419be5efa36caf9f2ada9b..301d5e2d7fbb2a3a07176aae682e4c64bbbdd6d0 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -211,7 +211,7 @@ void OpenDialog::toggleAdvancedPanel()
 /* If Cancel is pressed or escaped */
 void OpenDialog::cancel()
 {
-    for( int i = 0; i <= OPEN_TAB_MAX; i++ ) 
+    for( int i = 0; i <= OPEN_TAB_MAX; i++ )
         dynamic_cast<OpenPanel*>(ui.Tab->widget( i ))->clear();
     toggleVisible();
     if( isModal() ) reject();

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index ead03de0db917e4454b13f96d498fa04929012ef..c97c587533c3cd0b1259c6905064b7ec91faf74f 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -37,7 +37,7 @@
 
 PlaylistDialog *PlaylistDialog::instance = NULL;
 
-PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf ) 
+PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
                 : QVLCMW( _p_intf )
 {
     QWidget *main = new QWidget( this );
@@ -54,7 +54,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
 
 PlaylistDialog::~PlaylistDialog()
 {
-    writeSettings( "playlist" );    
+    writeSettings( "playlist" );
 }
 
 void PlaylistDialog::dropEvent(QDropEvent *event)

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index bbc78736bafadfb286ca17d780e11e39f6466a82..9f92b8dfcab54d3697092bb5cc19d52d32915768 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -147,7 +147,7 @@ void PrefsDialog::setAdvanced()
         main_panel_l->addWidget( advanced_panel );
     }
     advanced_panel->show();
-    
+
     all->setChecked( true );
 }
 
@@ -180,7 +180,7 @@ void PrefsDialog::setSmall()
         simple_panels[SPrefsDefaultCat] =  current_simple_panel;
         main_panel_l->addWidget( current_simple_panel  );
     }
-    
+
     current_simple_panel->show();
     small->setChecked( true );
 }
@@ -198,7 +198,7 @@ void PrefsDialog::changeSimplePanel( int number )
         simple_panels[number] = current_simple_panel;
         main_panel_l->addWidget( current_simple_panel  );
     }
-    
+
     current_simple_panel->show();
 }
 
@@ -218,7 +218,7 @@ void PrefsDialog::changeAdvPanel( QTreeWidgetItem *item )
     advanced_panel->show();
 }
 
-#if 0 
+#if 0
 /*Called from extended settings, is not used anymore, but could be useful one day*/
 void PrefsDialog::showModulePrefs( char *psz_module )
 {

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 46a4da79ef78464e9a84cd6d51f7fb7e07f10f9a..6fb83a6c963a59aab9b4fc8744c5fd8ac18c978e 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -299,7 +299,7 @@ void SoutDialog::updateMRL()
     if ( sout.b_mms ) counter++ ;
     if ( sout.b_rtp ) counter++ ;
     if ( sout.b_udp ) counter ++;
-    if ( sout.b_icecast ) counter ++; 
+    if ( sout.b_icecast ) counter ++;
 
 #define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
     SMUX( PSMux, "ps" );
@@ -360,7 +360,7 @@ void SoutDialog::updateMRL()
     {
 
 #define ISMORE() if ( more ) mrl.append( "," );
-#define ATLEASTONE() if ( counter ) mrl.append( "dst=" ); 
+#define ATLEASTONE() if ( counter ) mrl.append( "dst=" );
 
 #define CHECKMUX() \
        if( sout.psz_mux ) \
@@ -473,7 +473,7 @@ void SoutDialog::updateMRL()
         {
             // TODO
         }
-        
+
         if ( counter )
         {
             mrl.append( "}" );

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index eabb1cc87e791b73618c765c97730646b2404f2a..793a1be0a25629e96c7fb3927cf8d5bfc4928d42 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -57,7 +57,7 @@ public:
         return instance;
     };
     virtual ~VLMDialog();
- 
+
 private:
     VLMDialog( intf_thread_t *);
     static VLMDialog *instance;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index b2c9e0b70144b59ea968ff96d7a282601321caaa..e81f36c5628e3b2f3e3d9aa5027fe366b232173e 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -149,7 +149,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
                            | Qt::BottomDockWidgetArea );
 
     /************
-     * Menu Bar 
+     * Menu Bar
      ************/
     QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
 
@@ -177,7 +177,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     statusBar()->addPermanentWidget( timeLabel, 2 );
 
     /* timeLabel behaviour:
-       - double clicking opens the goto time dialog 
+       - double clicking opens the goto time dialog
        - right-clicking and clicking just toggle between remaining and
          elapsed time.*/
     CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() );
@@ -289,9 +289,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 MainInterface::~MainInterface()
 {
     if( playlistWidget ) playlistWidget->savingSettings( settings );
-    if( ExtendedDialog::exists() ) 
+    if( ExtendedDialog::exists() )
         ExtendedDialog::getInstance( p_intf )->savingSettings();
-    
+
     settings->beginGroup( "MainWindow" );
     settings->setValue( "playlist-floats", dockPL->isFloating() );
     settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
@@ -309,7 +309,7 @@ MainInterface::~MainInterface()
         var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
         vlc_object_release( p_playlist );
     }
-    
+
     p_intf->b_interaction = VLC_FALSE;
     var_DelCallback( p_intf, "interaction", InteractCallback, this );
 
@@ -470,7 +470,7 @@ void MainInterface::privacyDialog( QList<ConfigControl *> controls )
     privacy->exec();
 }
 
-//FIXME remove me at the end... 
+//FIXME remove me at the end...
 void MainInterface::debug()
 {
     msg_Dbg( p_intf, "size: %i - %i", controls->size().height(), controls->size().width() );
@@ -485,8 +485,8 @@ void MainInterface::debug()
    Since we can't know from the playlist Widget if we are inside a dock or not,
    because the playlist Widget can be called by THEDP, as a separate windows for
    the skins.
-   Maybe the other solution is to redefine the sizeHint() of the playlist and 
-   ask _parent->isFloating()... 
+   Maybe the other solution is to redefine the sizeHint() of the playlist and
+   ask _parent->isFloating()...
    If you think this would be better, please FIX it...
 */
 QSize MainInterface::sizeHint() const
@@ -652,7 +652,7 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
  **/
 void MainInterface::togglePlaylist()
 {
-    /* CREATION 
+    /* CREATION
     If no playlist exist, then create one and attach it to the DockPL*/
     if( !playlistWidget )
     {

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 9b5108d4fd0471bc47fe6684696d3e6b42ab2105..8363b92f8f7569cd72e2a932fa648c5d780a1d7f 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -156,7 +156,7 @@ vlc_module_begin();
                 ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
         add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT,
                 ERROR_TEXT, VLC_FALSE );
-        add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT, 
+        add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT,
                 UPDATER_LONGTEXT, VLC_FALSE );
 
         add_integer( "qt-pl-showflags",

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 59f205f3f40f16d0c42673641c366ad051d1d4d1..73240774d7ef23d7da2da4deaba5c72065960ae4 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -84,7 +84,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
                         : QAbstractSlider( _parent )
 {
     padding = 3;
-    
+
     f_step = ( _i_step * 100 ) / AOUT_VOLUME_MAX ;
     setRange( SOUNDMIN, b_hard ? (2 * SOUNDMAX) : SOUNDMAX  );
 
@@ -92,7 +92,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
 
     const QPixmap temp( ":/pixmaps/volume-slider-inside.png" );
     const QBitmap mask( temp.createHeuristicMask() );
-    
+
     setMinimumSize( pixOutside.size() );
 
     pixGradient = QPixmap( mask.size() );
@@ -178,7 +178,7 @@ void SoundSlider::paintEvent(QPaintEvent *e)
 {
     QPainter painter( this );
     const int offset = int( double( ( width() - 2 * padding ) * value() ) / maximum() );
-        
+
     const QRectF boundsG( 0, 0, offset , pixGradient.height() );
     painter.drawPixmap( boundsG, pixGradient, boundsG );