qt4: cleaning the singletons implementation.

diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 97870b3c979c20887b3d07b96ccb13ac5b90bfee..d42519e1726776e8d460280251e45df242006918 100644 (file)
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -66,11 +66,13 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
+        instance = NULL;
     }
-    virtual ~ActionsManager();
 
 private:
+    virtual ~ActionsManager();
+
     static ActionsManager *instance;
     ActionsManager( intf_thread_t  *_p_i, QObject *_parent );
     intf_thread_t       *p_intf;

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index b78a3ba47a6c39d412b5cec61a5c4025fda92919..0a303c0385257b6ac3ce6ee3e06ca57d563a8caf 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -615,8 +615,7 @@ ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
 
 ExtV4l2::~ExtV4l2()
 {
-    if( box )
-        delete box;
+    delete box;
 }
 
 void ExtV4l2::showEvent( QShowEvent *event )

diff --git a/modules/gui/qt4/dialogs/bookmarks.hpp b/modules/gui/qt4/dialogs/bookmarks.hpp
index eb85f7ea8c1dceac91500f43a27312fffe26cf59..3f77d924a47bae3bf69ed76f83d8bae6baa1f56a 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.hpp
+++ b/modules/gui/qt4/dialogs/bookmarks.hpp
@@ -42,12 +42,13 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~BookmarksDialog();
 private:
     BookmarksDialog( intf_thread_t * );
+    virtual ~BookmarksDialog();
+
     static BookmarksDialog *instance;
     void update();
     QTreeWidget *bookmarksList;

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index 93a23fffbf26279507e82fb6d7d0f44a7ee65e46..da5e29acc09375210e4b8b08ef76f991933cf523 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -42,13 +42,14 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~ExtendedDialog();
     void showTab( int i );
 private:
     ExtendedDialog( intf_thread_t * );
+    virtual ~ExtendedDialog();
+
     static ExtendedDialog *instance;
 
     SyncControls *syncW;

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index af4ea4fd9e82d7c41e860e841a832f02442d07a0..c6cde3a05be2b8409ce35ef8107d94c2f4c78012 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -50,12 +50,14 @@ public:
         return instance;
     }
     static void killInstance()
-    { if( instance ) delete instance; instance = NULL;}
-    virtual ~HelpDialog();
+    { delete instance; instance = NULL;}
 
 private:
     HelpDialog( intf_thread_t * );
+    virtual ~HelpDialog();
+
     static HelpDialog *instance;
+
 public slots:
     void close();
 };
@@ -99,7 +101,7 @@ public:
         return instance;
     }
     static void killInstance()
-    { if( instance ) delete instance; instance = NULL;}
+    { delete instance; instance = NULL;}
 
     void updateNotify( bool );
 

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index 98851d3ac1b0b0122878360d6defa7eea41a8167..8b591c793201cdf2a77933e53fa19a493359fdf5 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -45,18 +45,18 @@ public:
 
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
 
-    virtual ~MediaInfoDialog();
-
     void showTab( int );
 #if 0
     void setInput( input_item_t * );
 #endif
 
 private:
+    virtual ~MediaInfoDialog();
+
     static MediaInfoDialog *instance;
     bool isMainInputInfo;
 

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index 3b311dbf5c96fed68e19016412c1fff5a7b16790..def795d0e24692fdf59e4d1c7493231b2bbd5faa 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -47,14 +47,15 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
 
-    virtual ~MessagesDialog();
 
 private:
     MessagesDialog( intf_thread_t * );
+    virtual ~MessagesDialog();
+
     static MessagesDialog *instance;
     QTabWidget *mainTab;
     QSpinBox *verbosityBox;

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index 4b791e013b8f2a51264de9ae3cb3e0cdf245a274..bdaaa3380b1919542e62f8255888145af0bd9050 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -64,10 +64,9 @@ public:
 
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~OpenDialog();
 
     void showTab( int = OPEN_FILE_TAB );
     QString getMRL( bool b = true );
@@ -82,6 +81,7 @@ public slots:
 private:
     OpenDialog( QWidget *parent, intf_thread_t *, bool b_selectMode,
                 int _action_flag = 0, bool b_pl = true );
+    virtual ~OpenDialog();
 
     static OpenDialog *instance;
     input_thread_t *p_input;

diff --git a/modules/gui/qt4/dialogs/playlist.hpp b/modules/gui/qt4/dialogs/playlist.hpp
index 1aabccfca1e4c61b6d38a08186c690be0b9afd28..a27ed8e9f73ee0c5e63042f61eb43001805f7ba5 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.hpp
+++ b/modules/gui/qt4/dialogs/playlist.hpp
@@ -48,12 +48,12 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~PlaylistDialog();
 private:
     PlaylistDialog( intf_thread_t * );
+    virtual ~PlaylistDialog();
 
     void dropEvent( QDropEvent *);
     void dragEnterEvent( QDragEnterEvent * );

diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp
index d0d13d91f5d77c6ea39b386f6e419c450729912e..3fbb82f189be32bb8dfd84286e53f92f7fcf800e 100644 (file)
--- a/modules/gui/qt4/dialogs/toolbar.hpp
+++ b/modules/gui/qt4/dialogs/toolbar.hpp
@@ -69,13 +69,14 @@ public:
         return instance;
     }
     static void killInstance()
-    { if( instance ) delete instance; instance = NULL;}
-    virtual ~ToolbarEditDialog();
+    { delete instance; instance = NULL;}
     int getOptions() { return flatBox->isChecked() * WIDGET_FLAT +
                         bigBox->isChecked() * WIDGET_BIG +
                         !shinyBox->isChecked() * WIDGET_SHINY; }
 private:
     ToolbarEditDialog( intf_thread_t * );
+    virtual ~ToolbarEditDialog();
+
     static ToolbarEditDialog *instance;
 
     QCheckBox *flatBox, *bigBox, *shinyBox;

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 4ba6155ffa0048e89cb6a4077bdc3fb4aafa5ac6..d9854b8a1b9d6b2017bf381c5e6a8a5a843d2f19 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -103,14 +103,13 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
     static bool isAlive()
     {
         return ( instance != NULL );
     }
-    virtual ~DialogsProvider();
 
     QStringList showSimpleOpen( QString help = QString(),
                                 int filters = EXT_FILTER_MEDIA |
@@ -126,8 +125,10 @@ protected:
 
 private:
     DialogsProvider( intf_thread_t *);
-    intf_thread_t *p_intf;
+    virtual ~DialogsProvider();
     static DialogsProvider *instance;
+
+    intf_thread_t *p_intf;
     bool b_isDying;
 
     void openDialog( int );

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 0f81dab7a84a4dff84c703650dbc3858666308af..56f2c36373e9b6711be6ad1fb3ba471cc3660acb 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -213,9 +213,9 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
+        instance = NULL;
     }
-    virtual ~MainInputManager();
 
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
@@ -225,6 +225,8 @@ public:
 
 private:
     MainInputManager( intf_thread_t * );
+    virtual ~MainInputManager();
+
     static MainInputManager *instance;
 
     void customEvent( QEvent * );

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 4d2b622cf9bcd7d329e4e7d3b8dd173ca5b59bf0..6a8947939208472c93ddb0a7b037d9a2003a48f9 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -291,7 +291,7 @@ MainInterface::~MainInterface()
     ActionsManager::killInstance();
 
     /* Delete the FSC controller */
-    if( fullscreenControls ) delete fullscreenControls;
+    delete fullscreenControls;
 
     /* Save states */
     settings->beginGroup( "MainWindow" );

diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index d85051948e5e9139af2148cad3ab8a01837efd39..d3deb953460f48e89d36e868722d9e8771a2672b 100644 (file)
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -47,10 +47,9 @@ public:
     }
     static void killInstance()
     {
-        if( instance ) delete instance;
+        delete instance;
         instance = NULL;
     }
-    virtual ~RecentsMRL();
 
     void addRecent( const QString & );
     QList<QString> recents();
@@ -58,9 +57,12 @@ public:
 
 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;