Qt: customize dialogs, fix a misswrite with the last item of a toolbar.

[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..8b591c793201cdf2a77933e53fa19a493359fdf5 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -22,8 +22,8 @@
  * 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"
@@ -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;