fix sign warnings
This commit is contained in:
@@ -44,6 +44,10 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
|
|||||||
|
|
||||||
m_sName = sClassName;
|
m_sName = sClassName;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Load choices
|
||||||
|
//
|
||||||
|
{
|
||||||
// Instead of using NUM_CHOICES, use a comma-separated list of choices. Each
|
// Instead of using NUM_CHOICES, use a comma-separated list of choices. Each
|
||||||
// element in the list is a choice name. This level of indirection
|
// element in the list is a choice name. This level of indirection
|
||||||
// makes it easier to add or remove items without having to change a bunch
|
// makes it easier to add or remove items without having to change a bunch
|
||||||
@@ -51,8 +55,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
|
|||||||
CStringArray asChoiceNames;
|
CStringArray asChoiceNames;
|
||||||
split( CHOICE_NAMES, ",", asChoiceNames, true );
|
split( CHOICE_NAMES, ",", asChoiceNames, true );
|
||||||
|
|
||||||
int c;
|
for( unsigned c=0; c<asChoiceNames.size(); c++ )
|
||||||
for( c=0; c<asChoiceNames.size(); c++ )
|
|
||||||
{
|
{
|
||||||
CString sChoiceName = asChoiceNames[c];
|
CString sChoiceName = asChoiceNames[c];
|
||||||
CString sChoice = CHOICE(sChoiceName);
|
CString sChoice = CHOICE(sChoiceName);
|
||||||
@@ -68,11 +71,16 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
|
|||||||
BGAnimation *pBGA = new BGAnimation;
|
BGAnimation *pBGA = new BGAnimation;
|
||||||
m_vpBGAnimations.push_back( pBGA );
|
m_vpBGAnimations.push_back( pBGA );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
m_Menu.Load( sClassName );
|
m_Menu.Load( sClassName );
|
||||||
this->AddChild( &m_Menu );
|
this->AddChild( &m_Menu );
|
||||||
|
|
||||||
for( c=0; c<NUM_CODES; c++ )
|
//
|
||||||
|
// Load codes
|
||||||
|
//
|
||||||
|
{
|
||||||
|
for( int c=0; c<NUM_CODES; c++ )
|
||||||
{
|
{
|
||||||
CodeItem code;
|
CodeItem code;
|
||||||
if( !code.Load( CODE(c) ) )
|
if( !code.Load( CODE(c) ) )
|
||||||
@@ -85,12 +93,13 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
|
|||||||
m_aCodeChoices.push_back( mc );
|
m_aCodeChoices.push_back( mc );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
ScreenSelect::~ScreenSelect()
|
ScreenSelect::~ScreenSelect()
|
||||||
{
|
{
|
||||||
LOG->Trace( "ScreenSelect::~ScreenSelect()" );
|
LOG->Trace( "ScreenSelect::~ScreenSelect()" );
|
||||||
for( int i=0; i<m_vpBGAnimations.size(); i++ )
|
for( unsigned i=0; i<m_vpBGAnimations.size(); i++ )
|
||||||
SAFE_DELETE( m_vpBGAnimations[i] );
|
SAFE_DELETE( m_vpBGAnimations[i] );
|
||||||
m_vpBGAnimations.clear();
|
m_vpBGAnimations.clear();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user