X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fplaylist%2Fplaylist_model.hpp;h=a097fa63ccde04b3970be195344bce27c994e0c1;hb=27eb534266dc5c7eb177f17c263dae59171d964d;hp=dd6ca2c51017f578a881ea67e2e3816b587f404b;hpb=c243a82ea99d0f3fd4bf42a41227cc07f95f4c10;p=vlc

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index dd6ca2c510..a097fa63cc 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -28,11 +28,13 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_playlist.h>
 #include "playlist_item.hpp"
 
+#include "qt4.hpp"
+
 #include <QModelIndex>
 #include <QObject>
 #include <QEvent>
@@ -48,10 +50,10 @@ class PLItem;
 #define DEPTH_PL -1
 #define DEPTH_SEL 1
 
-static int ItemUpdate_Type = QEvent::User + 2;
-static int ItemDelete_Type = QEvent::User + 3;
-static int ItemAppend_Type = QEvent::User + 4;
-static int PLUpdate_Type = QEvent::User + 5;
+static const int ItemUpdate_Type = QEvent::User + PLEventType + 2;
+static const int ItemDelete_Type = QEvent::User + PLEventType + 3;
+static const int ItemAppend_Type = QEvent::User + PLEventType + 4;
+static const int PLUpdate_Type   = QEvent::User + PLEventType + 5;
 
 class PLEvent : public QEvent
 {
@@ -94,8 +96,8 @@ public:
     int rowCount( const QModelIndex &parent = QModelIndex() ) const;
     int columnCount( const QModelIndex &parent = QModelIndex() ) const;
 
-    bool b_need_update;
-    int i_items_to_append;
+    /* Get current selection */
+    QStringList selectedURIs();
 
     void rebuild(); void rebuild( playlist_item_t * );
     bool hasRandom(); bool hasLoop(); bool hasRepeat();
@@ -114,7 +116,7 @@ public:
                       int row, int column, const QModelIndex &target );
     QStringList mimeTypes() const;
 
-    int shownFlags() {  return rootItem->i_showflags;  }
+    int shownFlags() { return rootItem->i_showflags;  }
 
 private:
     void addCallbacks();
@@ -172,10 +174,7 @@ private slots:
     void popupInfo();
     void popupStream();
     void popupSave();
-#ifdef WIN32
     void popupExplore();
-#endif
-
     void viewchanged( int );
 };