diff options
| author | George Hazan <ghazan@miranda.im> | 2020-01-30 20:18:37 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-01-30 20:18:46 +0300 |
| commit | 4c281b28075dfa69d8cc2301b06492fbddb62f24 (patch) | |
| tree | b788f37caaff5063fd36eecad191d2a5582be12c /src/core | |
| parent | a243c59835182e2a1fa91d9c7bd80defea88e4e8 (diff) | |
LIST::remove + LIST::indexOf() combination removed with LIST::removeItem
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdmsg/src/cmdlist.cpp | 6 | ||||
| -rw-r--r-- | src/core/stduserinfo/src/userinfo.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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<TMsgQueue> 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);
}
}
|