Commit 10029dae authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: remove debug and cosmetics

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent f327c96f
......@@ -124,7 +124,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
i_visualmode = var_InheritInteger( p_intf, "qt-display-mode" );
/* Do we want anoying popups or not */
notificationEnabled = (bool)var_InheritBool( p_intf, "qt-notification" );
notificationEnabled = var_InheritBool( p_intf, "qt-notification" );
/* Set the other interface settings */
settings = getSettings();
......@@ -213,15 +213,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* END CONNECTS ON IM */
/************
* Callbacks
************/
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/* VideoWidget connects for asynchronous calls */
connect( this, SIGNAL(askGetVideo(WId*,int*,int*,unsigned*,unsigned *)),
this, SLOT(getVideoSlot(WId*,int*,int*,unsigned*,unsigned*)),
......@@ -251,6 +242,15 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/** END of CONNECTS**/
/************
* Callbacks
************/
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/**** FINAL SIZING and placement of interface */
settings->beginGroup( "MainWindow" );
QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
......@@ -298,8 +298,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
MainInterface::~MainInterface()
{
msg_Dbg( p_intf, "Destroying the main interface" );
/* Unsure we hide the videoWidget before destroying it */
if( stackCentralOldState == VIDEO_TAB )
showBg();
......
......@@ -471,15 +471,12 @@ static void *Thread( void *obj )
app.exec();
/* And quit */
msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
QApplication::closeAllWindows();
if (p_mi != NULL)
{
/* FIXME: are we sure that video window is already destroyed? */
msg_Dbg (p_intf, "destroying the main Qt4 interface");
p_intf->p_sys->p_mi = NULL;
/* Destroy first the main interface because it is connected to some
slots in the MainInputManager */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment