From 1042a84dd1f01c249a946ec708d3dae2881ecfab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 28 Jan 2016 15:17:43 +0000 Subject: atavism removed: CLISTEVENT::cbSize git-svn-id: http://svn.miranda-ng.org/main/trunk@16180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/core.cpp | 3 +-- protocols/IRCG/src/clist.cpp | 2 +- protocols/JabberG/src/jabber_iq_handlers.cpp | 3 +-- protocols/JabberG/src/jabber_notes.cpp | 4 ++-- protocols/MRA/src/Mra_functions.cpp | 6 +----- protocols/MSN/src/msn_mail.cpp | 4 +--- protocols/SkypeWeb/src/skype_trouter.cpp | 4 ++-- protocols/Tox/src/tox_multimedia.cpp | 4 ++-- protocols/VKontakte/src/vk_feed.cpp | 3 ++- 9 files changed, 13 insertions(+), 20 deletions(-) (limited to 'protocols') diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index b97728c4a9..3f8c63cdd3 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -1006,11 +1006,10 @@ retry: } else { - CLISTEVENT cle = {0}; char service[128]; mir_snprintf(service, GGS_RECVIMAGE, m_szModuleName); - cle.cbSize = sizeof(cle); + CLISTEVENT cle = { 0 }; cle.hContact = hContact; cle.hIcon = LoadIconEx("image", FALSE); cle.flags = CLEF_URGENT; diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index d63dc3cfc1..cd52f2297f 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -62,7 +62,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, PostIrcMessage(_T("/PRIVMSG %s \001VERSION\001"), name.c_str()); } else { - CLISTEVENT cle = { sizeof(cle) }; + CLISTEVENT cle = {}; cle.hContact = hContact; cle.hDbEvent = -100; cle.flags = CLEF_TCHAR; diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index 5d4cc14e9d..53c9ef9f72 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -451,8 +451,7 @@ BOOL CJabberProto::AddClistHttpAuthEvent(CJabberHttpAuthParams *pParams) char szService[256]; mir_snprintf(szService, "%s%s", m_szModuleName, JS_HTTP_AUTH); - CLISTEVENT cle = { 0 }; - cle.cbSize = sizeof(CLISTEVENT); + CLISTEVENT cle = {}; cle.hIcon = (HICON)LoadIconEx("openid"); cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_TCHAR; cle.hDbEvent = -99; diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp index 3322b50b4a..dffac55378 100644 --- a/protocols/JabberG/src/jabber_notes.cpp +++ b/protocols/JabberG/src/jabber_notes.cpp @@ -776,10 +776,10 @@ bool CJabberProto::OnIncomingNote(const TCHAR *szFrom, HXML hXml) return false; } - CLISTEVENT cle = { 0 }; char szService[256]; mir_snprintf(szService, "%s%s", m_szModuleName, JS_INCOMING_NOTE_EVENT); - cle.cbSize = sizeof(CLISTEVENT); + + CLISTEVENT cle = {}; cle.hIcon = (HICON)LoadIconEx("notes"); cle.flags = CLEF_PROTOCOLGLOBAL | CLEF_TCHAR; cle.hDbEvent = -99; diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index c2ab7efd85..f63e04ecf9 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -657,11 +657,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA & if (bTrayIconNewMailNotify) { char szServiceFunction[MAX_PATH] = { 0 }, *pszServiceFunctionName; - CLISTEVENT cle = { 0 }; - - cle.cbSize = sizeof(cle); - //cle.hContact; - //cle.hDbEvent; + CLISTEVENT cle = {}; cle.lpszProtocol = m_szModuleName; cle.hIcon = IconLibGetIcon(gdiMenuItems[0].hIcolib); cle.flags = (CLEF_UNICODE | CLEF_PROTOCOLGLOBAL); diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index 834144232e..6723946566 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -286,9 +286,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) displayEmailCount(hContact); if (ShowPopup && !getByte("DisableHotmailTray", 1)) { - CLISTEVENT cle = { 0 }; - - cle.cbSize = sizeof(cle); + CLISTEVENT cle = {}; cle.hContact = hContact; cle.hDbEvent = 1; cle.flags = CLEF_URGENT | CLEF_TCHAR; diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 4de27f121a..933747d290 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -198,8 +198,8 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &) MEVENT hEvent = AddDbEvent(SKYPE_DB_EVENT_TYPE_INCOMING_CALL, hContact, time(NULL), DBEF_READ, gp.c_str(), callId.c_str()); SkinPlaySound("skype_inc_call"); - CLISTEVENT cle = { sizeof(cle) }; - cle.flags |= CLEF_TCHAR; + CLISTEVENT cle = {}; + cle.flags = CLEF_TCHAR; cle.hContact = hContact; cle.hDbEvent = hEvent; cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL; diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp index 1bbc9b5f11..9bd2aefb41 100644 --- a/protocols/Tox/src/tox_multimedia.cpp +++ b/protocols/Tox/src/tox_multimedia.cpp @@ -344,8 +344,8 @@ INT_PTR CToxProto::OnRecvAudioCall(WPARAM hContact, LPARAM lParam) MEVENT hEvent = AddEventToDb(hContact, DB_EVENT_CALL, pre->timestamp, DBEF_UTF, (PBYTE)pre->szMessage, mir_strlen(pre->szMessage)); - CLISTEVENT cle = { sizeof(cle) }; - cle.flags |= CLEF_TCHAR; + CLISTEVENT cle = {}; + cle.flags = CLEF_TCHAR; cle.hContact = hContact; cle.hDbEvent = hEvent; cle.lParam = DB_EVENT_CALL; diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp index df114f5caf..83c1e2b18e 100644 --- a/protocols/VKontakte/src/vk_feed.cpp +++ b/protocols/VKontakte/src/vk_feed.cpp @@ -77,7 +77,8 @@ void CVkProto::AddCListEvent(bool bNews) return; MCONTACT hContact = FindUser(VK_FEED_USER, true); - CLISTEVENT cle = { sizeof(cle) }; + + CLISTEVENT cle = {}; cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle(IDI_NOTIFICATION)); cle.pszService = "SRMsg/ReadMessage"; cle.flags = CLEF_URGENT | CLEF_TCHAR; -- cgit v1.2.3