From ad9984bb0faea2bb1fde27413af066c800d76805 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 5 Mar 2025 13:29:29 +0300 Subject: getStatuses() isn't needed --- include/m_chat_int.h | 4 ---- libs/win32/mir_app.lib | Bin 302710 -> 302284 bytes libs/win64/mir_app.lib | Bin 302792 -> 302356 bytes src/mir_app/src/chat_manager.cpp | 13 +++++++++---- src/mir_app/src/mir_app.def | 1 - src/mir_app/src/mir_app64.def | 1 - 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/m_chat_int.h b/include/m_chat_int.h index 31bf128e3b..9ae428dfeb 100644 --- a/include/m_chat_int.h +++ b/include/m_chat_int.h @@ -186,10 +186,6 @@ struct MIR_APP_EXPORT SESSION_INFO : public MZeroedObject, public MNonCopyable return (pParent != nullptr) ? pParent->pMe : pMe; } - __forceinline OBJLIST& getStatuses() const { - return (pParent != nullptr) ? pParent->arStatuses : arStatuses; - } - __forceinline OBJLIST& getUserList() { return (pParent != nullptr) ? pParent->arUsers : arUsers; } diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 604500c807..cd7f77bc00 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 60df7446ff..c220916ef0 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp index 8d3a1b8007..62fd919923 100644 --- a/src/mir_app/src/chat_manager.cpp +++ b/src/mir_app/src/chat_manager.cpp @@ -644,6 +644,11 @@ static BOOL MM_RemoveAll(void) // Status manager functions // Necessary to keep track of what user statuses per window nicklist that is available +__inline OBJLIST& getStatuses(SESSION_INFO *si) +{ + return (si->pParent) ? si->pParent->arStatuses : si->arStatuses; +} + STATUSINFO* TM_AddStatus(SESSION_INFO *si, const wchar_t *pszStatus) { if (!si || !pszStatus) @@ -658,7 +663,7 @@ STATUSINFO* TM_AddStatus(SESSION_INFO *si, const wchar_t *pszStatus) while (node->iIconIndex > STATUSICONCOUNT - 1) node->iIconIndex--; - auto &pList = si->getStatuses(); + auto &pList = getStatuses(si); if (pList.getCount() == 0) // list is empty node->iStatus = 1; else @@ -675,7 +680,7 @@ STATUSINFO* TM_FindStatus(SESSION_INFO *si, const wchar_t *pszStatus) if (!si || !pszStatus) return nullptr; - for (auto &it: si->getStatuses()) + for (auto &it: getStatuses(si)) if (mir_wstrcmpi(it->pszGroup, pszStatus) == 0) return it; @@ -687,7 +692,7 @@ uint16_t TM_StringToWord(SESSION_INFO *si, const wchar_t *pszStatus) if (!si || !pszStatus) return 0; - auto &pList = si->getStatuses(); + auto &pList = getStatuses(si); for (auto &it : pList) if (mir_wstrcmpi(it->pszGroup, pszStatus) == 0) return it->iStatus; @@ -703,7 +708,7 @@ wchar_t* TM_WordToString(SESSION_INFO *si, uint16_t Status) if (!si) return nullptr; - for (auto &it : si->getStatuses()) + for (auto &it : getStatuses(si)) if (it->iStatus & Status) { Status -= it->iStatus; if (Status == 0) diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index c569d5a939..f38c665f8b 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -997,4 +997,3 @@ Proto_CanDeleteHistory @1118 NONAME ?iHistoryMode@Srmm@@3V?$CMOption@E@@A @1128 NONAME ?getConn@MWebSocket@@QBEPAXXZ @1129 NONAME ?Chat_GetStatus@@YGPAUSTATUSINFO@@PAUSESSION_INFO@@PBUUSERINFO@@@Z @1130 NONAME -?getStatuses@SESSION_INFO@@QBEAAU?$OBJLIST@USTATUSINFO@@@@XZ @1131 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index e56b145990..54d6d48c19 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -997,4 +997,3 @@ Proto_CanDeleteHistory @1118 NONAME ?iHistoryMode@Srmm@@3V?$CMOption@E@@A @1128 NONAME ?getConn@MWebSocket@@QEBAPEAXXZ @1129 NONAME ?Chat_GetStatus@@YAPEAUSTATUSINFO@@PEAUSESSION_INFO@@PEBUUSERINFO@@@Z @1130 NONAME -?getStatuses@SESSION_INFO@@QEBAAEAU?$OBJLIST@USTATUSINFO@@@@XZ @1131 NONAME -- cgit v1.2.3