Improve iterator usage.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5528 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 11 insertions, 18 deletions

diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
index 5303dab13d..559de0b7f5 100644
--- a/Source/Core/Common/Src/LogManager.cpp
+++ b/Source/Core/Common/Src/LogManager.cpp
@@ -15,6 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include <algorithm>
+
 #include "LogManager.h"
 #include "ConsoleListener.h"
 #include "Timer.h"
@@ -160,28 +162,19 @@ void LogContainer::addListener(LogListener *listener) {
 }
 
 void LogContainer::removeListener(LogListener *listener) {
-	std::vector<LogListener *>::iterator i;
-	for(i = listeners.begin(); i != listeners.end(); i++) {
-		if ((*i) == listener) {
-			listeners.erase(i);
-			break;
-		}
-	}
+	std::vector<LogListener *>::iterator i = std::find(listeners.begin(), listeners.end(), listener);
+	if (listeners.end() != i)
+		listeners.erase(i);
 }
 
 bool LogContainer::isListener(LogListener *listener) const {
-	std::vector<LogListener *>::const_iterator i;
-	for (i = listeners.begin(); i != listeners.end(); i++) {
-		if ((*i) == listener) {
-			return true;
-		}
-	}
-	return false;
+	std::vector<LogListener *>::const_iterator i = std::find(listeners.begin(), listeners.end(), listener);
+	return listeners.end() != i;
 }
 
 void LogContainer::trigger(LogTypes::LOG_LEVELS level, const char *msg) {
 	std::vector<LogListener *>::const_iterator i;
-	for (i = listeners.begin(); i != listeners.end(); i++) {
+	for (i = listeners.begin(); i != listeners.end(); ++i) {
 		(*i)->Log(level, msg);
 	}
 }
diff --git a/Source/Core/Common/Src/SymbolDB.cpp b/Source/Core/Common/Src/SymbolDB.cpp
index 2494e95e10..4fd814ea71 100644
--- a/Source/Core/Common/Src/SymbolDB.cpp
+++ b/Source/Core/Common/Src/SymbolDB.cpp
@@ -20,7 +20,7 @@
 
 void SymbolDB::List()
 {
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
+	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
 	{
 		DEBUG_LOG(HLE,"%s @ %08x: %i bytes (hash %08x) : %i calls", iter->second.name.c_str(), iter->second.address, iter->second.size, iter->second.hash,iter->second.numCalls);
 	}
@@ -37,7 +37,7 @@ void SymbolDB::Clear(const char *prefix)
 void SymbolDB::Index()
 {
 	int i = 0;
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
+	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
 	{
 		iter->second.index = i++;
 	}
@@ -45,7 +45,7 @@ void SymbolDB::Index()
 
 Symbol *SymbolDB::GetSymbolFromName(const char *name)
 {
-	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
+	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
 	{
 		if (!strcmp(iter->second.name.c_str(), name))
 			return &iter->second;