qt4: cleaning the singletons implementation.

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

diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index 29c65d948a4304cc0154e831b932b8a8d4700eef..d3deb953460f48e89d36e868722d9e8771a2672b 100644 (file)
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _RECENTS_H_
-#define _RECENTS_H_
+#ifndef QVLC_RECENTS_H_
+#define QVLC_RECENTS_H_
 
 #include "qt4.hpp"
 
@@ -38,9 +38,6 @@ class RecentsMRL : public QObject
 {
     Q_OBJECT
 
-signals:
-    void updated();
-
 public:
     static RecentsMRL* getInstance( intf_thread_t* p_intf )
     {
@@ -50,20 +47,22 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~RecentsMRL();
 
     void addRecent( const QString & );
-    QList<QString> recents(); 
+    QList<QString> recents();
     QSignalMapper *signalMapper;
 
 private:
     RecentsMRL( intf_thread_t* _p_intf );
+    virtual ~RecentsMRL();
+
+    static RecentsMRL *instance;
+
     void load();
     void save();
-    static RecentsMRL *instance;
     intf_thread_t* p_intf;
     QList<QString> *stack;
     bool isActive;