From 35f6abcc7f069b3f239215842ec049c716f9b758 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 26 Sep 2022 19:27:33 +0300 Subject: code cleaning --- protocols/JabberG/src/jabber_chat.cpp | 10 +++++----- protocols/JabberG/src/jabber_disco.cpp | 6 +++--- protocols/JabberG/src/stdafx.h | 4 ---- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index da93040fa9..550a81bc00 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1129,16 +1129,16 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* break; case IDM_CPY_NICK: - Utils_ClipboardCopy(him->m_szResourceName); + Utils_ClipboardCopyU(him->m_szResourceName); break; case IDM_RJID_COPY: case IDM_CPY_RJID: - Utils_ClipboardCopy(him->m_szRealJid); + Utils_ClipboardCopyU(him->m_szRealJid); break; case IDM_CPY_INROOMJID: - Utils_ClipboardCopy(MakeJid(item->jid, him->m_szResourceName)); + Utils_ClipboardCopyU(MakeJid(item->jid, him->m_szResourceName)); break; case IDM_RJID_VCARD: @@ -1303,11 +1303,11 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK *g break; case IDM_CPY_RJID: - Utils_ClipboardCopy(item->jid); + Utils_ClipboardCopyU(item->jid); break; case IDM_CPY_TOPIC: - Utils_ClipboardCopy(item->getTemp()->m_szStatusMessage); + Utils_ClipboardCopyU(item->getTemp()->m_szStatusMessage); break; } } diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 94168f47ff..cca24a8d29 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -1056,15 +1056,15 @@ public: break; case SD_ACT_COPYJID: - Utils_ClipboardCopy(pNode->GetJid()); + Utils_ClipboardCopyU(pNode->GetJid()); break; case SD_ACT_COPYNODE: - Utils_ClipboardCopy(pNode->GetNode()); + Utils_ClipboardCopyU(pNode->GetNode()); break; case SD_ACT_COPYINFO: - Utils_ClipboardCopy(pNode->GetTooltipText()); + Utils_ClipboardCopyU(pNode->GetTooltipText()); break; case SD_ACT_FAVORITE: diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 67eaad3244..985dbefefb 100644 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -697,10 +697,6 @@ CMStringW JabberErrorMsg(const TiXmlElement *errorNode, int *errorCode = nullptr const wchar_t *JabberStrIStr(const wchar_t *str, const wchar_t *substr); CJabberProto* JabberChooseInstance(bool bIsLink=false); -__forceinline void Utils_ClipboardCopy(const char *p) -{ Utils_ClipboardCopy(Utf2T(p)); -} - bool JabberReadXep203delay(const TiXmlElement *node, time_t &msgTime); void SetWindowTextUtf(HWND hwndDlg, const char *szValue); -- cgit v1.2.3