diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-15 21:05:06 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-15 21:05:06 +0300 |
| commit | 59e6b15f513cc998ce13e9e49e2a6a3ace445ebb (patch) | |
| tree | af52b73a17039ed1fbe398ba9f488c26a7071257 /plugins/NewXstatusNotify | |
| parent | bdaa5cf8b48515af2ac39f3f3245dd1183cbad52 (diff) | |
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
Diffstat (limited to 'plugins/NewXstatusNotify')
| -rw-r--r-- | plugins/NewXstatusNotify/src/xstatus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index c15cf4e746..0267704979 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -46,8 +46,8 @@ void RemoveLoggedEventsXStatus(MCONTACT hContact) for (auto &it : T)
if (it->hContact == hContact) {
db_event_delete(it->hContact, it->hDBEvent);
- eventListXStatus.remove(T.indexOf(&it));
mir_free(it);
+ eventListXStatus.remove(T.indexOf(&it));
}
}
@@ -57,8 +57,8 @@ void RemoveLoggedEventsStatus(MCONTACT hContact) for (auto &it : T)
if (it->hContact == hContact) {
db_event_delete(it->hContact, it->hDBEvent);
- eventListStatus.remove(T.indexOf(&it));
mir_free(it);
+ eventListStatus.remove(T.indexOf(&it));
}
}
@@ -68,8 +68,8 @@ void RemoveLoggedEventsSMsg(MCONTACT hContact) for (auto &it : T)
if (it->hContact == hContact) {
db_event_delete(it->hContact, it->hDBEvent);
- eventListSMsg.remove(T.indexOf(&it));
mir_free(it);
+ eventListSMsg.remove(T.indexOf(&it));
}
}
|