From e8f69d4e566a3e73ff656beebcae9916e9148589 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 21 Feb 2018 18:36:45 +0300
Subject: MSN: C++'11 iterators

---
 protocols/MSN/src/msn_threads.cpp | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'protocols/MSN/src/msn_threads.cpp')

diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp
index ff4e6a7915..c75e4b643c 100644
--- a/protocols/MSN/src/msn_threads.cpp
+++ b/protocols/MSN/src/msn_threads.cpp
@@ -294,16 +294,14 @@ void CMsnProto::MSN_CloseConnections(void)
 
 	NETLIBSELECTEX nls = {};
 
-	for (int i = 0; i < m_arThreads.getCount(); i++) {
-		ThreadData &T = m_arThreads[i];
-
-		switch (T.mType) {
+	for (auto &it : m_arThreads) {
+		switch (it->mType) {
 		case SERVER_NOTIFICATION:
-			if (T.s != nullptr && !T.sessionClosed && !T.termPending) {
-				nls.hReadConns[0] = T.s;
+			if (it->s != nullptr && !it->sessionClosed && !it->termPending) {
+				nls.hReadConns[0] = it->s;
 				int res = Netlib_SelectEx(&nls);
 				if (res >= 0 || nls.hReadStatus[0] == 0)
-					T.sendTerminate();
+					it->sendTerminate();
 			}
 			break;
 		}
@@ -327,11 +325,9 @@ GCThreadData* CMsnProto::MSN_GetThreadByChatId(const wchar_t* chatId)
 		return nullptr;
 
 	mir_cslock lck(m_csThreads);
-	for (int i = 0; i < m_arGCThreads.getCount(); i++) {
-		GCThreadData *T = m_arGCThreads[i];
-		if (mir_wstrcmpi(T->mChatID, chatId) == 0)
-			return T;
-	}
+	for (auto &it : m_arGCThreads)
+		if (mir_wstrcmpi(it->mChatID, chatId) == 0)
+			return it;
 
 	return nullptr;
 }
@@ -340,11 +336,9 @@ ThreadData* CMsnProto::MSN_GetThreadByConnection(HANDLE s)
 {
 	mir_cslock lck(m_csThreads);
 
-	for (int i = 0; i < m_arThreads.getCount(); i++) {
-		ThreadData &T = m_arThreads[i];
-		if (T.s == s)
-			return &T;
-	}
+	for (auto &it : m_arThreads)
+		if (it->s == s)
+			return it;
 
 	return nullptr;
 }
-- 
cgit v1.2.3