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

diff --git a/plugins/IEView/src/HTMLBuilder.h b/plugins/IEView/src/HTMLBuilder.h
index a5bdf24329..4c082c0f47 100644
--- a/plugins/IEView/src/HTMLBuilder.h
+++ b/plugins/IEView/src/HTMLBuilder.h
@@ -50,19 +50,19 @@ protected:
 		ENF_CHAT_FORMATTING = 256

 	};

 //	virtual char *encode(const char *text, const char *proto, bool replaceSmiley);

-	virtual char *encodeUTF8(HANDLE hContact, const char *proto, const wchar_t *text, int flags, bool isSent);

-	virtual char *encodeUTF8(HANDLE hContact, const char *proto, const char *text, int flags, bool isSent);

-	virtual char *encodeUTF8(HANDLE hContact, const char *proto, const char *text, int cp, int flags, bool isSent);

-	virtual wchar_t *encode(HANDLE hContact, const char *proto, const wchar_t *text, int flags, bool isSent);

-	virtual bool encode(HANDLE hContact, const char *proto, const wchar_t *text, wchar_t **output, int *outputSize,  int level, int flags, bool isSent);

-	virtual char* getProto(HANDLE hContact);

-	virtual char* getProto(const char *proto, HANDLE hContact);

-	virtual char* getRealProto(HANDLE hContact);

-	virtual char* getRealProto(HANDLE hContact, const char *proto);

-	virtual wchar_t *getContactName(HANDLE hContact, const char* szProto);

-	virtual char *getEncodedContactName(HANDLE hContact, const char *szProto, const char *szSmileyProto);

-	virtual void getUINs(HANDLE hContact, char *&uinIn, char *&uinOut);

-	virtual HANDLE getRealContact(HANDLE hContact);

+	virtual char *encodeUTF8(HCONTACT hContact, const char *proto, const wchar_t *text, int flags, bool isSent);

+	virtual char *encodeUTF8(HCONTACT hContact, const char *proto, const char *text, int flags, bool isSent);

+	virtual char *encodeUTF8(HCONTACT hContact, const char *proto, const char *text, int cp, int flags, bool isSent);

+	virtual wchar_t *encode(HCONTACT hContact, const char *proto, const wchar_t *text, int flags, bool isSent);

+	virtual bool encode(HCONTACT hContact, const char *proto, const wchar_t *text, wchar_t **output, int *outputSize,  int level, int flags, bool isSent);

+	virtual char* getProto(HCONTACT hContact);

+	virtual char* getProto(const char *proto, HCONTACT hContact);

+	virtual char* getRealProto(HCONTACT hContact);

+	virtual char* getRealProto(HCONTACT hContact, const char *proto);

+	virtual wchar_t *getContactName(HCONTACT hContact, const char* szProto);

+	virtual char *getEncodedContactName(HCONTACT hContact, const char *szProto, const char *szSmileyProto);

+	virtual void getUINs(HCONTACT hContact, char *&uinIn, char *&uinOut);

+	virtual HCONTACT getRealContact(HCONTACT hContact);

 	virtual DWORD getLastEventTime();

 	virtual void setLastEventTime(DWORD);

 	virtual int getLastEventType();

@@ -70,11 +70,11 @@ protected:
 	virtual bool isSameDate(time_t time1, time_t time2);

 	virtual bool isDbEventShown(DBEVENTINFO * dbei)=0;

 	virtual ProtocolSettings *getSRMMProtocolSettings(const char *protocolName);

-	virtual ProtocolSettings *getSRMMProtocolSettings(HANDLE hContact);

+	virtual ProtocolSettings *getSRMMProtocolSettings(HCONTACT hContact);

 	virtual ProtocolSettings *getHistoryProtocolSettings(const char *protocolName);

-	virtual ProtocolSettings *getHistoryProtocolSettings(HANDLE hContact);

+	virtual ProtocolSettings *getHistoryProtocolSettings(HCONTACT hContact);

 	virtual ProtocolSettings *getChatProtocolSettings(const char *protocolName);

-	virtual ProtocolSettings *getChatProtocolSettings(HANDLE hContact);

+	virtual ProtocolSettings *getChatProtocolSettings(HCONTACT hContact);

 	void	setLastIEViewEvent(IEVIEWEVENT *event);

 	virtual void buildHead(IEView *, IEVIEWEVENT *event)=0;

 public: