From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 15 Apr 2009 19:57:33 +0000 (+0300)
Subject: Remove useless display pointer
X-Git-Tag: 1.0.0-pre2~44
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4a45faa9452f44d95f99b34f7d50ac2fd4b12dae;p=vlc

Remove useless display pointer
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index b66626e0bd..cc3c9c2d55 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -278,6 +278,7 @@ static int Open( vlc_object_t *p_this )
         msg_Err( p_intf, "Could not connect to X server" );
         return VLC_EGENERIC;
     }
+    XCloseDisplay( p_display );
 #endif
 
     /* Allocations of p_sys */
@@ -286,9 +287,6 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_popup_menu = NULL;
     p_sys->p_mi = NULL;
     p_sys->p_playlist = pl_Hold( p_intf );
-#ifdef Q_WS_X11
-    p_sys->display = p_display;
-#endif
 
     /* */
     if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
@@ -335,9 +333,6 @@ static void Close( vlc_object_t *p_this )
     QVLCApp::triggerQuit();
 
     vlc_join (p_sys->thread, NULL);
-#ifdef Q_WS_X11
-    XCloseDisplay ((Display *)p_sys->display);
-#endif
     pl_Release (p_this);
     delete p_sys;
 }
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 9077cb900d..3c0dbec904 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -75,9 +75,6 @@ struct intf_sys_t
     const char *psz_filepath; /* Last path used in dialogs */
 
     QMenu * p_popup_menu;    /* The right click menu */
-#ifdef Q_WS_X11 /* WTH is this included in ALL files? :( */
-    void *display;
-#endif
 };
 
 #define THEPL p_intf->p_sys->p_playlist