Qt: cosmetics

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 0eca5e85502833994e027b091a4b8a70c619ad1f..3432025c8556ad03e318f7e1cd94dc727d2b5c0b 100644 (file)
--- 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 c800020ca2af3a1f86a5c84e125234c422cc7803..b09fde8eeedb21a6036460695a16f00c7e5763bd 100644 (file)
--- 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;