- 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

3 files changed, 23 insertions, 23 deletions

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];

diff --git a/plugins/BuddyPounce/src/headers.h b/plugins/BuddyPounce/src/headers.h
index 3a48a35375..48c499442c 100644
--- a/plugins/BuddyPounce/src/headers.h
+++ b/plugins/BuddyPounce/src/headers.h
@@ -47,14 +47,14 @@
 

 struct windowInfo

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	HWND SendIfMy;

 	HWND SendWhenThey;

 };

 

 struct SendPounceDlgProcStruct

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	int timer;

 	TCHAR *message;

 };

@@ -66,13 +66,13 @@ extern HINSTANCE hInst;
 //=======================================================

 

 // main.c

-void SendPounce(TCHAR* text, HANDLE hContact);

+void SendPounce(TCHAR* text, HCONTACT hContact);

 

 //dialog.c

 INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

-void CreateMessageAcknowlegedWindow(HANDLE hContact, int SentSuccess);

+void CreateMessageAcknowlegedWindow(HCONTACT hContact, int SentSuccess);

 

 #endif //_COMMONHEADERS_H
\ No newline at end of file
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index cbca095e37..18e8a64c44 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -133,7 +133,7 @@ int statusCheck(int statusFlag, int status)
 	}

 	return 0;

 }

-int CheckDate(HANDLE hContact)

+int CheckDate(HCONTACT hContact)

 {

 	time_t curtime = time (NULL);

 	if(!db_get_b(hContact,modname,"GiveUpDays",0))

@@ -143,7 +143,7 @@ int CheckDate(HANDLE hContact)
 	return 0;

 }

 

-void SendPounce(TCHAR *text, HANDLE hContact)

+void SendPounce(TCHAR *text, HCONTACT hContact)

 {

 	char* pszUtf = mir_utf8encodeT(text);

 	if (HANDLE hSendId = (HANDLE)CallContactService(hContact, PSS_MESSAGE, PREF_UTF, (LPARAM)pszUtf)) 

@@ -153,14 +153,14 @@ void SendPounce(TCHAR *text, HANDLE hContact)
 

 int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;

 

 	char *szProto = GetContactProto(hContact);

 	if((HANDLE)wParam == NULL || strcmp(cws->szSetting,"Status")) return 0;

 	if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {

 		int newStatus = cws->value.wVal;

-		int oldStatus = db_get_w((HANDLE)wParam,"UserOnline","OldStatus",ID_STATUS_OFFLINE);

+		int oldStatus = db_get_w((HCONTACT)wParam,"UserOnline","OldStatus",ID_STATUS_OFFLINE);

 		

 		if (newStatus != oldStatus && wParam != NULL && newStatus != ID_STATUS_OFFLINE) {

 			DBVARIANT dbv;

@@ -192,7 +192,7 @@ int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam)
 

 INT_PTR BuddyPounceMenuCommand(WPARAM wParam, LPARAM lParam)

 {

-	if (db_get_b(NULL, modname, "UseAdvanced", 0) || db_get_b((HANDLE)wParam, modname, "UseAdvanced", 0))

+	if (db_get_b(NULL, modname, "UseAdvanced", 0) || db_get_b((HCONTACT)wParam, modname, "UseAdvanced", 0))

 		CreateDialogParam(hInst,MAKEINTRESOURCE(IDD_POUNCE),0,BuddyPounceDlgProc, wParam);

 	else CreateDialogParam(hInst,MAKEINTRESOURCE(IDD_POUNCE_SIMPLE),0,BuddyPounceSimpleDlgProc, wParam);

 	return 0;

@@ -200,7 +200,7 @@ INT_PTR BuddyPounceMenuCommand(WPARAM wParam, LPARAM lParam)
 

 INT_PTR AddSimpleMessage(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	TCHAR* message = (TCHAR*)lParam;

 	time_t today = time(NULL);

 	db_set_ws(hContact, modname, "PounceMsg", message);

@@ -214,7 +214,7 @@ INT_PTR AddSimpleMessage(WPARAM wParam, LPARAM lParam)
 

 INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	TCHAR* message = (TCHAR*)lParam;

 	DBVARIANT dbv;

 	if (!db_get_ts(hContact, modname, "PounceMsg",&dbv))