- 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

1 files changed, 12 insertions, 12 deletions

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 978da21f4f..653f9c77b2 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -253,7 +253,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
 	myGlobals.WantAeroAdaption = db_get_b(NULL, MODNAME, SET_PROPSHEET_AEROADAPTION, TRUE);

 

 	// allow only one dialog per user

-	if (HWND hWnd = WindowList_Find(ghWindowList, (HANDLE)wParam)) {

+	if (HWND hWnd = WindowList_Find(ghWindowList, (HCONTACT)wParam)) {

 		SetForegroundWindow(hWnd);

 		SetFocus(hWnd);

 		return 0;

@@ -285,7 +285,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
 	ImageList_AddIcon(psh._hImages, hDefIcon);

 

 	// init contact

-	psh._hContact = (HANDLE)wParam;

+	psh._hContact = (HCONTACT)wParam;

 	if (psh._hContact == NULL) {

 		// mark owner icons as initiated

 		bInitIcons |= INIT_ICONS_OWNER;

@@ -294,7 +294,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
 	}

 	else {

 		// get contact's protocol

-		psh._pszPrefix = psh._pszProto = DB::Contact::Proto((HANDLE)wParam);

+		psh._pszPrefix = psh._pszProto = DB::Contact::Proto((HCONTACT)wParam);

 		if (psh._pszProto == NULL) {

 			MsgErr(NULL, LPGENT("Could not find contact's protocol. Maybe it is not active!"));

 			return 1;

@@ -313,12 +313,12 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
 

 	// metacontacts sub pages

 	if (bScanMetaSubContacts) {

-		int numSubs = DB::MetaContact::SubCount((HANDLE)wParam);

+		int numSubs = DB::MetaContact::SubCount((HCONTACT)wParam);

 

 		psh._dwFlags &= ~PSF_PROTOPAGESONLY_INIT;

 		psh._dwFlags |= PSF_PROTOPAGESONLY;

 		for (int i = 0; i < numSubs; i++) {

-			psh._hContact = DB::MetaContact::Sub((HANDLE)wParam, i);

+			psh._hContact = DB::MetaContact::Sub((HCONTACT)wParam, i);

 			psh._nSubContact = i;

 			if (psh._hContact) {

 				psh._pszProto = DB::Contact::Proto(psh._hContact);

@@ -326,7 +326,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam)
 					NotifyEventHooks(ghDetailsInitEvent, (WPARAM)&psh, (LPARAM)psh._hContact);

 			}

 		}

-		psh._hContact = (HANDLE)wParam;

+		psh._hContact = (HCONTACT)wParam;

 	}

 

 	// sort the pages by the position read from database

@@ -409,10 +409,10 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam)
 **/

 static int OnDeleteContact(WPARAM wParam, LPARAM lParam)

 {

-	 HWND hWnd = WindowList_Find(ghWindowList, (HANDLE)wParam);

-	 if (hWnd != NULL)

-		 DestroyWindow(hWnd);

-	 return 0;

+	HWND hWnd = WindowList_Find(ghWindowList, (HCONTACT)wParam);

+	if (hWnd != NULL)

+		DestroyWindow(hWnd);

+	return 0;

 }

 

 /**

@@ -1356,7 +1356,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 	**/

 	case HM_SETTING_CHANGED:

 		if (!(pPs->dwFlags & PSF_LOCKED)) {

-			HANDLE hContact = (HANDLE)wParam;

+			HCONTACT hContact = (HCONTACT)wParam;

 			DBCONTACTWRITESETTING *pdbcws = (DBCONTACTWRITESETTING*)lParam;

 

 			if (hContact != pPs->hContact) {

@@ -1593,7 +1593,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					// count valid subcontacts whose protocol supports the PSS_GETINFO service to update the information

 					int numSubs = DB::MetaContact::SubCount(pPs->hContact);

 					for (int i = 0; i < numSubs; i++) {

-						HANDLE hSubContact = DB::MetaContact::Sub(pPs->hContact, i);

+						HCONTACT hSubContact = DB::MetaContact::Sub(pPs->hContact, i);

 						if (hSubContact != NULL) {

 							if (ProtoServiceExists(DB::Contact::Proto(hSubContact), PSS_GETINFO)) {

 								pPs->infosUpdated = (TAckInfo*)mir_realloc(pPs->infosUpdated, sizeof(TAckInfo)* (pPs->nSubContacts + 1));