summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/AVS/src/poll.cpp5
-rw-r--r--plugins/Clist_modern/src/modern_aniavatars.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_skinengine.cpp8
-rw-r--r--plugins/Clist_modern/src/modern_xptheme.cpp10
-rw-r--r--plugins/FavContacts/src/contact_cache.cpp7
-rw-r--r--plugins/HistorySweeperLight/src/historysweeperlight.cpp5
-rw-r--r--plugins/NewXstatusNotify/src/xstatus.cpp18
-rw-r--r--plugins/Popup/src/popup_thread.cpp9
-rw-r--r--plugins/ProxySwitch/src/ip.cpp2
-rw-r--r--plugins/Scriver/src/sendqueue.cpp2
-rw-r--r--plugins/TabSRMM/src/eventpopups.cpp5
-rw-r--r--plugins/UserInfoEx/src/classPsTree.cpp2
-rw-r--r--plugins/UserInfoEx/src/mir_contactqueue.cpp19
-rw-r--r--plugins/Variables/src/contact.cpp2
14 files changed, 36 insertions, 60 deletions
diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp
index a77db51160..e7c3caf63f 100644
--- a/plugins/AVS/src/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
@@ -103,10 +103,9 @@ static void QueueRemove(MCONTACT hContact)
{
mir_cslock lck(cs);
- auto T = queue.rev_iter();
- for (auto &it : T)
+ for (auto &it : queue.rev_iter())
if (it->hContact == hContact)
- queue.remove(T.indexOf(&it));
+ queue.removeItem(&it);
}
// Add an contact to a queue
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 191d11d6ec..cc93b0d16c 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -269,7 +269,7 @@ static void _AniAva_ReduceAvatarImages(int startY, int dY, BOOL bDestroyWindow)
for (auto &it : T) {
int res = SendMessage(it->hWindow, AAM_REMOVEAVATAR, (WPARAM)startY, (LPARAM)dY);
if (res == 0xDEAD && bDestroyWindow)
- s_Objects.remove(T.indexOf(&it));
+ s_Objects.removeItem(&it);
}
}
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index cbc0a3ccae..427ac780d5 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -525,10 +525,9 @@ int ske_ReleaseBufferDC(HDC hDC, int keepTime)
{
DWORD dwCurrentTime = GetTickCount();
- //Try to find DC in buffer list - set flag to be release after time;
+ // Try to find DC in buffer list - set flag to be release after time;
mir_cslock lck(BufferListCS);
- auto T = BufferList.rev_iter();
- for (auto &it : T) {
+ for (auto &it : BufferList.rev_iter()) {
if (it) {
if (hDC != nullptr && it->hDC == hDC) {
it->dwDestroyAfterTime = dwCurrentTime + keepTime;
@@ -539,8 +538,7 @@ int ske_ReleaseBufferDC(HDC hDC, int keepTime)
SelectObject(it->hDC, it->oldBitmap);
DeleteObject(it->hBitmap);
DeleteDC(it->hDC);
- mir_free(it);
- BufferList.remove(T.indexOf(&it));
+ mir_free(BufferList.removeItem(&it));
}
}
}
diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp
index bff9e8a7fb..2c341149c9 100644
--- a/plugins/Clist_modern/src/modern_xptheme.cpp
+++ b/plugins/Clist_modern/src/modern_xptheme.cpp
@@ -72,12 +72,10 @@ void xpt_FreeThemeHandle(XPTHANDLE xptHandle)
void xpt_FreeThemeForWindow(HWND hwnd)
{
mir_cslock lck(xptCS);
- auto T = xptObjectList.rev_iter();
- for (auto &xptObject : T)
- if (xptObject->hOwnerWindow == hwnd) {
- _sttXptCloseThemeData(xptObject);
- xptObjectList.remove(T.indexOf(&xptObject));
- }
+
+ for (auto &xptObject : xptObjectList.rev_iter())
+ if (xptObject->hOwnerWindow == hwnd)
+ _sttXptCloseThemeData(xptObjectList.removeItem(&xptObject));
}
void xpt_OnWM_THEMECHANGED()
diff --git a/plugins/FavContacts/src/contact_cache.cpp b/plugins/FavContacts/src/contact_cache.cpp
index 7e69ffa91d..e3b05f2c24 100644
--- a/plugins/FavContacts/src/contact_cache.cpp
+++ b/plugins/FavContacts/src/contact_cache.cpp
@@ -38,13 +38,12 @@ int __cdecl CContactCache::OnDbEventAdded(WPARAM hContact, LPARAM hEvent)
TContactInfo *pFound = nullptr;
mir_cslock lck(m_cs);
- auto T = m_cache.rev_iter();
- for (auto &it : T) {
+
+ for (auto &it : m_cache.rev_iter()) {
it->rate *= q;
if (it->hContact == hContact) {
it->rate += weight;
- pFound = it;
- m_cache.remove(T.indexOf(&it)); // reinsert to maintain the sort order
+ pFound = m_cache.removeItem(&it); // reinsert to maintain the sort order
}
}
diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
index d74dbfeadc..7e32d8aa4e 100644
--- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
@@ -225,10 +225,9 @@ int OnWindowEvent(WPARAM, LPARAM lParam)
SweepHistoryFromContact(msgEvData->hContact, Criteria, TRUE);
}
- auto T = g_hWindows.rev_iter();
- for (auto &it : T)
+ for (auto &it : g_hWindows.rev_iter())
if (it == PVOID(msgEvData->hContact))
- g_hWindows.remove(T.indexOf(&it));
+ g_hWindows.removeItem(&it);
break;
}
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 5796e051e3..b703204fd5 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -42,34 +42,28 @@ void FreeXSC(XSTATUSCHANGE *xsc)
void RemoveLoggedEventsXStatus(MCONTACT hContact)
{
- auto T = eventListXStatus.rev_iter();
- for (auto &it : T)
+ for (auto &it : eventListXStatus.rev_iter())
if (it->hContact == hContact) {
db_event_delete(it->hDBEvent);
- mir_free(it);
- eventListXStatus.remove(T.indexOf(&it));
+ mir_free(eventListXStatus.removeItem(&it));
}
}
void RemoveLoggedEventsStatus(MCONTACT hContact)
{
- auto T = eventListStatus.rev_iter();
- for (auto &it : T)
+ for (auto &it : eventListStatus.rev_iter())
if (it->hContact == hContact) {
db_event_delete(it->hDBEvent);
- mir_free(it);
- eventListStatus.remove(T.indexOf(&it));
+ mir_free(eventListStatus.removeItem(&it));
}
}
void RemoveLoggedEventsSMsg(MCONTACT hContact)
{
- auto T = eventListSMsg.rev_iter();
- for (auto &it : T)
+ for (auto &it : eventListSMsg.rev_iter())
if (it->hContact == hContact) {
db_event_delete(it->hDBEvent);
- mir_free(it);
- eventListSMsg.remove(T.indexOf(&it));
+ mir_free(eventListSMsg.removeItem(&it));
}
}
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp
index 183014a76f..d6fa27d649 100644
--- a/plugins/Popup/src/popup_thread.cpp
+++ b/plugins/Popup/src/popup_thread.cpp
@@ -179,12 +179,9 @@ static LRESULT CALLBACK PopupThreadManagerWndProc(HWND hwnd, UINT message, WPARA
break;
case UTM_REMOVE_WINDOW:
- {
- auto T = popupList.rev_iter();
- for (auto &it : T)
- if (it == wnd)
- popupList.remove(T.indexOf(&it));
- }
+ for (auto &it : popupList.rev_iter())
+ if (it == wnd)
+ popupList.removeItem(&it);
RepositionPopups();
--nPopups;
diff --git a/plugins/ProxySwitch/src/ip.cpp b/plugins/ProxySwitch/src/ip.cpp
index e36f4ae444..1962ca7382 100644
--- a/plugins/ProxySwitch/src/ip.cpp
+++ b/plugins/ProxySwitch/src/ip.cpp
@@ -647,7 +647,7 @@ void UnboundConnections(LONG *OldIP, LONG *NewIP)
mir_cslock lck(csConnection_List);
for (auto &it : g_arConnections.rev_iter())
if (it->IP == (ULONG)*OldIP)
- g_arConnections.remove(g_arConnections.indexOf(&it));
+ g_arConnections.removeItem(&it);
}
OldIP++;
}
diff --git a/plugins/Scriver/src/sendqueue.cpp b/plugins/Scriver/src/sendqueue.cpp
index eb27717760..bfd39e3ce5 100644
--- a/plugins/Scriver/src/sendqueue.cpp
+++ b/plugins/Scriver/src/sendqueue.cpp
@@ -89,7 +89,7 @@ void ReportSendQueueTimeouts(CMsgDialog *pDlg)
pDlg->StopMessageSending();
(new CErrorDlg(TranslateT("The message send timed out."), pDlg, it))->Create();
}
- else arQueue.remove(arQueue.indexOf(&it));
+ else arQueue.removeItem(&it);
}
}
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 408e181c4e..168d1edd2e 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -50,14 +50,13 @@ static PLUGIN_DATAT* PU_GetByContact(const MCONTACT hContact)
*/
static void PU_CleanUp()
{
- auto T = arPopupList.rev_iter();
- for (auto &p : T) {
+ for (auto &p : arPopupList.rev_iter()) {
if (p->hContact != 0)
continue;
mir_free(p->eventData);
mir_free(p);
- arPopupList.remove(T.indexOf(&p));
+ arPopupList.removeItem(&p);
}
}
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 7e3a9bb73a..cd800ff5a2 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -136,7 +136,7 @@ void CPsTree::Remove(HINSTANCE hInst)
TreeView_DeleteAllItems(_hWndTree);
bRemoved = true;
}
- _pages.remove(_pages.indexOf(&it));
+ _pages.removeItem(&it);
}
}
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.cpp b/plugins/UserInfoEx/src/mir_contactqueue.cpp
index 9b49a2c261..8a93812287 100644
--- a/plugins/UserInfoEx/src/mir_contactqueue.cpp
+++ b/plugins/UserInfoEx/src/mir_contactqueue.cpp
@@ -83,13 +83,9 @@ void CContactQueue::RemoveAll(MCONTACT hContact)
{
mir_cslock lck(_cs);
- auto T = _queue.rev_iter();
- for (auto &qi : T) {
- if (qi->hContact == hContact) {
- mir_free(qi);
- _queue.remove(T.indexOf(&qi));
- }
- }
+ for (auto &qi : _queue.rev_iter())
+ if (qi->hContact == hContact)
+ mir_free(_queue.removeItem(&qi));
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -99,12 +95,9 @@ void CContactQueue::RemoveAllConsiderParam(MCONTACT hContact, PVOID param)
{
mir_cslock lck(_cs);
- auto T = _queue.rev_iter();
- for (auto &qi : T)
- if (qi->hContact == hContact && qi->param == param) {
- mir_free(qi);
- _queue.remove(T.indexOf(&qi));
- }
+ for (auto &qi : _queue.rev_iter())
+ if (qi->hContact == hContact && qi->param == param)
+ mir_free(_queue.removeItem(&qi));
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index 4a1079b437..3df3681d85 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -332,7 +332,7 @@ static int contactSettingChanged(WPARAM hContact, LPARAM lParam)
(isUid && (it->flags & CI_UNIQUEID))) {
/* remove from cache */
mir_free(it->tszContact);
- arContactCache.remove(arContactCache.indexOf(&it));
+ arContactCache.removeItem(&it);
break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 10:43:15 +0000