[vlc-devel] commit: Qt4: compile fix ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 3 17:54:55 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug  3 18:57:27 2008 +0300| [9fe946c3a6cd78aadc0736d7f9a21841822cc5c4] | committer: Rémi Denis-Courmont 

Qt4: compile fix

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9fe946c3a6cd78aadc0736d7f9a21841822cc5c4
---

 modules/gui/qt4/qt4.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index d1c7457..efd46d6 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -57,7 +57,7 @@ static int  OpenDialogs  ( vlc_object_t * );
 static int  WindowOpen   ( vlc_object_t * );
 static void WindowClose  ( vlc_object_t * );
 static void Run          ( intf_thread_t * );
-static void Init         ( intf_thread_t * );
+static void *Init        ( vlc_object_t * );
 static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 /*****************************************************************************
@@ -294,14 +294,15 @@ static void Run( intf_thread_t *p_intf )
             msg_Err( p_intf, "failed to create Qt dialogs thread" );
     }
     else
-        Init( p_intf );
+        Init( VLC_OBJECT(p_intf) );
 }
 
 static QMutex windowLock;
 static QWaitCondition windowWait;
 
-static void Init( intf_thread_t *p_intf )
+static void *Init( vlc_object_t *obj )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)obj;
     vlc_value_t val;
     char dummy[] = "";
     char *argv[] = { dummy };




More information about the vlc-devel mailing list