From 4c281b28075dfa69d8cc2301b06492fbddb62f24 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 30 Jan 2020 20:18:37 +0300 Subject: LIST::remove + LIST::indexOf() combination removed with LIST::removeItem --- src/core/stdmsg/src/cmdlist.cpp | 6 +++--- src/core/stduserinfo/src/userinfo.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core') diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 0604b5269d..35fbcac30a 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -32,11 +32,11 @@ static VOID CALLBACK MsgTimer(HWND, UINT, UINT_PTR, DWORD dwTime) LIST arTimedOut(1); { mir_cslock lck(csMsgQueue); - auto T = msgQueue.rev_iter(); - for (auto &it : T) + + for (auto &it : msgQueue.rev_iter()) if (dwTime - it->ts > g_dat.msgTimeout) { arTimedOut.insert(it); - msgQueue.remove(T.indexOf(&it)); + msgQueue.removeItem(&it); } } diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index 52ea9dc7e9..dcb7d77f3c 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -383,7 +383,7 @@ public: m_tree.DeleteAllItems(); bRemoved = true; } - m_pages.remove(m_pages.indexOf(&odp)); + m_pages.removeItem(&odp); } } -- cgit v1.2.3