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 --- src/mir_app/src/chat_clist.cpp | 3 +-- src/mir_app/src/clistevents.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp index 24c7bba5c1..267fca44d5 100644 --- a/src/mir_app/src/chat_clist.cpp +++ b/src/mir_app/src/chat_clist.cpp @@ -212,8 +212,7 @@ BOOL AddEvent(MCONTACT hContact, HICON hIcon, MEVENT hEvent, int type, TCHAR* fm mir_vsntprintf(szBuf, _countof(szBuf), fmt, marker); va_end(marker); - CLISTEVENT cle = { 0 }; - cle.cbSize = sizeof(cle); + CLISTEVENT cle = {}; cle.hContact = hContact; cle.hDbEvent = hEvent; cle.flags = type | CLEF_TCHAR; diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp index 8a6831b93e..2d7e90aaa2 100644 --- a/src/mir_app/src/clistevents.cpp +++ b/src/mir_app/src/clistevents.cpp @@ -54,7 +54,7 @@ int fnGetImlIconIndex(HICON hIcon) return imlIcon[i].index; } -static char * GetEventProtocol(int idx) +static char* GetEventProtocol(int idx) { if (!cli.events.count || idx < 0 && idx >= cli.events.count) return NULL; @@ -132,11 +132,10 @@ static VOID CALLBACK IconFlashTimer(HWND, UINT, UINT_PTR idEvent, DWORD) CListEvent* fnAddEvent(CLISTEVENT *cle) { - int i; - - if (cle == NULL || cle->cbSize != sizeof(CLISTEVENT)) + if (cle == NULL) return NULL; + int i; if (cle->flags & CLEF_URGENT) { for (i=0; i < cli.events.count; i++) if (!(cli.events.items[i]->flags & CLEF_URGENT)) -- cgit v1.2.3