Demonstrate how auto is used for this.

This commit is contained in:
Jason Felds
2013-04-27 15:16:55 -04:00
parent 0e91e5b32d
commit f710f850bf
+18 -18
View File
@@ -677,28 +677,28 @@ XNode *LuaHelpers::GetLuaInformation()
} }
/* Classes */ /* Classes */
FOREACHM_CONST( RString, LClass, mClasses, c ) for (auto const &c : mClasses)
{ {
XNode *pClassNode = pClassesNode->AppendChild( "Class" ); XNode *pClassNode = pClassesNode->AppendChild( "Class" );
pClassNode->AppendAttr( "name", c->first ); pClassNode->AppendAttr( "name", c.first );
if( !c->second.m_sBaseName.empty() ) if( !c.second.m_sBaseName.empty() )
pClassNode->AppendAttr( "base", c->second.m_sBaseName ); pClassNode->AppendAttr( "base", c.second.m_sBaseName );
FOREACH_CONST( RString, c->second.m_vMethods, m ) for (RString const & m : c.second.m_vMethods)
{ {
XNode *pMethodNode = pClassNode->AppendChild( "Function" ); XNode *pMethodNode = pClassNode->AppendChild( "Function" );
pMethodNode->AppendAttr( "name", *m ); pMethodNode->AppendAttr( "name", m );
} }
} }
/* Singletons */ /* Singletons */
FOREACHM_CONST( RString, RString, mSingletons, s ) for (auto const &s : mSingletons)
{ {
if( mClasses.find(s->first) != mClasses.end() ) if( mClasses.find(s.first) != mClasses.end() )
continue; continue;
XNode *pSingletonNode = pSingletonsNode->AppendChild( "Singleton" ); XNode *pSingletonNode = pSingletonsNode->AppendChild( "Singleton" );
pSingletonNode->AppendAttr( "name", s->first ); pSingletonNode->AppendAttr( "name", s.first );
pSingletonNode->AppendAttr( "class", s->second ); pSingletonNode->AppendAttr( "class", s.second );
} }
/* Namespaces */ /* Namespaces */
@@ -732,21 +732,21 @@ XNode *LuaHelpers::GetLuaInformation()
} }
/* Constants, String Constants */ /* Constants, String Constants */
FOREACHM_CONST( RString, float, mConstants, c ) for (auto const &c : mConstants)
{ {
XNode *pConstantNode = pConstantsNode->AppendChild( "Constant" ); XNode *pConstantNode = pConstantsNode->AppendChild( "Constant" );
pConstantNode->AppendAttr( "name", c->first ); pConstantNode->AppendAttr( "name", c.first );
if( c->second == truncf(c->second) ) if( c.second == truncf(c.second) )
pConstantNode->AppendAttr( "value", int(c->second) ); pConstantNode->AppendAttr( "value", static_cast<int>(c.second) );
else else
pConstantNode->AppendAttr( "value", c->second ); pConstantNode->AppendAttr( "value", c.second );
} }
FOREACHM_CONST( RString, RString, mStringConstants, s ) for (auto const &s : mStringConstants)
{ {
XNode *pConstantNode = pConstantsNode->AppendChild( "Constant" ); XNode *pConstantNode = pConstantsNode->AppendChild( "Constant" );
pConstantNode->AppendAttr( "name", s->first ); pConstantNode->AppendAttr( "name", s.first );
pConstantNode->AppendAttr( "value", ssprintf("'%s'", s->second.c_str()) ); pConstantNode->AppendAttr( "value", ssprintf("'%s'", s.second.c_str()) );
} }
return pLuaNode; return pLuaNode;