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, 10 insertions, 10 deletions

diff --git a/protocols/IcqOscarJ/src/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp
index b2d3ee2823..e2dc3d569f 100644
--- a/protocols/IcqOscarJ/src/icq_rates.cpp
+++ b/protocols/IcqOscarJ/src/icq_rates.cpp
@@ -386,16 +386,16 @@ void rates_queue::putItem(rates_queue_item *pItem, int nMinDelay)
 	ppro->debugLogA("Rates: Delaying %s.", szDescr);

 	{

 		mir_cslock l(csLists);

-		if (lstPending.getCount()) {

-			for (int i = 0; i < lstPending.getCount(); i++) {

-				if (lstPending[i]->isEqual(pItem)) {

-					if (duplicates == 1) // keep existing, ignore new

-						return;

-

-					if (duplicates == -1) { // discard existing, append new item

-						delete lstPending[i];

-						lstPending.remove(i);

-					}

+

+		auto T = lstPending.rev_iter();

+		for (auto &it : T) {

+			if (it->isEqual(pItem)) {

+				if (duplicates == 1) // keep existing, ignore new

+					return;

+

+				if (duplicates == -1) { // discard existing, append new item

+					delete it;

+					lstPending.remove(T.indexOf(&it));

 				}

 			}

 		}