1 files changed, 14 insertions, 14 deletions

diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp
index f98ef21e41..af45ca525d 100644
--- a/Source/Core/Common/Src/SysConf.cpp
+++ b/Source/Core/Common/Src/SysConf.cpp
@@ -36,11 +36,9 @@ SysConf::~SysConf()
 
 void SysConf::Clear()
 {
-	for (size_t i = 0; i < m_Entries.size() - 1; i++)
-	{
-		delete [] m_Entries[i].data;
-		m_Entries[i].data = NULL;
-	}
+	for (std::vector<SSysConfEntry>::const_iterator i = m_Entries.begin();
+			i < m_Entries.end() - 1; i++)
+		delete [] i->data;
 	m_Entries.clear();
 }
 
@@ -86,9 +84,10 @@ bool SysConf::LoadFromFileInternal(FILE *f)
 	}
 
 	// Last offset is an invalid entry. We ignore it throughout this class
-	for (size_t i = 0; i < m_Entries.size() - 1; i++)
+	for (std::vector<SSysConfEntry>::iterator i = m_Entries.begin();
+			i < m_Entries.end() - 1; i++)
 	{
-		SSysConfEntry& curEntry = m_Entries[i];
+		SSysConfEntry& curEntry = *i;
 		if (fseeko(f, curEntry.offset, SEEK_SET) != 0) return false;
 
 		u8 description = 0;
@@ -144,22 +143,23 @@ bool SysConf::SaveToFile(const char *filename)
 	if (f == NULL)
 		return false;
 
-	for (size_t i = 0; i < m_Entries.size() - 1; i++)
+	for (std::vector<SSysConfEntry>::iterator i = m_Entries.begin();
+			i < m_Entries.end() - 1; i++)
 	{
 		// Seek to after the name of this entry
-		if (fseeko(f, m_Entries[i].offset + m_Entries[i].nameLength + 1, SEEK_SET) != 0) return false;
+		if (fseeko(f, i->offset + i->nameLength + 1, SEEK_SET) != 0) return false;
 		// We may have to write array length value...
-		if (m_Entries[i].type == Type_BigArray)
+		if (i->type == Type_BigArray)
 		{
-			u16 tmpDataLength = Common::swap16(m_Entries[i].dataLength);
+			u16 tmpDataLength = Common::swap16(i->dataLength);
 			if (fwrite(&tmpDataLength, 2, 1, f) != 1) return false;
 		}
-		else if (m_Entries[i].type == Type_SmallArray)
+		else if (i->type == Type_SmallArray)
 		{
-			if (fwrite(&m_Entries[i].dataLength, 1, 1, f) != 1) return false;
+			if (fwrite(&i->dataLength, 1, 1, f) != 1) return false;
 		}
 		// Now write the actual data
-		if (fwrite(m_Entries[i].data, m_Entries[i].dataLength, 1, f) != 1) return false;
+		if (fwrite(i->data, i->dataLength, 1, f) != 1) return false;
 	}
 
 	fclose(f);