- 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, 3 insertions, 5 deletions

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 2a090a77d0..7ab1ee59af 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -40,7 +40,7 @@ TemplateHTMLBuilder::~TemplateHTMLBuilder()
 			mir_free(flashAvatars[i]);

 }

 

-char *TemplateHTMLBuilder::getAvatar(HANDLE hContact, const char* szProto)

+char *TemplateHTMLBuilder::getAvatar(HCONTACT hContact, const char* szProto)

 {

 	DBVARIANT dbv;

 	TCHAR tmpPath[MAX_PATH];

@@ -159,7 +159,6 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 	CONTACTINFO ci;

 	char tempBase[1024];

 	char tempStr[1024];

-	HANDLE hRealContact;

 	char *szRealProto = NULL;

 	char *szBase=NULL;

 	char *szNoAvatar=NULL;

@@ -177,7 +176,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 	char *output;

 

 	output = NULL;

-	hRealContact = getRealContact(event->hContact);

+	HCONTACT hRealContact = getRealContact(event->hContact);

 	szRealProto = getProto(hRealContact);

 	szProto = getProto(event->pszProto, event->hContact);

 	tempBase[0]='\0';

@@ -327,7 +326,6 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 {

 	DBVARIANT dbv;

 	CONTACTINFO ci;

-	HANDLE hRealContact;

 	char *szRealProto = NULL;

 	char tempBase[1024];

 	char *szBase=NULL;

@@ -354,7 +352,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 	if (protoSettings == NULL)

 		return;

 	

-	hRealContact = getRealContact(event->hContact);

+	HCONTACT hRealContact = getRealContact(event->hContact);

 	szRealProto = getProto(hRealContact);

 	szProto = getProto(event->pszProto, event->hContact);

 	tempBase[0]='\0';