[vlc-commits] commit: Remove debug (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Thu Mar 11 15:49:14 CET 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 11 15:49:08 2010 +0100| [dce84f16eff36ca70cbb431f0654569eb02ca458] | committer: Jean-Baptiste Kempf
Remove debug
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dce84f16eff36ca70cbb431f0654569eb02ca458
---
modules/gui/qt4/main_interface.cpp | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 89a62b3..99ef957 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -23,9 +23,6 @@
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/* TODO:
- - playlist minimumSize applies to all stackWidgets
- */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -33,20 +30,20 @@
#include "qt4.hpp"
#include "main_interface.hpp"
-#include "input_manager.hpp" // Creation
-#include "actions_manager.hpp" // killInstance
-#include "extensions_manager.hpp" // killInstance
+#include "input_manager.hpp" // Creation
+#include "actions_manager.hpp" // killInstance
+#include "extensions_manager.hpp" // killInstance
-#include "util/customwidgets.hpp" // qtEventToVLCKey
-#include "util/qt_dirs.hpp" // toNativeSeparators
+#include "util/customwidgets.hpp" // qtEventToVLCKey
+#include "util/qt_dirs.hpp" // toNativeSeparators
-#include "components/interface_widgets.hpp" // bgWidget, videoWidget
-#include "components/controller.hpp" // controllers
-#include "components/playlist/playlist.hpp" // plWidget
-#include "dialogs/firstrun.hpp" // First Run
+#include "components/interface_widgets.hpp" // bgWidget, videoWidget
+#include "components/controller.hpp" // controllers
+#include "components/playlist/playlist.hpp" // plWidget
+#include "dialogs/firstrun.hpp" // First Run
-#include "menus.hpp" // Menu creation
-#include "recents.hpp" // RecentItems when DnD
+#include "menus.hpp" // Menu creation
+#include "recents.hpp" // RecentItems when DnD
#include <QCloseEvent>
#include <QKeyEvent>
@@ -61,8 +58,8 @@
#include <QLabel>
#include <QStackedWidget>
-#include <vlc_keys.h> /* Wheel event */
-#include <vlc_vout_display.h> /* vout_thread_t and VOUT_ events */
+#include <vlc_keys.h> /* Wheel event */
+#include <vlc_vout_display.h> /* vout_thread_t and VOUT_ events */
#ifdef WIN32 /* Win7 taskbar */
#include <vlc_windows_interfaces.h>
@@ -251,7 +248,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _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(400, 100) );
@@ -962,13 +958,7 @@ void MainInterface::createPlaylist()
}
else
{
-#ifdef DEBUG_INTF
- msg_Warn( p_intf, "Here 1 %i", stackCentralW->currentIndex() );
-#endif
stackCentralW->addWidget( playlistWidget );
-#ifdef DEBUG_INTF
- msg_Warn( p_intf, "Here 2 %i", stackCentralW->currentIndex() );
-#endif
}
}
More information about the vlc-commits
mailing list