From 4704ae3fc98d6bea83f3f4290d314cfabce16001 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Fri, 8 Jan 2010 00:02:14 +0100 Subject: [PATCH] Qt: rename slots to explicit names MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Denis-Courmont --- modules/gui/qt4/components/controller_widget.cpp | 10 +++++----- modules/gui/qt4/components/controller_widget.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp index 8775fe42db..7aac19d41e 100644 --- a/modules/gui/qt4/components/controller_widget.cpp +++ b/modules/gui/qt4/components/controller_widget.cpp @@ -115,12 +115,12 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf, VOLUME_MAX / (AOUT_VOLUME_MAX/2) ) ); /* Force the update at build time in order to have a muted icon if needed */ - updateVolume( volumeSlider->value() ); + userUpdateVolume( volumeSlider->value() ); /* Volume control connection */ CONNECT( volumeSlider, valueChanged( int ), this, refreshLabels( void ) ); - CONNECT( volumeSlider, sliderMoved( int ), this, updateVolume( int ) ); - CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) ); + CONNECT( volumeSlider, sliderMoved( int ), this, userUpdateVolume( int ) ); + CONNECT( THEMIM, volumeChanged( void ), this, libUpdateVolume( void ) ); CONNECT( THEMIM, soundMuteChanged( void ), this, updateMuteStatus( void ) ); } @@ -150,7 +150,7 @@ void SoundWidget::refreshLabels() } /* volumeSlider changed value event slot */ -void SoundWidget::updateVolume( int i_sliderVolume ) +void SoundWidget::userUpdateVolume( int i_sliderVolume ) { /* Only if volume is set by user action on slider */ setMuted( false ); @@ -161,7 +161,7 @@ void SoundWidget::updateVolume( int i_sliderVolume ) } /* libvlc changed value event slot */ -void SoundWidget::updateVolume() +void SoundWidget::libUpdateVolume() { /* Audio part */ audio_volume_t i_volume; diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp index 71864e90e4..5727da3cb1 100644 --- a/modules/gui/qt4/components/controller_widget.hpp +++ b/modules/gui/qt4/components/controller_widget.hpp @@ -88,8 +88,8 @@ private: bool b_is_muted; protected slots: - void updateVolume( int ); - void updateVolume( void ); + void userUpdateVolume( int ); + void libUpdateVolume( void ); void updateMuteStatus( void ); void refreshLabels( void ); void showVolumeMenu( QPoint pos ); -- 2.39.2