Skip to content

Commit

Permalink
Qt4: specify function prototype, remove cast
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Denis-Courmont committed Jan 5, 2014
1 parent 8c17cf4 commit 44d7aba
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions modules/gui/qt4/qt4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static void Abort( void *obj )
}
#endif

static void RegisterIntf( vlc_object_t *p_this )
static void RegisterIntf( intf_thread_t *p_this )
{
playlist_t *pl = pl_Get(p_this);
var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
Expand Down Expand Up @@ -390,9 +390,7 @@ static int Open( vlc_object_t *p_this, bool isDialogProvider )

#ifndef Q_OS_MAC
if( !isDialogProvider )
{
RegisterIntf( p_this );
}
RegisterIntf( p_intf );
#endif

return VLC_SUCCESS;
Expand All @@ -417,7 +415,7 @@ static void Close( vlc_object_t *p_this )

if( !p_sys->b_isDialogProvider )
{
playlist_t *pl = pl_Get(p_this);
playlist_t *pl = pl_Get(p_intf);

var_Destroy (pl, "window");
var_Destroy (pl, "qt4-iface");
Expand Down Expand Up @@ -530,7 +528,7 @@ static void *Thread( void *obj )
/* We took over main thread, register and start here */
if( !p_intf->p_sys->b_isDialogProvider )
{
RegisterIntf( (vlc_object_t *)p_intf );
RegisterIntf( p_intf );
playlist_Play( THEPL );
}
#endif
Expand Down

0 comments on commit 44d7aba

Please sign in to comment.