Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / gui / qt4 / recents.hpp

diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index d85051948e5e9139af2148cad3ab8a01837efd39..88531ff1e28e1119a17adbc49779cd0d56524d21 100644 (file)
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -27,12 +27,11 @@
 #include "qt4.hpp"
 
 #include <QObject>
-#include <QList>
-#include <QString>
-#include <QRegExp>
-#include <QSignalMapper>
+class QStringList;
+class QRegExp;
+class QSignalMapper;
 
-#define RECENTS_LIST_SIZE 8
+#define RECENTS_LIST_SIZE 10
 
 class RecentsMRL : public QObject
 {
@@ -47,25 +46,28 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~RecentsMRL();
 
     void addRecent( const QString & );
-    QList<QString> recents();
+    QStringList recents();
+
     QSignalMapper *signalMapper;
 
 private:
     RecentsMRL( intf_thread_t* _p_intf );
-    void load();
-    void save();
+    virtual ~RecentsMRL();
+
     static RecentsMRL *instance;
-    intf_thread_t* p_intf;
-    QList<QString> *stack;
-    bool isActive;
-    QRegExp *filter;
 
+    intf_thread_t *p_intf;
+    QStringList   *stack;
+    QRegExp       *filter;
+    bool          isActive;
+
+    void load();
+    void save();
 public slots:
     void clear();
 };