Commit 0bc58744 authored by Rémi Duraffort's avatar Rémi Duraffort

skins2: fix warnings about initialization order.

parent 356dd52e
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
CtrlGeneric::CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp, CtrlGeneric::CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp,
VarBool *pVisible): VarBool *pVisible):
SkinObject( pIntf ), m_pLayout( NULL ), m_pPosition( NULL ), SkinObject( pIntf ), m_pLayout( NULL ), m_pVisible( pVisible ),
m_help( rHelp ), m_pVisible( pVisible ) m_pPosition( NULL ), m_help( rHelp )
{ {
// Observe the visibility variable // Observe the visibility variable
if( m_pVisible ) if( m_pVisible )
......
...@@ -40,8 +40,8 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf, ...@@ -40,8 +40,8 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
VarBool *pVisible ): VarBool *pVisible ):
CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_numImg( numImg ), CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ), m_numImg( numImg ),
m_rVariable( rVariable ), m_minAngle( minAngle ), m_maxAngle( maxAngle ), m_rVariable( rVariable ), m_minAngle( minAngle ), m_maxAngle( maxAngle ),
m_cmdUpDown( this ), m_cmdDownUp( this ), m_position( 0 ), m_cmdUpDown( this ), m_cmdDownUp( this ),
m_cmdMove( this ), m_position( 0 ) m_cmdMove( this )
{ {
// Build the images of the sequence // Build the images of the sequence
m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics( m_pImgSeq = OSFactory::instance( getIntf() )->createOSGraphics(
......
...@@ -368,9 +368,9 @@ CtrlSliderBg::CtrlSliderBg( intf_thread_t *pIntf, ...@@ -368,9 +368,9 @@ CtrlSliderBg::CtrlSliderBg( intf_thread_t *pIntf,
CtrlGeneric( pIntf, rHelp, pVisible ), m_pCursor( NULL ), CtrlGeneric( pIntf, rHelp, pVisible ), m_pCursor( NULL ),
m_rVariable( rVariable ), m_thickness( thickness ), m_rCurve( rCurve ), m_rVariable( rVariable ), m_thickness( thickness ), m_rCurve( rCurve ),
m_width( rCurve.getWidth() ), m_height( rCurve.getHeight() ), m_width( rCurve.getWidth() ), m_height( rCurve.getHeight() ),
m_pImgSeq( pBackground ), m_nbHoriz( nbHoriz ), m_nbVert( nbVert ), m_pImgSeq( pBackground ), m_pScaledBmp( NULL ), m_nbHoriz( nbHoriz ),
m_padHoriz( padHoriz ), m_padVert( padVert ), m_bgWidth( 0 ), m_nbVert( nbVert ), m_padHoriz( padHoriz ), m_padVert( padVert ),
m_bgHeight( 0 ), m_position( 0 ), m_pScaledBmp( NULL ) m_bgWidth( 0 ), m_bgHeight( 0 ), m_position( 0 )
{ {
if( m_pImgSeq ) if( m_pImgSeq )
{ {
......
...@@ -44,12 +44,12 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable, ...@@ -44,12 +44,12 @@ CtrlText::CtrlText( intf_thread_t *pIntf, VarText &rVariable,
const GenericFont &rFont, const UString &rHelp, const GenericFont &rFont, const UString &rHelp,
uint32_t color, VarBool *pVisible, VarBool *pFocus, uint32_t color, VarBool *pVisible, VarBool *pFocus,
Scrolling_t scrollMode, Align_t alignment ): Scrolling_t scrollMode, Align_t alignment ):
CtrlGeneric( pIntf, rHelp, pVisible ), m_pFocus( pFocus), m_fsm( pIntf ), CtrlGeneric( pIntf, rHelp, pVisible ), m_fsm( pIntf ),
m_rVariable( rVariable ), m_cmdToManual( this ), m_rVariable( rVariable ), m_cmdToManual( this ),
m_cmdManualMoving( this ), m_cmdManualStill( this ), m_cmdManualMoving( this ), m_cmdManualStill( this ),
m_cmdMove( this ), m_pEvt( NULL ), m_rFont( rFont ), m_cmdMove( this ), m_pEvt( NULL ), m_rFont( rFont ),
m_color( color ), m_scrollMode( scrollMode ), m_alignment( alignment ), m_color( color ), m_scrollMode( scrollMode ), m_alignment( alignment ),
m_pImg( NULL ), m_pImgDouble( NULL ), m_pFocus( pFocus), m_pImg( NULL ), m_pImgDouble( NULL ),
m_pCurrImg( NULL ), m_xPos( 0 ), m_xOffset( 0 ), m_pCurrImg( NULL ), m_xPos( 0 ), m_xOffset( 0 ),
m_cmdUpdateText( this ) m_cmdUpdateText( this )
{ {
......
...@@ -61,8 +61,8 @@ CtrlTree::CtrlTree( intf_thread_t *pIntf, ...@@ -61,8 +61,8 @@ CtrlTree::CtrlTree( intf_thread_t *pIntf,
m_pOpenBitmap( pOpenBitmap ), m_pClosedBitmap( pClosedBitmap ), m_pOpenBitmap( pOpenBitmap ), m_pClosedBitmap( pClosedBitmap ),
m_fgColor( fgColor ), m_playColor( playColor ), m_bgColor1( bgColor1 ), m_fgColor( fgColor ), m_playColor( playColor ), m_bgColor1( bgColor1 ),
m_bgColor2( bgColor2 ), m_selColor( selColor ), m_bgColor2( bgColor2 ), m_selColor( selColor ),
m_pLastSelected( NULL ), m_pImage( NULL ), m_dontMove( false ), m_pLastSelected( NULL ), m_pImage( NULL ), m_pScaledBitmap( NULL ),
m_pScaledBitmap( NULL ) m_dontMove( false )
{ {
// Observe the tree and position variables // Observe the tree and position variables
m_rTree.addObserver( this ); m_rTree.addObserver( this );
......
...@@ -36,8 +36,8 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout, ...@@ -36,8 +36,8 @@ CtrlVideo::CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
bool autoResize, const UString &rHelp, bool autoResize, const UString &rHelp,
VarBool *pVisible ): VarBool *pVisible ):
CtrlGeneric( pIntf, rHelp, pVisible ), m_rLayout( rLayout ), CtrlGeneric( pIntf, rHelp, pVisible ), m_rLayout( rLayout ),
m_xShift( 0 ), m_yShift( 0 ), m_bAutoResize( autoResize ), m_bAutoResize( autoResize), m_xShift( 0 ), m_yShift( 0 ),
m_pVoutWindow( NULL ), m_bIsUseable( false ) m_bIsUseable( false), m_pVoutWindow( NULL )
{ {
VarBool &rFullscreen = VlcProc::instance( getIntf() )->getFullscreenVar(); VarBool &rFullscreen = VlcProc::instance( getIntf() )->getFullscreenVar();
rFullscreen.addObserver( this ); rFullscreen.addObserver( this );
......
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