From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:04:30 +0000
Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat
 constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewEventNotify/src/main.cpp         |  4 ++--
 plugins/NewEventNotify/src/neweventnotify.h | 10 +++++-----
 plugins/NewEventNotify/src/popup.cpp        |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/NewEventNotify')

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index e6ccc52c73..c1d12aee4e 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -62,7 +62,7 @@ HANDLE hHookedDeletedEvent;
 
 int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 {
-	HANDLE hContact = (HANDLE)wParam;
+	HCONTACT hContact = (HCONTACT)wParam;
 	PLUGIN_DATA* pdata;
 
 	//are popups currently enabled?
@@ -181,7 +181,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 //	1 - Split-mode window found
 //	2 - Single-mode window found
 
-int CheckMsgWnd(HANDLE hContact)
+int CheckMsgWnd(HCONTACT hContact)
 {
 	if (g_IsSrmmWindowAPI) {
 		MessageWindowData mwd;
diff --git a/plugins/NewEventNotify/src/neweventnotify.h b/plugins/NewEventNotify/src/neweventnotify.h
index 0a32d8652f..1cc9baf2e3 100644
--- a/plugins/NewEventNotify/src/neweventnotify.h
+++ b/plugins/NewEventNotify/src/neweventnotify.h
@@ -193,7 +193,7 @@ struct EVENT_DATA_EX
 struct PLUGIN_DATA
 {
 	UINT eventType;
-	HANDLE hContact;
+	HCONTACT hContact;
 	PLUGIN_OPTIONS* pluginOptions;
 	HWND hWnd;
 	struct EVENT_DATA_EX* firstEventData;
@@ -207,8 +207,8 @@ struct PLUGIN_DATA
 //---------------------------
 //---External Procedure Definitions
 
-int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UINT eventType);
-int PopupUpdate(HANDLE hContact, HANDLE hEvent);
+int PopupShow(PLUGIN_OPTIONS* pluginOptions, HCONTACT hContact, HANDLE hEvent, UINT eventType);
+int PopupUpdate(HCONTACT hContact, HANDLE hEvent);
 int PopupPreview(PLUGIN_OPTIONS* pluginOptions);
 int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATA* pdata);
 int OptionsInit(PLUGIN_OPTIONS* pluginOptions);
@@ -216,7 +216,7 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo);
 int Opt_DisableNEN(BOOL Status);
 int MenuitemInit(BOOL bStatus);
 int MenuitemUpdate(BOOL bStatus);
-int NumberPopupData(HANDLE hContact, int eventType);
-int CheckMsgWnd(HANDLE hContact);
+int NumberPopupData(HCONTACT hContact, int eventType);
+int CheckMsgWnd(HCONTACT hContact);
 
 extern HINSTANCE hInst;
diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 026ce4897c..7ab6e944ee 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -30,7 +30,7 @@ static int PopupCount = 0;
 
 PLUGIN_DATA* PopupList[MAX_POPUPS];
 
-int NumberPopupData(HANDLE hContact, int eventType)
+int NumberPopupData(HCONTACT hContact, int eventType)
 {
 	for (int n=0; n < MAX_POPUPS; n++) {
 		if (!PopupList[n] && !hContact && eventType == -1)
@@ -369,7 +369,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 	return TranslateTS( mir_a2t(commentFix));
 }
 
-int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UINT eventType)
+int PopupShow(PLUGIN_OPTIONS* pluginOptions, HCONTACT hContact, HANDLE hEvent, UINT eventType)
 {
 	TCHAR* sampleEvent;
 	long iSeconds;
@@ -486,7 +486,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 }
 
 
-int PopupUpdate(HANDLE hContact, HANDLE hEvent)
+int PopupUpdate(HCONTACT hContact, HANDLE hEvent)
 {
 	// merge only message popups
 	PLUGIN_DATA *pdata = (PLUGIN_DATA*)PopupList[NumberPopupData(hContact, EVENTTYPE_MESSAGE)];
-- 
cgit v1.2.3