Qt: kill a bunch of warnings

[vlc] / modules / gui / qt4 / components / playlist / standardpanel.hpp

diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index 4fb4ec7f28e7c181d353b5fd6b48ade895c21eaa..14c0791be8ded71669f595d20a702c2da3afc61c 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -37,6 +37,7 @@
 
 class QSignalMapper;
 class PLModel;
+class MLModel;
 class QKeyEvent;
 class QWheelEvent;
 class QStackedLayout;
@@ -46,34 +47,34 @@ class QAbstractItemView;
 class QTreeView;
 class PlIconView;
 class PlListView;
+class PicFlowView;
 
 class LocationBar;
 class PLSelector;
 class PlaylistWidget;
 
-static const QString viewNames[3 /* VIEW_COUNT */]
-                                = { qtr( "Detailed View" ),
-                                    qtr( "Icon View" ),
-                                    qtr( "List View" ) };
-
 class StandardPLPanel: public QWidget
 {
     Q_OBJECT
 
 public:
     StandardPLPanel( PlaylistWidget *, intf_thread_t *,
-                     playlist_t *, playlist_item_t *, PLSelector *, PLModel * );
+                     playlist_item_t *, PLSelector *, PLModel *, MLModel * );
     virtual ~StandardPLPanel();
 
-    enum { TREE_VIEW = 0,
-           ICON_VIEW,
+    enum { ICON_VIEW = 0,
+           TREE_VIEW ,
            LIST_VIEW,
-           VIEW_COUNT  };
+           PICTUREFLOW_VIEW,
+           VIEW_COUNT };
 
-protected:
+    int currentViewIndex() const;
 
+protected:
     PLModel *model;
+    MLModel *mlmodel;
     virtual void wheelEvent( QWheelEvent *e );
+
 private:
     intf_thread_t *p_intf;
 
@@ -82,11 +83,12 @@ private:
     QTreeView         *treeView;
     PlIconView        *iconView;
     PlListView        *listView;
+    PicFlowView       *picFlowView;
+
     QAbstractItemView *currentView;
 
     QStackedLayout    *viewStack;
 
-    int currentRootId;
     QSignalMapper *selectColumnsSigMapper;
 
     int lastActivatedId;
@@ -95,18 +97,20 @@ private:
     void createTreeView();
     void createIconView();
     void createListView();
+    void createCoverView();
+    void changeModel ( bool b_ml );
     bool eventFilter ( QObject * watched, QEvent * event );
 
 public slots:
-    void setRoot( playlist_item_t * );
+    void setRoot( playlist_item_t *, bool );
     void browseInto( const QModelIndex& );
-    void browseInto( );
 
 private slots:
     void deleteSelection();
     void handleExpansion( const QModelIndex& );
-    void handleRootChange();
     void activate( const QModelIndex & );
+
+    void browseInto();
     void browseInto( input_item_t * );
 
     void gotoPlayingItem();
@@ -125,4 +129,11 @@ signals:
     void viewChanged( const QModelIndex& );
 };
 
+
+static const QString viewNames[ StandardPLPanel::VIEW_COUNT ]
+                                = { qtr( "Icon View" ),
+                                    qtr( "Detailed View" ),
+                                    qtr( "List View" ),
+                                    qtr( "PictureFlow View ") };
+
 #endif