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

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 170147508c..9253442816 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -474,15 +474,14 @@ void CJabberInfoFrame::RemoveInfoItem(char *pszName)
 {

 	bool bUpdate = false;

 	size_t length = mir_strlen(pszName);

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

-		auto &p = m_pItems[i];

-		if (!strncmp(p.m_pszName, pszName, length)) {

-			if (!p.m_bShow)

+	auto T = m_pItems.rev_iter();

+	for (auto &p : T) {

+		if (!strncmp(p->m_pszName, pszName, length)) {

+			if (!p->m_bShow)

 				--m_hiddenItemCount;

-			RemoveTooltip(p.m_tooltipId);

-			m_pItems.remove(i);

+			RemoveTooltip(p->m_tooltipId);

+			m_pItems.remove(T.indexOf(&p));

 			bUpdate = true;

-			--i;

 		}

 	}