From 59e6b15f513cc998ce13e9e49e2a6a3ace445ebb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 15 Mar 2018 21:05:06 +0300 Subject: 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 --- plugins/QuickContacts/src/quickcontacts.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins/QuickContacts') diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index b530245b6b..d0c720b2e7 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -310,10 +310,9 @@ int GetStatus(MCONTACT hContact, char *proto = nullptr) void FreeContacts() { - for (int i = contacts.getCount() - 1; i >= 0; i--) { - delete contacts[i]; - contacts.remove(i); - } + for (auto &it : contacts) + delete it; + contacts.destroy(); } -- cgit v1.2.3