8 files changed, 21 insertions, 30 deletions
diff --git a/protocols/Discord/src/dispatch.cpp b/protocols/Discord/src/dispatch.cpp
index 43f569f7a3..10fe201ba1 100644
--- a/protocols/Discord/src/dispatch.cpp
+++ b/protocols/Discord/src/dispatch.cpp
@@ -120,7 +120,7 @@ void CDiscordProto::OnCommandCallDeleted(const JSONNode &pRoot)
 	for (auto &call : arVoiceCalls.rev_iter())
 		if (call->channelId == channelId) {
 			elapsed = currTime - call->startTime;
-			arVoiceCalls.remove(arVoiceCalls.indexOf(&call));
+			arVoiceCalls.removeItem(&call);
 			break;
 		}
 
@@ -257,11 +257,10 @@ void CDiscordProto::OnCommandGuildDeleted(const JSONNode &pRoot)
 	if (pGuild == nullptr)
 		return;
 
-	auto T = arUsers.rev_iter();
-	for (auto &it : T)
+	for (auto &it : arUsers.rev_iter())
 		if (it->pGuild == pGuild) {
 			Chat_Terminate(m_szModuleName, it->wszUsername, true);
-			arUsers.remove(T.indexOf(&it));
+			arUsers.removeItem(&it);
 		}
 
 	Chat_Terminate(m_szModuleName, pRoot["name"].as_mstring(), true);
diff --git a/protocols/Facebook/src/server.cpp b/protocols/Facebook/src/server.cpp
index 28ee2adb96..9b025c2376 100644
--- a/protocols/Facebook/src/server.cpp
+++ b/protocols/Facebook/src/server.cpp
@@ -576,8 +576,8 @@ void FacebookProto::OnPublishPrivateMessage(const JSONNode &root)
 	if (m_uid == actorFbId) {
 		for (auto& it : arOwnMessages) {
 			if (it->msgId == offlineId) {
-				ProtoBroadcastAck(pUser->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE) it->reqId, (LPARAM) szId.c_str());
-				arOwnMessages.remove(arOwnMessages.indexOf(&it));
+				ProtoBroadcastAck(pUser->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)it->reqId, (LPARAM)szId.c_str());
+				arOwnMessages.removeItem(&it);
 				break;
 			}
 		}
@@ -789,7 +789,7 @@ void FacebookProto::OnPublishSentMessage(const JSONNode &root)
 			}
 			else ProtoBroadcastAck(pUser->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)it->reqId, (LPARAM)szId.c_str());
 
-			arOwnMessages.remove(arOwnMessages.indexOf(&it));
+			arOwnMessages.removeItem(&it);
 			break;
 		}
 	}
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 49bd0e0a3d..42f6d66ee8 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -2078,10 +2078,9 @@ bool CIrcProto::OnIrc_USERHOST_REPLY(const CIrcMessage *pmsg)
 							setWString(hContact, "Nick", nick);
 	
 							// If user found, remove from checklist
-							auto T = checklist.rev_iter();
-							for (auto &it : T)
+							for (auto &it : checklist.rev_iter())
 								if (!mir_wstrcmpi(it->GetString(), nick))
-									checklist.remove(T.indexOf(&it));
+									checklist.removeItem(&it);
 						}
 					}
 					break;
diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 2bd6ffd688..6d5a1a6a83 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -471,13 +471,13 @@ void CJabberInfoFrame::RemoveInfoItem(char *pszName)
 {
 	bool bUpdate = false;
 	size_t length = mir_strlen(pszName);
-	auto T = m_pItems.rev_iter();
-	for (auto &p : T) {
+
+	for (auto &p : m_pItems.rev_iter()) {
 		if (!strncmp(p->m_pszName, pszName, length)) {
 			if (!p->m_bShow)
 				--m_hiddenItemCount;
 			RemoveTooltip(p->m_tooltipId);
-			m_pItems.remove(T.indexOf(&p));
+			m_pItems.removeItem(&p);
 			bUpdate = true;
 		}
 	}
diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp
index fc1dfc5294..0b05136806 100644
--- a/protocols/JabberG/src/jabber_list.cpp
+++ b/protocols/JabberG/src/jabber_list.cpp
@@ -176,12 +176,9 @@ void CJabberProto::ListRemove(JABBER_LIST list, const char *jid)
 void CJabberProto::ListRemoveList(JABBER_LIST list)
 {
 	mir_cslock lck(m_csLists);
-	for (auto &it : m_lstRoster.rev_iter()) {
-		if (it->list == list) {
-			delete it;
-			m_lstRoster.remove(m_lstRoster.indexOf(&it));
-		}
-	}
+	for (auto &it : m_lstRoster.rev_iter())
+		if (it->list == list)
+			delete m_lstRoster.removeItem(&it);
 }
 
 void CJabberProto::ListRemoveByIndex(int index)
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 4cbdab32b4..bb6c4c3e99 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -121,10 +121,9 @@ void CMsnProto::MSN_ChatStart(ezxml_t xmli)
 	}
 
 	// Remove contacts not on list (not tagged)
-	auto T = info->mJoinedContacts.rev_iter();
-	for (auto &it : T) {
+	for (auto &it : info->mJoinedContacts.rev_iter()) {
 		if (!it->btag)
-			info->mJoinedContacts.remove(T.indexOf(&it));
+			info->mJoinedContacts.removeItem(&it);
 		else
 			it->btag = 0;
 	}
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 4fe0e82eb5..d8fa035b10 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -212,7 +212,7 @@ bool CVkProto::CheckMid(LIST<void> &lList, int guid)
 {
 	for (auto &it : lList)
 		if ((INT_PTR)it == guid) {
-			lList.remove(lList.indexOf(&it));
+			lList.removeItem(&it);
 			return true;
 		}
 
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 1668e2959b..a5904b7b46 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -182,26 +182,23 @@ void CVkProto::OnReceiveChatInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 			}
 		}
 
-		auto T = cc->m_users.rev_iter();
-		for (auto &cu : T) {
+		for (auto &cu : cc->m_users.rev_iter()) {
 			if (!cu->m_bDel)
 				continue;
 
 			wchar_t wszId[20];
 			_itow(cu->m_uid, wszId, 10);
+			CMStringW wszNick(FORMAT, L"%s (%s)", cu->m_wszNick.get(), UserProfileUrl(cu->m_uid).c_str());
 
 			GCEVENT gce = { m_szModuleName, 0, GC_EVENT_PART };
 			gce.pszID.w = cc->m_wszId;
 			gce.pszUID.w = wszId;
 			gce.dwFlags = GCEF_NOTNOTIFY;
 			gce.time = time(0);
-			gce.pszNick.w = mir_wstrdup(CMStringW(FORMAT, L"%s (%s)",
-				cu->m_wszNick,
-				UserProfileUrl(cu->m_uid).c_str()
-			));
+			gce.pszNick.w = wszNick;
 			Chat_Event(&gce);
 
-			cc->m_users.remove(T.indexOf(&cu));
+			cc->m_users.removeItem(&cu);
 		}
 	}