From d67929b6da2494bd20ee89891374add8360316f6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Mon, 17 Dec 2007 00:46:54 +0000 Subject: [PATCH] Qt4 - trailing spaces... Post-commit script ? --- modules/gui/qt4/main_interface.cpp | 14 +++++++------- modules/gui/qt4/menus.hpp | 2 +- modules/gui/qt4/qt4.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index b3945e9551..8261c94967 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -205,12 +205,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) * Input Manager * ********************/ MainInputManager::getInstance( p_intf ); - + /******************** * Various CONNECTs * ********************/ /* Connect the input manager to the GUI elements it manages */ - + /* It is also connected to the control->slider, see the ControlsWidget */ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), this, setDisplayPosition( float, int, int ) ); @@ -239,7 +239,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) } /** - * CONNECTS on PLAY_STATUS + * CONNECTS on PLAY_STATUS **/ /* Status on the main controller */ CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); @@ -274,12 +274,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) /* VideoWidget connect mess to avoid different threads speaking to each other */ CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) ); - CONNECT( this, askVideoToResize( unsigned int, unsigned int ), + CONNECT( this, askVideoToResize( unsigned int, unsigned int ), videoWidget, SetSizing( unsigned int, unsigned int ) ); CONNECT( this, askUpdate(), this, doComponentsUpdate() ); CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() ); - CONNECT( controls, advancedControlsToggled( bool ), + CONNECT( controls, advancedControlsToggled( bool ), this, doComponentsUpdate() ); resize( settings->value( "size", QSize( 350, 60 ) ).toSize() ); @@ -295,7 +295,7 @@ MainInterface::~MainInterface() settings->beginGroup( "MainWindow" ); settings->setValue( "playlist-floats", dockPL->isFloating() ); - settings->setValue( "adv-controls", + settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED ); settings->setValue( "pos", pos() ); settings->setValue( "size", size() ); @@ -518,7 +518,7 @@ QSize MainInterface::sizeHint() const { int nwidth = controls->sizeHint().width(); int nheight = controls->sizeHint().height(); - + menuBar()->size().height() + + menuBar()->size().height() + statusBar()->size().height(); msg_Dbg( p_intf, "1 %i %i", nheight, nwidth ); diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp index d06457dee2..339794dc57 100644 --- a/modules/gui/qt4/menus.hpp +++ b/modules/gui/qt4/menus.hpp @@ -91,7 +91,7 @@ public: static void MiscPopupMenu( intf_thread_t * ); static void PopupMenu( intf_thread_t *, bool ); static void PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu ); - static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, + static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, input_thread_t *p_input ); /* Systray */ static void updateSystrayMenu( MainInterface *,intf_thread_t *, diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp index 18a5452f45..94b283a0fd 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -92,7 +92,7 @@ struct intf_sys_t #define TOGGLEV( x ) { if( x->isVisible() ) x->hide(); \ else x->show(); } - + #define MAX(A,B) ( (A) > (B) ? (A):(B)) static int DialogEvent_Type = QEvent::User + 1; -- 2.39.2