From f7c9230106503149061f31efea0e387122fc1224 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Sat, 19 Oct 2013 17:37:47 +0100
Subject: Fixed general failings with everything. Fixes #211.

My editor fixed some extra tabs in globals.
---
 source/Globals.h    | 25 +++++++++++++------------
 source/WebAdmin.cpp |  6 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/source/Globals.h b/source/Globals.h
index 1e531f7f3..174273bbc 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -12,24 +12,24 @@
 #if defined(_MSC_VER)
 	// MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether
 	#pragma warning(disable:4481)
-	
+
 	// Disable some warnings that we don't care about:
 	#pragma warning(disable:4100)
 
 	#define OBSOLETE __declspec(deprecated)
-	
+
 	// No alignment needed in MSVC
 	#define ALIGN_8
 	#define ALIGN_16
-	
+
 #elif defined(__GNUC__)
 
 	// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
 	#define abstract
-	
+
 	// TODO: Can GCC mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
 	#define override
-	
+
 	#define OBSOLETE __attribute__((deprecated))
 
 	#define ALIGN_8 __attribute__((aligned(8)))
@@ -41,13 +41,13 @@
 #else
 
 	#error "You are using an unsupported compiler, you might need to #define some stuff here for your compiler"
-	
+
 	/*
 	// Copy and uncomment this into another #elif section based on your compiler identification
-	
+
 	// Explicitly mark classes as abstract (no instances can be created)
 	#define abstract
-	
+
 	// Mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
 	#define override
 
@@ -92,17 +92,17 @@ typedef unsigned short     UInt16;
 // OS-dependent stuff:
 #ifdef _WIN32
 	#define WIN32_LEAN_AND_MEAN
-	
+
 	#define _WIN32_WINNT 0x501  // We want to target WinXP and higher
-	
+
 	#include <Windows.h>
 	#include <winsock2.h>
 	#include <Ws2tcpip.h>  // IPv6 stuff
-	
+
 	// Windows SDK defines min and max macros, messing up with our std::min and std::max usage
 	#undef min
 	#undef max
-	
+
 	// Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant
 	#ifdef GetFreeSpace
 		#undef GetFreeSpace
@@ -161,6 +161,7 @@ typedef unsigned short     UInt16;
 #include <memory>
 #include <set>
 #include <queue>
+#include <sstream>
 
 
 
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index 1d2fe93b5..f72f9f63b 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -404,8 +404,8 @@ AString cWebAdmin::GetHTMLEscapedString( const AString& a_Input )
 	std::stringstream dst;
 
 	// Loop over input and substitute HTML characters for their alternatives.
-	for (char workingCharacter : a_Input) {
-		switch (workingCharacter)
+	for (int i = 0; i < a_Input.length(); i++) {
+		switch ( a_Input[i] )
 		{
 			case '&':
 				dst << "&amp;";
@@ -423,7 +423,7 @@ AString cWebAdmin::GetHTMLEscapedString( const AString& a_Input )
 				dst << "&gt;";
 				break;
 			default:
-				dst << workingCharacter;
+				dst << a_Input[i];
 				break;
 		}
 	}
-- 
cgit v1.2.3