From a6bb80933c2984cf9a703e6dae6f1f18851c19b6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 19 Jun 2023 13:50:44 +0300
Subject: UM_FindUserFromIndex: another major useless crutch died
---
plugins/TabSRMM/src/msgdialog.cpp | 4 ++--
plugins/TabSRMM/src/msgdlgother.cpp | 9 ---------
plugins/TabSRMM/src/msgs.h | 1 -
3 files changed, 2 insertions(+), 12 deletions(-)
(limited to 'plugins/TabSRMM/src')
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index e4979c0b79..a93a455a2a 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -993,7 +993,7 @@ void CMsgDialog::onDblClick_List(CCtrlListBox *pList)
ScreenToClient(pList->GetHwnd(), &hti.pt);
int item = LOWORD(pList->SendMsg(LB_ITEMFROMPOINT, 0, MAKELPARAM(hti.pt.x, hti.pt.y)));
- USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, item);
+ auto *ui = (USERINFO *)pList->GetItemData(item);
if (ui == nullptr)
return;
@@ -2017,7 +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++) {
- if (USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i)) {
+ if (auto *ui = (USERINFO *)m_nickList.GetItemData(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);
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index cabaad93fc..4b7e2e23ea 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2573,15 +2573,6 @@ void CMsgDialog::UpdateFilterButton()
m_btnFilter.SendMsg(BUTTONSETOVERLAYICON, (LPARAM)(m_bFilterEnabled ? PluginConfig.g_iconOverlayDisabled : PluginConfig.g_iconOverlayEnabled), 0);
}
-void CMsgDialog::UpdateNickList()
-{
- int i = m_nickList.SendMsg(LB_GETTOPINDEX, 0, 0);
- m_nickList.SendMsg(LB_SETCOUNT, m_si->getUserList().getCount(), 0);
- m_nickList.SendMsg(LB_SETTOPINDEX, i, 0);
- UpdateTitle();
- m_hTabIcon = m_hTabStatusIcon;
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
void CMsgDialog::UpdateOptions()
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index b0104e83b6..9d8c96b839 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -602,7 +602,6 @@ public:
void SetStatusText(const wchar_t *, HICON) override;
void ShowFilterMenu() override;
void UpdateFilterButton() override;
- void UpdateNickList() override;
void UpdateOptions() override;
void UpdateStatusBar() override;
void UpdateTitle() override;
--
cgit v1.2.3