Integrate C++11 branch into 5_1-new

src/smpackage/CreateLanguageDlg.cpp

@@ -5,7 +5,6 @@
 #include "stdafx.h"
 #include "smpackage.h"
 #include "CreateLanguageDlg.h"
-#include "Foreach.h"
 #include "RageUtil.h"
 #include "SMPackageUtil.h"
 #include ".\createlanguagedlg.h"

src/smpackage/LanguagesDlg.cpp

@@ -4,7 +4,6 @@
 #include "global.h"
 #include "stdafx.h"
 #include "smpackage.h"
-#include "Foreach.h"
 #include "LanguagesDlg.h"
 #include "SpecialFiles.h"
 #include "RageUtil.h"
@@ -53,7 +52,7 @@ BOOL LanguagesDlg::OnInitDialog()
 	vector<RString> vs;
 	GetDirListing( SpecialFiles::THEMES_DIR+"*", vs, true );
 	StripCvsAndSvn( vs );
-	FOREACH_CONST( RString, vs, s )
+	for (vector<RString>::const_iterator s = vs.begin(); s != vs.end(); ++s)
 		m_listThemes.AddString( *s );
 	if( !vs.empty() )
 		m_listThemes.SetSel( 0 );
@@ -100,7 +99,7 @@ void LanguagesDlg::OnSelchangeListThemes()
 
 		vector<RString> vs;
 		GetDirListing( sLanguagesDir+"*.ini", vs, false );
-		FOREACH_CONST( RString, vs, s )
+		for (vector<RString>::const_iterator s = vs.begin(); s != vs.end(); ++s)
 		{
 			RString sIsoCode = GetFileNameWithoutExtension(*s);
 			RString sLanguage = SMPackageUtil::GetLanguageDisplayString(sIsoCode);
@@ -389,7 +388,7 @@ void LanguagesDlg::OnBnClickedButtonImport()
 	int iNumModified = 0;
 	int iNumUnchanged = 0;
 	int iNumIgnored = 0;
-	FOREACH_CONST( CsvFile::StringVector, csv.m_vvs, line ) 
+	for (vector<CsvFile::StringVector>::const_iterator line = csv.m_vvs.begin(); line != csv.m_vvs.end(); ++line)
 	{
 		int iLineIndex = line - csv.m_vvs.begin();
 
@@ -462,7 +461,7 @@ void GetAllMatches( const RString &sRegex, const RString &sString, vector<RStrin
 void DumpList( const vector<RString> &asList, RageFile &file )
 {
 	RString sLine;
-	FOREACH_CONST( RString, asList, s )
+	for (vector<RString>::const_iterator s = asList.begin(); s != asList.end(); ++s)
 	{
 		if( sLine.size() + s->size() > 100 )
 		{