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/BuddyPounce/src/dialog.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/BuddyPounce/src/dialog.cpp')

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 9395887a5c..d47444d3bd 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -12,7 +12,7 @@ void populateSettingsList(HWND hwnd2List)
 
 void populateContacts(HANDLE BPhContact,HWND hwnd2CB)
 {
-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		char *szProto = GetContactProto(hContact);
 		if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {
 			TCHAR name[300];
@@ -25,7 +25,7 @@ void populateContacts(HANDLE BPhContact,HWND hwnd2CB)
 	}
 }
 
-void saveLastSetting(HANDLE hContact, HWND hwnd)
+void saveLastSetting(HCONTACT hContact, HWND hwnd)
 {
 	TCHAR number[8];//, string[1024];//for sending file name
 	switch (db_get_b(hContact, modname, "LastSetting", 2)) { // nothing to do
@@ -63,7 +63,7 @@ void hideAll(HWND hwnd)
 	ShowWindow(GetDlgItem(hwnd, IDC_SPIN), SW_HIDE);
 }
 
-void getDefaultMessage(HWND hwnd, UINT control, HANDLE hContact)
+void getDefaultMessage(HWND hwnd, UINT control, HCONTACT hContact)
 {
 	DBVARIANT dbv;
 	if (!db_get_ts(hContact, modname, "PounceMsg", &dbv)) {
@@ -178,7 +178,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 	CheckDlgButton(hwnd, IDC_CHECK10, (statusFlag&LUNCH)>>9);
 }
 
-void deletePounce(HANDLE hContact)
+void deletePounce(HCONTACT hContact)
 {
 	db_unset(hContact,modname, "PounceMsg");
 	db_unset(hContact,modname, "SendIfMyStatusIsFLAG");
@@ -192,12 +192,12 @@ void deletePounce(HANDLE hContact)
 
 INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	HANDLE hContact = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+	HCONTACT hContact = (HCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
 	switch(msg) {
 	case WM_INITDIALOG:
 		TranslateDialogDefault(hwnd);
-		hContact = (HANDLE)lParam;
+		hContact = (HCONTACT)lParam;
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LPARAM)lParam);
 
 		getDefaultMessage(hwnd, IDC_MESSAGE, hContact);
@@ -259,7 +259,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 			msg(TranslateT("error......"), TranslateT("Buddy Pounce"));
 			DestroyWindow(hwnd);
 		}
-		wi->hContact = (HANDLE)lParam;
+		wi->hContact = (HCONTACT)lParam;
 		wi->SendIfMy = 0;
 		wi->SendWhenThey = 0;
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LPARAM)wi);
@@ -290,7 +290,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		case IDC_SIMPLE:
 		case IDOK:
 			{
-				HANDLE hContact = (HANDLE)SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETITEMDATA, SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETCURSEL,0,0),0);
+				HCONTACT hContact = (HCONTACT)SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETITEMDATA, SendMessage(GetDlgItem(hwnd, IDC_CONTACTS), CB_GETCURSEL,0,0),0);
 				int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE))+1;
 				if (length>1) {
 					TCHAR *text = (TCHAR*)mir_alloc(length*sizeof(TCHAR));
@@ -416,7 +416,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
 				windowInfo *wi = (windowInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-				HANDLE hContact = ((windowInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA))->hContact;
+				HCONTACT hContact = ((windowInfo *)GetWindowLongPtr(hwnd, GWLP_USERDATA))->hContact;
 				int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE))+1;
 				if (length > 1) {
 					TCHAR *text = (TCHAR*)mir_alloc(length*sizeof(TCHAR));
@@ -570,13 +570,13 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 
 INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	HANDLE hContact = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+	HCONTACT hContact = (HCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
 	switch(msg) {
 	case WM_INITDIALOG:
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (WPARAM)lParam);
 		TranslateDialogDefault(hwnd);
-		hContact = (HANDLE)lParam;
+		hContact = (HCONTACT)lParam;
 		{
 			DBVARIANT dbv;
 			if (db_get_ts(hContact, modname, "PounceMsg", &dbv))
@@ -608,7 +608,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 	return 0;
 }
 
-void CreateMessageAcknowlegedWindow(HANDLE hContact, int SentSuccess)
+void CreateMessageAcknowlegedWindow(HCONTACT hContact, int SentSuccess)
 {
 	HWND hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONFIRMSEND), 0, PounceSentDlgProc, (LPARAM)hContact);
 	TCHAR msg[256];
-- 
cgit v1.2.3