Two loops.

This commit is contained in:
Jason Felds
2013-05-01 22:15:38 -04:00
parent b4de5421b7
commit 1766edc691
+6 -6
View File
@@ -358,12 +358,12 @@ static void SortNoteSkins( vector<RString> &asSkinNames )
set<RString> setUnusedSkinNames( setSkinNames );
asSkinNames.clear();
FOREACH( RString, asSorted, sSkin )
for (RString const &sSkin : asSorted)
{
if( setSkinNames.find(*sSkin) == setSkinNames.end() )
if( setSkinNames.find(sSkin) == setSkinNames.end() )
continue;
asSkinNames.push_back( *sSkin );
setUnusedSkinNames.erase( *sSkin );
asSkinNames.push_back( sSkin );
setUnusedSkinNames.erase( sSkin );
}
asSkinNames.insert( asSkinNames.end(), setUnusedSkinNames.begin(), setUnusedSkinNames.end() );
@@ -1397,8 +1397,8 @@ OptionRowHandler* OptionRowHandlerUtil::MakeSimple( const MenuRowDef &mr )
pHand->m_Def.m_bAllowThemeTitle = mr.bThemeTitle;
pHand->m_Def.m_bAllowThemeItems = mr.bThemeItems;
FOREACH( RString, pHand->m_Def.m_vsChoices, c )
FontCharAliases::ReplaceMarkers( *c ); // Allow special characters
for (RString &c : pHand->m_Def.m_vsChoices)
FontCharAliases::ReplaceMarkers( c ); // Allow special characters
return pHand;
}