From 36823da403d68e26dcf1c474bcbb5938e73267f7 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 26 Feb 2015 09:30:44 +0100
Subject: [PATCH] CTemplate: C++11 range-based for loops

---
 src/Template.cpp | 55 ++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/Template.cpp b/src/Template.cpp
index 37c088ab..dd77ea36 100644
--- a/src/Template.cpp
+++ b/src/Template.cpp
@@ -81,15 +81,15 @@ CString CTemplateLoopContext::GetValue(const CString& sName, bool bFromIf) {
 }
 
 CTemplate::~CTemplate() {
-	for (map<CString, vector<CTemplate*> >::iterator it = m_mvLoops.begin(); it != m_mvLoops.end(); ++it) {
-		vector<CTemplate*>& vLoop = it->second;
-		for (unsigned int a = 0; a < vLoop.size(); a++) {
-			delete vLoop[a];
+	for (const auto& it : m_mvLoops) {
+		const vector<CTemplate*>& vLoop = it.second;
+		for (CTemplate* pTemplate : vLoop) {
+			delete pTemplate;
 		}
 	}
 
-	for (unsigned int a = 0; a < m_vLoopContexts.size(); a++) {
-		delete m_vLoopContexts[a];
+	for (CTemplateLoopContext* pContext : m_vLoopContexts) {
+		delete pContext;
 	}
 }
 
@@ -114,8 +114,8 @@ CString CTemplate::ExpandFile(const CString& sFilename, bool bFromInc) {
 
 	CString sFile(ResolveLiteral(sFilename).TrimLeft_n("/"));
 
-	for (list<pair<CString, bool> >::iterator it = m_lsbPaths.begin(); it != m_lsbPaths.end(); ++it) {
-		CString& sRoot = it->first;
+	for (auto& it : m_lsbPaths) {
+		CString& sRoot = it.first;
 		CString sFilePath(CDir::ChangeDir(sRoot, sFile));
 
 		// Make sure path ends with a slash because "/foo/pub*" matches "/foo/public_keep_out/" but "/foo/pub/*" doesn't
@@ -123,7 +123,7 @@ CString CTemplate::ExpandFile(const CString& sFilename, bool bFromInc) {
 			sRoot += "/";
 		}
 
-		if (it->second && !bFromInc) {
+		if (it.second && !bFromInc) {
 			DEBUG("\t\tSkipping path (not from INC)  [" + sFilePath + "]");
 			continue;
 		}
@@ -156,8 +156,8 @@ void CTemplate::SetPath(const CString& sPaths) {
 	VCString vsDirs;
 	sPaths.Split(":", vsDirs, false);
 
-	for (size_t a = 0; a < vsDirs.size(); a++) {
-		AppendPath(vsDirs[a], false);
+	for (const CString& sDir : vsDirs) {
+		AppendPath(sDir, false);
 	}
 }
 
@@ -184,9 +184,9 @@ void CTemplate::AppendPath(const CString& sPath, bool bIncludesOnly) {
 void CTemplate::RemovePath(const CString& sPath) {
 	DEBUG("CTemplate::RemovePath(" + sPath + ") == [" + CDir::ChangeDir("./", sPath + "/") + "]");
 
-	for (list<pair<CString, bool> >::iterator it = m_lsbPaths.begin(); it != m_lsbPaths.end(); ++it) {
-		if (it->first == sPath) {
-			m_lsbPaths.remove(*it);
+	for (const auto& it : m_lsbPaths) {
+		if (it.first == sPath) {
+			m_lsbPaths.remove(it);
 			RemovePath(sPath); // @todo probably shouldn't use recursion, being lazy
 			return;
 		}
@@ -369,8 +369,8 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 						if (sArgs.Token(1, true, " ").OptionSplit(msRow)) {
 							CTemplate& NewRow = AddRow(sLoopName);
 
-							for (MCString::iterator it = msRow.begin(); it != msRow.end(); ++it) {
-								NewRow[it->first] = it->second;
+							for (const auto& it : msRow) {
+								NewRow[it.first] = it.second;
 							}
 						}
 					} else if (sAction.Equals("SET")) {
@@ -388,9 +388,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 							bool bFoundOne = false;
 							CString::EEscape eEscape = CString::EASCII;
 
-							for (unsigned int a = 1; a < vsArgs.size(); a++) {
-								const CString& sArg = vsArgs[a];
-
+							for (const CString& sArg : vsArgs) {
 								if (sArg.StartsWith("ESC=")) {
 									eEscape = CString::ToEscape(sArg.LeftChomp_n(4));
 								} else {
@@ -587,9 +585,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 						CTemplate* pTmpl = GetCurTemplate();
 						CString sCustomOutput;
 
-						for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
-							std::shared_ptr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
-
+						for (const auto& spTagHandler : vspTagHandlers) {
 							if (spTagHandler->HandleTag(*pTmpl, sAction, sArgs, sCustomOutput)) {
 								sOutput += sCustomOutput;
 								bNotFound = false;
@@ -796,9 +792,7 @@ CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) {
 	//sRest.Split(" ", vArgs, false, "\"", "\"");
 	sRest.QuoteSplit(vArgs);
 
-	for (unsigned int a = 0; a < vArgs.size(); a++) {
-		const CString& sArg = vArgs[a];
-
+	for (const CString& sArg : vArgs) {
 		msArgs[sArg.Token(0, false, "=").AsUpper()] = sArg.Token(1, true, "=");
 	}
 
@@ -832,8 +826,7 @@ CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) {
 		CTemplate* pTmpl = GetCurTemplate();
 
 		if (sRet.empty()) {
-			for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
-				std::shared_ptr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
+			for (const auto& spTagHandler : vspTagHandlers) {
 				CString sCustomOutput;
 
 				if (!bFromIf && spTagHandler->HandleVar(*pTmpl, sArgs.Token(0), sArgs.Token(1, true), sCustomOutput)) {
@@ -846,9 +839,7 @@ CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) {
 			}
 		}
 
-		for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
-			std::shared_ptr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
-
+		for (const auto& spTagHandler : vspTagHandlers) {
 			if (spTagHandler->HandleValue(*pTmpl, sRet, msArgs)) {
 				break;
 			}
@@ -866,8 +857,8 @@ CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) {
 			VCString vsEscs;
 			it->second.Split(",", vsEscs, false);
 
-			for (unsigned int a = 0; a < vsEscs.size(); a++) {
-				sRet.Escape(CString::ToEscape(vsEscs[a]));
+			for (const CString& sEsc : vsEscs) {
+				sRet.Escape(CString::ToEscape(sEsc));
 			}
 		} else {
 			sRet.Escape(m_spOptions->GetEscapeFrom(), m_spOptions->GetEscapeTo());