[vlc-devel] commit: Qt: remove debug and cosmetics (Jean-Baptiste Kempf )
git version control
git at videolan.org
Sun Feb 28 10:57:58 CET 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 25 19:58:14 2010 +0100| [10029dae8d0612702856a3b74390d80362b52c78] | committer: Jean-Baptiste Kempf
Qt: remove debug and cosmetics
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10029dae8d0612702856a3b74390d80362b52c78
---
modules/gui/qt4/main_interface.cpp | 22 ++++++++++------------
modules/gui/qt4/qt4.cpp | 3 ---
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 03fc382..7b7d293 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -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();
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index d3d9ad2..276aabf 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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 */
More information about the vlc-devel
mailing list