From 185ebd42c6f6364a615d8fe09d060c713ec10b46 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 19 Jun 2023 12:57:29 +0300 Subject: useless helper removed --- plugins/Scriver/src/msgdialog.cpp | 5 ++--- plugins/TabSRMM/src/msgdialog.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index c35b779569..ba50c46a25 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -873,7 +873,7 @@ LRESULT CMsgDialog::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) if (wParam == VK_RETURN) { int index = m_nickList.SendMsg(LB_GETCURSEL, 0, 0); if (index != LB_ERR) { - USERINFO *ui = g_chatApi.SM_GetUserFromIndex(m_si->ptszID, m_si->pszModule, index); + USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, index); Chat_DoEventHook(m_si, GC_USER_PRIVMESS, ui, nullptr, 0); } break; @@ -912,8 +912,7 @@ LRESULT CMsgDialog::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) // string we have int iItems = m_nickList.SendMsg(LB_GETCOUNT, 0, 0); for (int i = 0; i < iItems; i++) { - USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i); - if (ui) { + if (USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i)) { if (!wcsnicmp(ui->pszNick, m_wszSearch, mir_wstrlen(m_wszSearch))) { m_nickList.SendMsg(LB_SETCURSEL, i, 0); InvalidateRect(m_nickList.GetHwnd(), nullptr, FALSE); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 253aa0c7b6..e4979c0b79 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2017,8 +2017,7 @@ LRESULT CMsgDialog::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) // string we have int i, iItems = m_nickList.SendMsg(LB_GETCOUNT, 0, 0); for (i = 0; i < iItems; i++) { - USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i); - if (ui) { + if (USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i)) { if (!wcsnicmp(ui->pszNick, m_wszSearch, mir_wstrlen(m_wszSearch))) { m_nickList.SendMsg(LB_SETSEL, FALSE, -1); m_nickList.SendMsg(LB_SETSEL, TRUE, i); -- cgit v1.2.3