[vlc-commits] Qt: cosmetics

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr 17 18:48:37 2011 +0200| [1d288ae6d256e7dd2f743eddd3717e0a24102941] | committer: Jean-Baptiste Kempf

Qt: cosmetics

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

 modules/gui/qt4/components/controller_widget.cpp |    5 ++---
 modules/gui/qt4/components/controller_widget.hpp |    7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 0eca5e8..3432025 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -35,7 +35,6 @@
 
 #include <QLabel>
 #include <QHBoxLayout>
-#include <QSpinBox>
 #include <QMenu>
 #include <QWidgetAction>
 #include <QMouseEvent>
@@ -164,8 +163,8 @@ void SoundWidget::libUpdateVolume()
 
     i_volume = aout_VolumeGet( p_playlist );
     i_volume = ( ( i_volume + 1 ) *  VOLUME_MAX )/ (AOUT_VOLUME_MAX/2);
-    int i_gauge = volumeSlider->value();
-    if ( i_volume - i_gauge != 0 )
+
+    if ( i_volume - volumeSlider->value() != 0 )
     {
         b_ignore_valuechanged = true;
         volumeSlider->setValue( i_volume );
diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index c800020..b09fde8 100644
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -31,10 +31,10 @@
 #include "qt4.hpp"
 
 #include <QWidget>
-#include <QFrame>
 #include <QToolButton>
 
 class QLabel;
+class QFrame;
 class QSpinBox;
 class QAbstractSlider;
 
@@ -78,13 +78,16 @@ public:
     virtual ~SoundWidget();
     void setMuted( bool );
 
+protected:
+    virtual bool eventFilter( QObject *obj, QEvent *e );
+
 private:
     intf_thread_t       *p_intf;
     QLabel              *volMuteLabel;
     QAbstractSlider     *volumeSlider;
     QFrame              *volumeControlWidget;
     QMenu               *volumeMenu;
-    virtual bool eventFilter( QObject *obj, QEvent *e );
+
     bool                b_is_muted;
     bool                b_ignore_valuechanged;