- 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, 7 insertions, 8 deletions

diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index 0b83a036cb..4d2715dc39 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -485,7 +485,7 @@ class CContactUpdater : public CContactQueue
 {

 	CUpdProgress*		_pProgress;			// pointer to the progress dialog/popup

 	HANDLE				_hProtoAckEvent;	// handle to protocol ack notification

-	HANDLE				_hContact;			// current contact being refreshed

+	HCONTACT				_hContact;			// current contact being refreshed

 	PBYTE				_hContactAcks;		// array of acknoledgements for the current contact to wait for

 	INT_PTR				_nContactAcks;		// number of acknoledgements for the current contact to wait for

 

@@ -627,7 +627,7 @@ class CContactUpdater : public CContactQueue
 	 *

 	 * @return	nothing

 	 **/

-	virtual void Callback(HANDLE hContact, PVOID param)

+	virtual void Callback(HCONTACT hContact, PVOID param)

 	{

 		LPSTR	pszProto	= DB::Contact::Proto(hContact);

 

@@ -687,7 +687,7 @@ public:
 	 *

 	 *

 	 **/

-	BOOL QueueAddRefreshContact(HANDLE hContact, int iWait)

+	BOOL QueueAddRefreshContact(HCONTACT hContact, int iWait)

 	{

 		LPSTR pszProto = DB::Contact::Proto(hContact);

 

@@ -708,7 +708,7 @@ public:
 	{

 		int iWait = 100;

 

-		for (HANDLE hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))

+		for (HCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))

 			if (QueueAddRefreshContact(hContact, iWait))

 				iWait += 5000;

 

@@ -840,13 +840,13 @@ static int OnContactAdded(WPARAM wParam, LPARAM lParam)
 {

 	try

 	{

-		DWORD dwStmp = db_get_dw((HANDLE)wParam, USERINFO, SET_CONTACT_ADDEDTIME, 0);

+		DWORD dwStmp = db_get_dw((HCONTACT)wParam, USERINFO, SET_CONTACT_ADDEDTIME, 0);

 		if (!dwStmp)

 		{

 			MTime mt;

 			

 			mt.GetLocalTime();

-			mt.DBWriteStamp((HANDLE)wParam, USERINFO, SET_CONTACT_ADDEDTIME);

+			mt.DBWriteStamp((HCONTACT)wParam, USERINFO, SET_CONTACT_ADDEDTIME);

 

 			// create updater, if not yet exists

 			if (!ContactUpdater)

@@ -858,8 +858,7 @@ static int OnContactAdded(WPARAM wParam, LPARAM lParam)
 			ContactUpdater->AddIfDontHave(

 				(ContactUpdater->Size() > 0) 

 					? max(ContactUpdater->Get(ContactUpdater->Size() - 1)->check_time + 15000, 4000) 

-					: 4000,

-					(HANDLE)wParam);

+					: 4000, (HCONTACT)wParam);

 		}

 	}

 	catch(...)