From 1766edc691b0cb30f63681535b8829fa7991ba39 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Wed, 1 May 2013 22:15:38 -0400 Subject: [PATCH] Two loops. --- src/OptionRowHandler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp index 8a3db08ff0..9eee1400b6 100644 --- a/src/OptionRowHandler.cpp +++ b/src/OptionRowHandler.cpp @@ -358,12 +358,12 @@ static void SortNoteSkins( vector &asSkinNames ) set 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; }