From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 16 Jan 2015 17:49:54 +0000
Subject: MEVENT - the strict type for events, they are not HANDLE anymore
git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/Clist_nicer/src/Include/clc.h | 2 +-
plugins/Clist_nicer/src/clc.cpp | 2 +-
plugins/Clist_nicer/src/clistevents.cpp | 4 ++--
plugins/Clist_nicer/src/contact.cpp | 4 ++--
plugins/Clist_nicer/src/init.cpp | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'plugins/Clist_nicer')
diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h
index b9911140ff..5e93ec0b54 100644
--- a/plugins/Clist_nicer/src/Include/clc.h
+++ b/plugins/Clist_nicer/src/Include/clc.h
@@ -333,7 +333,7 @@ struct NotifyMenuItemExData
MCONTACT hContact;
int iIcon; // icon index in the image list
HICON hIcon; // corresponding icon handle
- HANDLE hDbEvent;
+ MEVENT hDbEvent;
};
// #define NOTIFY_HEIGHT 24
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 61c12e4dd5..db8eda857b 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -76,7 +76,7 @@ static int ClcEventAdded(WPARAM hContact, LPARAM lParam)
if (hContact && lParam) {
DBEVENTINFO dbei = { sizeof(dbei) };
- db_event_get((HANDLE)lParam, &dbei);
+ db_event_get(lParam, &dbei);
if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT)) {
DWORD firstTime = cfg::getDword(hContact, "CList", "mf_firstEvent", 0);
DWORD count = cfg::getDword(hContact, "CList", "mf_count", 0);
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index b4c710ce06..16c1735c73 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -257,7 +257,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
if (p == NULL)
return NULL;
- if (p->cle.hContact != 0 && p->cle.hDbEvent != (HANDLE)1 && !(p->cle.flags & CLEF_ONLYAFEW)) {
+ if (p->cle.hContact != 0 && p->cle.hDbEvent != 1 && !(p->cle.flags & CLEF_ONLYAFEW)) {
MENUITEMINFO mii = { sizeof(mii) };
mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;
if (p->cle.pszService && !strncmp("SRMsg/ReadMessage", p->cle.pszService, 17)) {
@@ -329,7 +329,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
// wParam=(MCONTACT)hContact
// lParam=(LPARAM)(HANDLE)hDbEvent
// Returns 0 if the event was successfully removed, or nonzero if the event was not found
-int RemoveEvent(MCONTACT hContact, HANDLE hDbEvent)
+int RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)
{
// Find the event that should be removed
int i;
diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index bf9d9ade7b..bf060534fd 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -66,7 +66,7 @@ static void MF_CalcFrequency(MCONTACT hContact, DWORD dwCutoffDays, int doSleep)
{
DWORD curTime = time(NULL);
DWORD frequency, eventCount;
- HANDLE hEvent = db_event_last(hContact);
+ MEVENT hEvent = db_event_last(hContact);
eventCount = 0;
@@ -151,7 +151,7 @@ void LoadContactTree(void)
DWORD INTSORT_GetLastMsgTime(MCONTACT hContact)
{
- for (HANDLE hDbEvent = db_event_last(hContact); hDbEvent; hDbEvent = db_event_prev(hContact, hDbEvent)) {
+ for (MEVENT hDbEvent = db_event_last(hContact); hDbEvent; hDbEvent = db_event_prev(hContact, hDbEvent)) {
DBEVENTINFO dbei = { sizeof(dbei) };
db_event_get(hDbEvent, &dbei);
if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT))
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index ec724c0246..a9eef79489 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -60,7 +60,7 @@ ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD fl
int AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact);
int AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);
LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);
-int RemoveEvent(MCONTACT hContact, HANDLE hDbEvent);
+int RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);
INT_PTR TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);
void RecalcScrollBar(HWND hwnd, struct ClcData *dat);
--
cgit v1.2.3