LIST<> iterators:

- new method LIST::removeItem added to save a pointer to removed record;
- code cleaning related to the fact that LIST::remove() shall be the last operation inside an iterator, because otherwise the reference to it will point to a record next to deleted one;
- a few remaining cycles converted to iterators

1 files changed, 2 insertions, 4 deletions

diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp
index 3ecbbe8d92..9872dbd9d6 100644
--- a/protocols/IcqOscarJ/src/icq_direct.cpp
+++ b/protocols/IcqOscarJ/src/icq_direct.cpp
@@ -76,10 +76,8 @@ filetransfer* CIcqProto::FindExpectedFileRecv(DWORD dwUin, DWORD dwTotalSize)
 	mir_cslock l(expectedFileRecvMutex);

 

 	for (auto &it : expectedFileRecvs)

-		if (it->dwUin == dwUin && it->dwTotalSize == dwTotalSize) {

-			expectedFileRecvs.remove(it);

-			return it;

-		}

+		if (it->dwUin == dwUin && it->dwTotalSize == dwTotalSize)

+			return expectedFileRecvs.removeItem(&it);

 

 	return nullptr;

 }