Qt: Avoid using dangling pointers and fix memleaks

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 4c5b1fd5ec0f6b9a665c7f24d94f7d7753379f18..8a69193fe2ebb949b94b76a4bcb55f4acfd31ccb 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -29,7 +29,7 @@
 
 #include "util/qvlcframe.hpp"
 
-#ifdef WIN32
+#ifdef _WIN32
  #include <vlc_windows_interfaces.h>
 #endif
 
@@ -93,7 +93,7 @@ public:
 protected:
     void dropEventPlay( QDropEvent* event, bool b_play ) { dropEventPlay(event, b_play, true); }
     void dropEventPlay( QDropEvent *, bool, bool );
-#ifdef WIN32
+#ifdef _WIN32
     virtual bool winEvent( MSG *, long * );
 #endif
     virtual void changeEvent( QEvent * );
@@ -174,7 +174,8 @@ private:
     bool                 b_hasPausedWhenMinimized;
     bool                 b_statusbarVisible;
 
-#ifdef WIN32
+#ifdef _WIN32
+    HWND WinId();
     HIMAGELIST himl;
     ITaskbarList3 *p_taskbl;
     UINT taskbar_wmsg;
@@ -199,7 +200,7 @@ public slots:
     void setPlaylistVisibility(bool b_visible);
 
     void popupMenu( const QPoint& );
-#ifdef WIN32
+#ifdef _WIN32
     void changeThumbbarButtons( int );
 #endif