[vlc-devel] [PATCH 1/8] gui/qt: interface_widgets: remove legacy code

Filip Roséen filip at atch.se
Mon Mar 20 13:41:51 CET 2017


The affected sections were disabled (wrapped in "#if 0") by
098dab901c1 back in July 2008 and has been untouched ever since.
---
 modules/gui/qt/components/interface_widgets.cpp | 54 -------------------------
 modules/gui/qt/components/interface_widgets.hpp | 16 --------
 2 files changed, 70 deletions(-)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 4f1deeeafc..660268268f 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -568,60 +568,6 @@ void EasterEggBackgroundWidget::paintEvent( QPaintEvent *e )
     BackgroundWidget::paintEvent( e );
 }
 
-#if 0
-#include <QPushButton>
-#include <QHBoxLayout>
-
-/**********************************************************************
- * Visualization selector panel
- **********************************************************************/
-VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
-                                QFrame( NULL ), p_intf( _p_i )
-{
-    QHBoxLayout *layout = new QHBoxLayout( this );
-    layout->setMargin( 0 );
-    QPushButton *prevButton = new QPushButton( "Prev" );
-    QPushButton *nextButton = new QPushButton( "Next" );
-    layout->addWidget( prevButton );
-    layout->addWidget( nextButton );
-
-    layout->addStretch( 10 );
-    layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
-
-    current = new QLabel( qtr( "None" ) );
-    layout->addWidget( current );
-
-    BUTTONACT( prevButton, prev() );
-    BUTTONACT( nextButton, next() );
-
-    setLayout( layout );
-    setMaximumHeight( 35 );
-}
-
-VisualSelector::~VisualSelector()
-{}
-
-void VisualSelector::prev()
-{
-    char *psz_new = aout_VisualPrev( p_intf );
-    if( psz_new )
-    {
-        current->setText( qfu( psz_new ) );
-        free( psz_new );
-    }
-}
-
-void VisualSelector::next()
-{
-    char *psz_new = aout_VisualNext( p_intf );
-    if( psz_new )
-    {
-        current->setText( qfu( psz_new ) );
-        free( psz_new );
-    }
-}
-#endif
-
 SpeedLabel::SpeedLabel( intf_thread_t *_p_intf, QWidget *parent )
            : QLabel( parent ), p_intf( _p_intf )
 {
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/components/interface_widgets.hpp
index 9d084a9031..40363002ff 100644
--- a/modules/gui/qt/components/interface_widgets.hpp
+++ b/modules/gui/qt/components/interface_widgets.hpp
@@ -153,22 +153,6 @@ private:
     static const int MAX_FLAKES = 1000;
 };
 
-#if 0
-class VisualSelector : public QFrame
-{
-    Q_OBJECT
-public:
-    VisualSelector( intf_thread_t *);
-    virtual ~VisualSelector();
-private:
-    intf_thread_t *p_intf;
-    QLabel *current;
-private slots:
-    void prev();
-    void next();
-};
-#endif
-
 class ClickableQLabel : public QLabel
 {
     Q_OBJECT
-- 
2.12.0


More information about the vlc-devel mailing list