Qt: PlaylistWidget parenting and code cleanup/simplifications

modules/gui/qt4/components/playlist/playlist.cpp

@@ -40,7 +40,8 @@
  * Playlist Widget. The embedded playlist
  **********************************************************************/
 
-PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) : p_intf ( _p_i )
+PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
+               : QSplitter( _par ), p_intf ( _p_i )
 {
     setContentsMargins( 3, 3, 3, 3 );
 

modules/gui/qt4/components/playlist/playlist.hpp

 /*****************************************************************************
  * interface_widgets.hpp : Playlist Widgets
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -19,8 +19,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _PLAYLISTWIDGET_H_
@@ -33,29 +33,39 @@
 #include "qt4.hpp"
 
 #include "dialogs_provider.hpp"              /* Media Info from ArtLabel */
-#include "components/interface_widgets.hpp"
+#include "components/interface_widgets.hpp"  /* CoverArt */
 //#include <vlc_playlist.h>
 
 #include <QSplitter>
-#include <QLabel>
 
 class PLSelector;
 class StandardPLPanel;
 class QPushButton;
-class CoverArtLabel;
-class ArtLabel;
+
+class ArtLabel : public CoverArtLabel
+{
+public:
+    ArtLabel( QWidget *parent, intf_thread_t *intf )
+            : CoverArtLabel( parent, intf ) {};
+
+    virtual void mouseDoubleClickEvent( QMouseEvent *event )
+    {
+        THEDP->mediaInfoDialog();
+        event->accept();
+    }
+};
 
 class PlaylistWidget : public QSplitter
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
-    PlaylistWidget( intf_thread_t *_p_i );
+    PlaylistWidget( intf_thread_t *_p_i, QWidget * );
     virtual ~PlaylistWidget();
 private:
     PLSelector      *selector;
+    ArtLabel        *art;
     StandardPLPanel *rightPanel;
     QPushButton     *addButton;
-    ArtLabel *art;
 protected:
     intf_thread_t *p_intf;
     virtual void dropEvent( QDropEvent *);
@@ -63,22 +73,4 @@ protected:
     virtual void closeEvent( QCloseEvent * );
 };
 
-class ArtLabel : public CoverArtLabel
-{
-    Q_OBJECT
-public:
-    ArtLabel( QWidget *parent, intf_thread_t *intf )
-            : CoverArtLabel( parent, intf ) {};
-    virtual void mouseDoubleClickEvent( QMouseEvent *event )
-    {
-        THEDP->mediaInfoDialog();
-        event->accept();
-    }
-};
-
-enum PLEventType {
-    ItemAddedEv = QEvent::User,
-    ItemRemovedEv
-};
-
 #endif

modules/gui/qt4/dialogs/playlist.cpp

@@ -48,7 +48,7 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
 
     getSettings()->beginGroup("playlistdialog");
 
-    playlistWidget = new PlaylistWidget( p_intf );
+    playlistWidget = new PlaylistWidget( p_intf, this );
     l->addWidget( playlistWidget );
 
     readSettings( getSettings(), QSize( 600,700 ) );

modules/gui/qt4/main_interface.cpp

@@ -913,7 +913,7 @@ int MainInterface::controlVideo( int i_query, va_list args )
  **/
 void MainInterface::createPlaylist( bool b_show )
 {
-    playlistWidget = new PlaylistWidget( p_intf );
+    playlistWidget = new PlaylistWidget( p_intf, this );
 
     i_pl_dock = PL_BOTTOM;
     /* i_pl_dock = (pl_dock_e)getSettings()