Commit 91fcc5f7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt, methods and slots renaming for consistency

parent 3dcf9aca
...@@ -237,7 +237,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -237,7 +237,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
BUTTON_SET_BAR( playButton ); BUTTON_SET_BAR( playButton );
CONNECT_MAP_SET( playButton, PLAY_ACTION ); CONNECT_MAP_SET( playButton, PLAY_ACTION );
CONNECT( this, inputPlaying( bool ), CONNECT( this, inputPlaying( bool ),
playButton, updateButton( bool )); playButton, updateButtonIcons( bool ));
widget = playButton; widget = playButton;
} }
break; break;
...@@ -330,7 +330,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -330,7 +330,7 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
ENABLE_ON_INPUT( ABButton ); ENABLE_ON_INPUT( ABButton );
CONNECT_MAP_SET( ABButton, ATOB_ACTION ); CONNECT_MAP_SET( ABButton, ATOB_ACTION );
CONNECT( THEMIM->getIM(), AtoBchanged( bool, bool), CONNECT( THEMIM->getIM(), AtoBchanged( bool, bool),
ABButton, setIcons( bool, bool ) ); ABButton, updateButtonIcons( bool, bool ) );
widget = ABButton; widget = ABButton;
} }
break; break;
...@@ -424,8 +424,8 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options ) ...@@ -424,8 +424,8 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
setupButton( loopButton ); setupButton( loopButton );
loopButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) ); loopButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) );
loopButton->setCheckable( true ); loopButton->setCheckable( true );
loopButton->updateIcons( NORMAL ); loopButton->updateButtonIcons( NORMAL );
CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateIcons( int ) ); CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateButtonIcons( int ) );
CONNECT( loopButton, clicked(), THEMIM, loopRepeatLoopStatus() ); CONNECT( loopButton, clicked(), THEMIM, loopRepeatLoopStatus() );
widget = loopButton; widget = loopButton;
} }
......
...@@ -232,14 +232,14 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e ) ...@@ -232,14 +232,14 @@ bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
/** /**
* Play Button * 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" ) ); setIcon( b_playing ? QIcon( ":/toolbar/pause_b" ) : QIcon( ":/toolbar/play_b" ) );
setToolTip( b_playing ? qtr( "Pause the playback" ) setToolTip( b_playing ? qtr( "Pause the playback" )
: qtr( I_PLAY_TOOLTIP ) ); : qtr( I_PLAY_TOOLTIP ) );
} }
void AtoB_Button::setIcons( bool timeA, bool timeB ) void AtoB_Button::updateButtonIcons( bool timeA, bool timeB )
{ {
if( !timeA && !timeB) if( !timeA && !timeB)
{ {
...@@ -259,7 +259,7 @@ void AtoB_Button::setIcons( bool timeA, bool 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 ); setChecked( value != NORMAL );
setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" ) setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
......
...@@ -50,21 +50,21 @@ class PlayButton : public QToolButton ...@@ -50,21 +50,21 @@ class PlayButton : public QToolButton
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
void updateButton( bool ); void updateButtonIcons( bool );
}; };
class LoopButton : public QToolButton class LoopButton : public QToolButton
{ {
Q_OBJECT Q_OBJECT
public slots: public slots:
void updateIcons( int ); void updateButtonIcons( int );
}; };
class AtoB_Button : public QToolButton class AtoB_Button : public QToolButton
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
void setIcons( bool, bool ); void updateButtonIcons( bool, bool );
}; };
#define VOLUME_MAX 200 #define VOLUME_MAX 200
......
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