[vlc-commits] Qt, methods and slots renaming for consistency

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 22 14:04:14 2011 +0200| [91fcc5f73dcf9766ff39f4b6ec4adbd3480479fe] | committer: Jean-Baptiste Kempf

Qt, methods and slots renaming for consistency

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91fcc5f73dcf9766ff39f4b6ec4adbd3480479fe
---

 modules/gui/qt4/components/controller.cpp        |    8 ++++----
 modules/gui/qt4/components/controller_widget.cpp |    6 +++---
 modules/gui/qt4/components/controller_widget.hpp |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 24ec1d3..30a4eb6 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -237,7 +237,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
         BUTTON_SET_BAR(  playButton );
         CONNECT_MAP_SET( playButton, PLAY_ACTION );
         CONNECT( this, inputPlaying( bool ),
-                 playButton, updateButton( bool ));
+                 playButton, updateButtonIcons( bool ));
         widget = playButton;
         }
         break;
@@ -330,7 +330,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
         ENABLE_ON_INPUT( ABButton );
         CONNECT_MAP_SET( ABButton, ATOB_ACTION );
         CONNECT( THEMIM->getIM(), AtoBchanged( bool, bool),
-                 ABButton, setIcons( bool, bool ) );
+                 ABButton, updateButtonIcons( bool, bool ) );
         widget = ABButton;
         }
         break;
@@ -424,8 +424,8 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
         setupButton( loopButton );
         loopButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) );
         loopButton->setCheckable( true );
-        loopButton->updateIcons( NORMAL );
-        CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateIcons( int ) );
+        loopButton->updateButtonIcons( NORMAL );
+        CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateButtonIcons( int ) );
         CONNECT( loopButton, clicked(), THEMIM, loopRepeatLoopStatus() );
         widget = loopButton;
         }
diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 8411b18..e277015 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -232,14 +232,14 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
 /**
  * Play Button
  **/
-void PlayButton::updateButton( bool b_playing )
+void PlayButton::updateButtonIcons( bool b_playing )
 {
     setIcon( b_playing ? QIcon( ":/toolbar/pause_b" ) : QIcon( ":/toolbar/play_b" ) );
     setToolTip( b_playing ? qtr( "Pause the playback" )
                           : qtr( I_PLAY_TOOLTIP ) );
 }
 
-void AtoB_Button::setIcons( bool timeA, bool timeB )
+void AtoB_Button::updateButtonIcons( bool timeA, bool timeB )
 {
     if( !timeA && !timeB)
     {
@@ -259,7 +259,7 @@ void AtoB_Button::setIcons( bool timeA, bool timeB )
     }
 }
 
-void LoopButton::updateIcons( int value )
+void LoopButton::updateButtonIcons( int value )
 {
     setChecked( value != NORMAL );
     setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index b09fde8..c5d6b88 100644
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -50,21 +50,21 @@ class PlayButton : public QToolButton
 {
     Q_OBJECT
 private slots:
-    void updateButton( bool );
+    void updateButtonIcons( bool );
 };
 
 class LoopButton : public QToolButton
 {
     Q_OBJECT
 public slots:
-    void updateIcons( int );
+    void updateButtonIcons( int );
 };
 
 class AtoB_Button : public QToolButton
 {
     Q_OBJECT
 private slots:
-    void setIcons( bool, bool );
+    void updateButtonIcons( bool, bool );
 };
 
 #define VOLUME_MAX 200