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

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 08415dda17..1a27ac5079 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -60,7 +60,7 @@ enum {
 

 struct ANIAVA_OBJECT

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	HWND   hWindow;

 	BOOL   bInvalidPos;

 	BOOL   bToBeDeleted;

@@ -284,7 +284,7 @@ int AniAva_UpdateOptions()
 }

 

 // adds avatars to be displayed

-int AniAva_AddAvatar(HANDLE hContact, TCHAR * szFilename, int width, int heigth)

+int AniAva_AddAvatar(HCONTACT hContact, TCHAR * szFilename, int width, int heigth)

 {

 	aacheck 0;

 	if (!GDIPlus_IsAnimatedGif (szFilename))

@@ -344,7 +344,7 @@ void AniAva_UpdateParent()
 	}

 }

 

-ANIAVA_OBJECT * FindAvatarByContact( HANDLE hContact )

+ANIAVA_OBJECT * FindAvatarByContact(HCONTACT hContact )

 {

 	for ( int i=0; i < s_Objects.getCount(); i++) {

 		ANIAVA_OBJECT *pai = ((ANIAVA_OBJECT *)s_Objects[i]);

@@ -354,7 +354,7 @@ ANIAVA_OBJECT * FindAvatarByContact( HANDLE hContact )
 	return NULL;

 }

 

-int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT *rc )

+int AniAva_RenderAvatar(HCONTACT hContact, HDC hdcMem, RECT *rc )

 {

 	aacheck 0;

 	mir_cslock lck(s_CS);

@@ -365,7 +365,7 @@ int AniAva_RenderAvatar( HANDLE hContact, HDC hdcMem, RECT *rc )
 }

 

 // update avatars pos

-int AniAva_SetAvatarPos(HANDLE hContact, RECT *rc, int overlayIdx, BYTE bAlpha)

+int AniAva_SetAvatarPos(HCONTACT hContact, RECT *rc, int overlayIdx, BYTE bAlpha)

 {

 	aacheck 0;

 	mir_cslock lck(s_CS);

@@ -404,7 +404,7 @@ int AniAva_SetAvatarPos(HANDLE hContact, RECT *rc, int overlayIdx, BYTE bAlpha)
 	return 1;

 }

 // remove avatar

-int AniAva_RemoveAvatar(HANDLE hContact)

+int AniAva_RemoveAvatar(HCONTACT hContact)

 {

 	aacheck 0;

 	mir_cslock lck(s_CS);

@@ -419,7 +419,7 @@ int AniAva_RemoveAvatar(HANDLE hContact)
 	return 1;

 }

 // reset positions of avatars to be drawn (still be painted at same place)

-int AniAva_InvalidateAvatarPositions(HANDLE hContact)

+int AniAva_InvalidateAvatarPositions(HCONTACT hContact)

 {

 	aacheck 0;

 	mir_cslock lck(s_CS);