2 files changed, 4 insertions, 4 deletions

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index f63754aab..94126d496 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1803,9 +1803,9 @@ bool cClientHandle::HandleHandshake(const AString & a_Username)
 	{
 		std::list<AString> usernamesServer = cRoot::Get()->GetServer()->GetUsernames();
 		
-		for (std::list<AString>::iterator itr = usernamesServer.begin(); itr != usernamesServer.end(); ++itr)
+		for (auto item : usernamesServer)
 		{
-			if ((*itr).compare(a_Username) == 0)
+			if ((item).compare(a_Username) == 0)
 			{
 				Kick("User already logged in.");
 				return false;
diff --git a/src/Server.cpp b/src/Server.cpp
index ed02500ff..15c9521b9 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -308,9 +308,9 @@ std::list<AString> cServer::GetUsernames()
 {
 	std::list<AString> usernames;
 	cCSLock Lock(m_CSClients);
-	for (ClientList::iterator itr = m_Clients.begin(); itr != m_Clients.end(); ++itr)
+	for (auto client : m_Clients)
 	{
-		AString username = (*itr)->GetUsername();
+		AString username = (client)->GetUsername();
 		usernames.insert(usernames.begin(),username);
 	}
 	return usernames;