Qt: Remove PLPanel upper class

diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index 89491796c403038339b0f626a3bf8870afa5be6e..7499c40e3d3261807e8ff69cb24c9ac3167f0fab 100644 (file)
--- a/modules/gui/qt4/components/playlist/panels.hpp
+++ b/modules/gui/qt4/components/playlist/panels.hpp
@@ -43,42 +43,29 @@ class PLModel;
 class QPushButton;
 class QKeyEvent;
 
-class PLPanel: public QWidget
+class StandardPLPanel: public QWidget
 {
-    Q_OBJECT;
-public:
-    PLPanel( PlaylistWidget *p, intf_thread_t *_p_intf ) : QWidget( p )
-    {
-        p_intf = _p_intf;
-        parent = p;
-    }
-    virtual ~PLPanel() {};
-protected:
-    intf_thread_t *p_intf;
-    QFrame *parent;
-public slots:
-    virtual void setRoot( playlist_item_t * ) = 0;
-};
-
+    Q_OBJECT
 
-class StandardPLPanel: public PLPanel
-{
-    Q_OBJECT;
 public:
     StandardPLPanel( PlaylistWidget *, intf_thread_t *,
                      playlist_t *,playlist_item_t * );
     virtual ~StandardPLPanel();
 protected:
+    friend class PlaylistWidget;
+
     virtual void keyPressEvent( QKeyEvent *e );
-protected:
+
     PLModel *model;
-    friend class PlaylistWidget;
 private:
+    intf_thread_t *p_intf;
+    QWidget *parent;
     QLabel *title;
     QTreeView *view;
     QPushButton *repeatButton, *randomButton, *addButton, *gotoPlayingButton;
     int currentRootId;
     QSignalMapper *selectColumnsSigMapper;
+
 public slots:
     void removeItem( int );
     virtual void setRoot( playlist_item_t * );

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 13aed92420f77e9341fce6c37bef556a4b1af720..72289164a069cecef5e0c4addc3d8c461a623ed5 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -40,7 +40,7 @@
 #include <QLabel>
 
 class PLSelector;
-class PLPanel;
+class StandardPLPanel;
 class QPushButton;
 class CoverArtLabel;
 class ArtLabel;
@@ -53,7 +53,7 @@ public:
     virtual ~PlaylistWidget();
 private:
     PLSelector *selector;
-    PLPanel *rightPanel;
+    StandardPLPanel *rightPanel;
     QPushButton *addButton;
     ArtLabel *art;
 protected:

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 8158ffa623d3dc886194c1cbd825c3dc1d545bb8..923a14cb040c8041df98bf3bedce763afd354bea 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -52,7 +52,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
                                   intf_thread_t *_p_intf,
                                   playlist_t *p_playlist,
                                   playlist_item_t *p_root ):
-                                  PLPanel( _parent, _p_intf )
+                                  QWidget( _parent ), p_intf( _p_intf )
 {
     model = new PLModel( p_playlist, p_intf, p_root, this );