actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-06-27 05:24:24 +00:00
parent 67477a6192
commit ebe60c9eb7
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimation.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ void BGAnimation::LoadFromAniDir( const CString &_sAniDir, bool bGeneric )
if( pScrollerNode ) if( pScrollerNode )
{ {
FOREACH_Attr( pScrollerNode, pAttr ) FOREACH_Attr( pScrollerNode, pAttr )
pBGAnimation->m_attrs.insert( pair<CString,XAttr*>(pAttr->m_sName, pAttr) ); pBGAnimation->m_attrs.insert( make_pair(pAttr->m_sName, pAttr) );
// Clear the copies in the Scroller node so that we don't double-delete. // Clear the copies in the Scroller node so that we don't double-delete.
pScrollerNode->m_attrs.clear(); pScrollerNode->m_attrs.clear();
} }
stepmania/src/IniFile.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ bool IniFile::RenameKey(const CString &from, const CString &to)
m_childs.erase( it ); m_childs.erase( it );
pNode->m_sName = to; pNode->m_sName = to;
m_childs.insert( pair<CString,XNode*>(pNode->m_sName,pNode) ); m_childs.insert( make_pair(pNode->m_sName, pNode) );
return true; return true;
} }
stepmania/src/NotesLoaderBMS.cpp
+1 -1
View File
@@ -543,7 +543,7 @@ bool BMSLoader::ReadBMSFile( const CString &sPath, NameToData_t &mapNameToData )
value_data = line.substr( iIndexOfSeparator+1 ); value_data = line.substr( iIndexOfSeparator+1 );
value_name.MakeLower(); value_name.MakeLower();
mapNameToData.insert( pair<CString,CString>(value_name, value_data) ); mapNameToData.insert( make_pair(value_name, value_data) );
} }
return true; return true;
stepmania/src/RageFileManager.cpp
+1 -1
View File
@@ -791,7 +791,7 @@ RageFileBasic *RageFileManager::OpenForWriting( CString sPath, int mode, int &er
if( value == -1 ) if( value == -1 )
continue; continue;
Values.push_back( pair<int,int>( i, value ) ); Values.push_back( make_pair( i, value ) );
} }
stable_sort( Values.begin(), Values.end(), SortBySecond ); stable_sort( Values.begin(), Values.end(), SortBySecond );
stepmania/src/XmlFile.cpp
+3 -3
View File
@@ -215,7 +215,7 @@ char* XNode::LoadAttributes( const char* pszAttrs, PARSEINFO *pi /*= &piDefault*
// add new attribute // add new attribute
DEBUG_ASSERT( attr->m_sName.size() ); DEBUG_ASSERT( attr->m_sName.size() );
m_attrs.insert( pair<CString,XAttr*>(attr->m_sName, attr) ); m_attrs.insert( make_pair(attr->m_sName, attr) );
xml = pEnd; xml = pEnd;
// XML Attr Value // XML Attr Value
@@ -410,7 +410,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ )
if( !node->m_sName.empty() ) if( !node->m_sName.empty() )
{ {
DEBUG_ASSERT( node->m_sName.size() ); DEBUG_ASSERT( node->m_sName.size() );
m_childs.insert( pair<CString,XNode*>(node->m_sName, node) ); m_childs.insert( make_pair(node->m_sName, node) );
} }
else else
{ {
@@ -853,7 +853,7 @@ bool XNode::RemoveChild( XNode *node )
XAttr *XNode::AppendAttr( XAttr *attr ) XAttr *XNode::AppendAttr( XAttr *attr )
{ {
DEBUG_ASSERT( attr->m_sName.size() ); DEBUG_ASSERT( attr->m_sName.size() );
m_attrs.insert( pair<CString,XAttr*>(attr->m_sName,attr) ); m_attrs.insert( make_pair(attr->m_sName,attr) );
return attr; return attr;
} }