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

4 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index cfb30d7069..f92b95bb30 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -266,7 +266,7 @@ int     cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixO
 int     cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

 int     cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact);

 int     cli_GetContactIcon(MCONTACT hContact);

-int     cli_RemoveEvent(MCONTACT hContact, HANDLE hDbEvent);

+int     cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);

 void    cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

 void    cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);

 void    cli_FreeContact(ClcContact*);

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 43ab091a44..5d03e2e199 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -247,7 +247,7 @@ static int clcHookDbEventAdded(WPARAM hContact, LPARAM lParam)
 	g_CluiData.t_now = time(NULL);
 	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)) {
 			db_set_dw(hContact, "CList", "mf_lastmsg", dbei.timestamp);
 			ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hContact);
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index a3976c01fd..85a278a7ad 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -78,7 +78,7 @@ struct NotifyMenuItemExData {
 	MCONTACT hContact;

 	int iIcon;              // icon index in the image list

 	HICON hIcon;            // corresponding icon handle

-	HANDLE hDbEvent;

+	MEVENT hDbEvent;

 };

 

 static CLISTEVENT* MyGetEvent(int iSelection)

@@ -106,7 +106,7 @@ struct CListEvent* cli_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 &&

@@ -170,7 +170,7 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle)
 }

 

 

-int cli_RemoveEvent(MCONTACT hContact, HANDLE hDbEvent)

+int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)

 {

 	// Find the event that should be removed

 	int i;

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index e7f9bf90eb..383500629d 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -65,7 +65,7 @@ static int GetStatusModeOrdering(int statusMode)
 

 DWORD CompareContacts2_getLMTime(MCONTACT hContact)

 {

-	HANDLE hDbEvent = db_event_last(hContact);

+	MEVENT hDbEvent = db_event_last(hContact);

 	while (hDbEvent) {

 		DBEVENTINFO dbei = { sizeof(dbei) };

 		db_event_get(hDbEvent, &dbei);