qt4: Don't create QMenu without parents

[vlc] / modules / gui / qt4 / dialogs / mediainfo.hpp

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index bdfdd811178ed94808787b4e8f0feb37fcf0719b..4343bb719d55b6a3bfe9034f96955a8275e6bff4 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -22,34 +22,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
 
-#ifndef _MEDIAINFO_DIALOG_H_
-#define _MEDIAINFO_DIALOG_H_
+#ifndef QVLC_MEDIAINFO_DIALOG_H_
+#define QVLC_MEDIAINFO_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "components/info_panels.hpp"
+#include "util/singleton.hpp"
 
 class QTabWidget;
 
-class MediaInfoDialog : public QVLCFrame
+class MediaInfoDialog : public QVLCFrame, public Singleton<MediaInfoDialog>
 {
     Q_OBJECT;
 public:
     MediaInfoDialog( intf_thread_t *,
-                     input_item_t * );
-
-    static MediaInfoDialog * getInstance( intf_thread_t *p_intf )
-    {
-        if( !instance) instance = new MediaInfoDialog( p_intf, NULL );
-        return instance;
-    }
-
-    static void killInstance()
-    {
-        if( instance ) delete instance;
-        instance = NULL;
-    }
-
-    virtual ~MediaInfoDialog();
+                     input_item_t * input = NULL );
 
     void showTab( int );
 #if 0
@@ -57,7 +44,8 @@ public:
 #endif
 
 private:
-    static MediaInfoDialog *instance;
+    virtual ~MediaInfoDialog();
+
     bool isMainInputInfo;
 
     QTabWidget *infoTabW;
@@ -77,6 +65,8 @@ private slots:
 
     void saveMeta();
     void updateButtons( int i_tab );
+
+    friend class    Singleton<MediaInfoDialog>;
 };
 
 #endif