Qt: rename slots to explicit names

[vlc] / modules / gui / qt4 / components / controller_widget.hpp

diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index d6c622c0c2bb94d7188ddc682dc67028be5f38d0..5727da3cb1d03161e58855b17332ca57be33149a 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -34,8 +34,6 @@
 #include <QFrame>
 #include <QToolButton>
 
-#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
-
 class QLabel;
 class QSpinBox;
 class QAbstractSlider;
@@ -55,59 +53,46 @@ private slots:
     void updateButton( bool );
 };
 
-class AtoB_Button : public QToolButton
+class LoopButton : public QToolButton
 {
     Q_OBJECT
-private slots:
-    void setIcons( bool, bool );
+public slots:
+    void updateIcons( int );
 };
 
-class TeletextController : public QFrame
+class AtoB_Button : public QToolButton
 {
     Q_OBJECT
-    friend class AbstractController;
-private:
-    QToolButton         *telexTransparent, *telexOn;
-    QSpinBox            *telexPage;
-
 private slots:
-    void enableTeletextButtons( bool );
-    void toggleTeletextTransparency( bool );
+    void setIcons( bool, bool );
 };
 
 #define VOLUME_MAX 200
-class VolumeClickHandler;
-
 class SoundWidget : public QWidget
 {
     Q_OBJECT
-    friend class VolumeClickHandler;
 
 public:
-    SoundWidget( QWidget *parent, intf_thread_t  *_p_i, bool );
+    SoundWidget( QWidget *parent, intf_thread_t  *_p_i, bool,
+                 bool b_special = false );
+    virtual ~SoundWidget();
+    void setMuted( bool );
 
 private:
     intf_thread_t       *p_intf;
     QLabel              *volMuteLabel;
     QAbstractSlider     *volumeSlider;
-    VolumeClickHandler  *hVolLabel;
-    bool                 b_my_volume;
+    QFrame              *volumeControlWidget;
+    QMenu               *volumeMenu;
+    virtual bool eventFilter( QObject *obj, QEvent *e );
+    bool                b_is_muted;
 
 protected slots:
-    void updateVolume( int );
-    void updateVolume( void );
-};
-
-class VolumeClickHandler : public QObject
-{
-public:
-    VolumeClickHandler( intf_thread_t *_p_intf, SoundWidget *_m ) : QObject(_m)
-    {m = _m; p_intf = _p_intf; }
-    virtual ~VolumeClickHandler() {};
-    virtual bool eventFilter( QObject *obj, QEvent *e );
-private:
-    SoundWidget *m;
-    intf_thread_t *p_intf;
+    void userUpdateVolume( int );
+    void libUpdateVolume( void );
+    void updateMuteStatus( void );
+    void refreshLabels( void );
+    void showVolumeMenu( QPoint pos );
 };
 
 #endif