more HCONTACT

git-svn-id: http://svn.miranda-ng.org/main/trunk@8079 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 34 insertions, 34 deletions

diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index cf351b65a5..6a024ad099 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -214,50 +214,50 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 				// Protocol interface

 

-	virtual	HANDLE __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	HANDLE __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );

+	virtual	HCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

+	virtual	HCONTACT  __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );

 

-	virtual	int    __cdecl Authorize(HANDLE hDbEvent);

-	virtual	int    __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason);

-	virtual	int    __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl AuthRequest(HCONTACT hContact, const TCHAR *szMessage);

+	virtual	int       __cdecl Authorize(HANDLE hDbEvent);

+	virtual	int       __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason);

+	virtual	int       __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl AuthRequest(HCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE __cdecl ChangeInfo( int iInfoType, void *pInfoData);

+	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void *pInfoData);

 

-	virtual	HANDLE __cdecl FileAllow(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

-	virtual	int    __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer );

-	virtual	int    __cdecl FileDeny(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

-	virtual	int    __cdecl FileResume( HANDLE hTransfer, int *action, const TCHAR **szFilename);

+	virtual	HANDLE    __cdecl FileAllow(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

+	virtual	int       __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer );

+	virtual	int       __cdecl FileDeny(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

+	virtual	int       __cdecl FileResume( HANDLE hTransfer, int *action, const TCHAR **szFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps( int type, HCONTACT hContact = NULL);

-	virtual	int    __cdecl GetInfo(HCONTACT hContact, int infoType);

+	virtual	int       __cdecl GetInfo(HCONTACT hContact, int infoType);

 

-	virtual	HANDLE __cdecl SearchBasic(const PROTOCHAR* id);

-	virtual	HANDLE __cdecl SearchByEmail(const PROTOCHAR* email);

-	virtual	HANDLE __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

-	virtual	HWND   __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND   __cdecl CreateExtendedSearchUI(HWND owner);

+	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

+	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

+	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

+	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

+	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int    __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl RecvFile(HCONTACT hContact, PROTORECVFILET*);

-	virtual	int    __cdecl RecvMsg(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int    __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvFile(HCONTACT hContact, PROTORECVFILET*);

+	virtual	int       __cdecl RecvMsg(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int    __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList);

-	virtual	HANDLE __cdecl SendFile(HCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

-	virtual	int    __cdecl SendMsg(HCONTACT hContact, int flags, const char* msg);

-	virtual	int    __cdecl SendUrl(HCONTACT hContact, int flags, const char* url);

+	virtual	int       __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList);

+	virtual	HANDLE    __cdecl SendFile(HCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

+	virtual	int       __cdecl SendMsg(HCONTACT hContact, int flags, const char* msg);

+	virtual	int       __cdecl SendUrl(HCONTACT hContact, int flags, const char* url);

 

-	virtual	int    __cdecl SetApparentMode(HCONTACT hContact, int mode);

-	virtual	int    __cdecl SetStatus(int iNewStatus);

+	virtual	int       __cdecl SetApparentMode(HCONTACT hContact, int mode);

+	virtual	int       __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE __cdecl GetAwayMsg(HCONTACT hContact);

-	virtual	int    __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT *evt);

-	virtual	int    __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

+	virtual	HANDLE    __cdecl GetAwayMsg(HCONTACT hContact);

+	virtual	int       __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT *evt);

+	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

 

-	virtual	int    __cdecl UserIsTyping(HCONTACT hContact, int type);

+	virtual	int       __cdecl UserIsTyping(HCONTACT hContact, int type);

 

-	virtual	int    __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

+	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

 

 	// Services

 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM);

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index e1a26116f4..1a33ac9a73 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -318,7 +318,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM)
 ////////////////////////////////////////////////////////////////////////////////////////

 // AddToList - adds a contact to the contact list

 

-HANDLE __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)

+HCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)

 {

 	if (m_iStatus == ID_STATUS_OFFLINE || m_iStatus == ID_STATUS_CONNECTING)

 		return 0;

@@ -359,7 +359,7 @@ HANDLE __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
 ////////////////////////////////////////////////////////////////////////////////////////

 // AddToList - adds a contact to the contact list

 

-HANDLE __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)

+HCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)

 {

 	return NULL;

 }