HCONTACT is not needed anymore

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

1 files changed, 30 insertions, 30 deletions

diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h
index 667473292b..d01daf5144 100644
--- a/protocols/Yahoo/src/proto.h
+++ b/protocols/Yahoo/src/proto.h
@@ -25,23 +25,23 @@ struct CYahooProto : public PROTO<CYahooProto>
 	// PROTO_INTERFACE

 	//====================================================================================

 

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

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

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

+	virtual	MCONTACT  __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 AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

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

 

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

 

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

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

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

+	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

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

+	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

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

 

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

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

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

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

 

 	virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

 	virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email );

@@ -49,25 +49,25 @@ struct CYahooProto : public PROTO<CYahooProto>
 	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(MCONTACT hContact, PROTORECVEVENT*);

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

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

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

 

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

-	virtual	HANDLE    __cdecl SendFile(HCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **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(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

+	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles);

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

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

 

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

+	virtual	int       __cdecl SetApparentMode(MCONTACT 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	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

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

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

 	virtual INT_PTR    __cdecl GetMyAwayMsg(WPARAM wParam, LPARAM lParam);

 

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

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

 

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

 

@@ -152,11 +152,11 @@ struct CYahooProto : public PROTO<CYahooProto>
 	void   ext_got_picture_upload(const char *me, const char *url, unsigned int ts);

 	void   ext_got_avatar_share(int buddy_icon);

 

-	void   reset_avatar(HCONTACT hContact);

+	void   reset_avatar(MCONTACT hContact);

 	void   request_avatar(const char* who);

 

 	void   SendAvatar(const TCHAR *szFile);

-	void   GetAvatarFileName(HCONTACT hContact, TCHAR* pszDest, int cbLen, int type);

+	void   GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, int cbLen, int type);

 

 	//====| chat.cpp |====================================================================

 	void ChatRegister(void);

@@ -223,20 +223,20 @@ struct CYahooProto : public PROTO<CYahooProto>
 	int     __cdecl  OnUserInfoInit( WPARAM wParam, LPARAM lParam );

 

 	//====| util.cpp |====================================================================

-	int    GetStringUtf(HCONTACT hContact, const char* name, DBVARIANT* );

-	DWORD  SetStringUtf(HCONTACT hContact, const char* valueName, const char* parValue );

+	int    GetStringUtf(MCONTACT hContact, const char* name, DBVARIANT* );

+	DWORD  SetStringUtf(MCONTACT hContact, const char* valueName, const char* parValue );

 

-	DWORD  Set_Protocol(HCONTACT hContact, int protocol );

+	DWORD  Set_Protocol(MCONTACT hContact, int protocol );

 

 	int    ShowNotification(const TCHAR *title, const TCHAR *info, DWORD flags);

 	void   ShowError(const TCHAR *title, const TCHAR *buff);

 	int    ShowPopup( const TCHAR* nickname, const TCHAR* msg, const char *szURL );

-	bool   IsMyContact(HCONTACT hContact);

+	bool   IsMyContact(MCONTACT hContact);

 

 	//====| yahoo.cpp |===================================================================

-	HCONTACT add_buddy(const char *yahoo_id, const char *yahoo_name, int protocol, DWORD flags);

+	MCONTACT add_buddy(const char *yahoo_id, const char *yahoo_name, int protocol, DWORD flags);

 	const char *find_buddy( const char *yahoo_id);

-	HCONTACT getbuddyH(const char *yahoo_id);

+	MCONTACT getbuddyH(const char *yahoo_id);

 	void   remove_buddy(const char *who, int protocol);

 

 	void   logout();

@@ -272,7 +272,7 @@ struct CYahooProto : public PROTO<CYahooProto>
 	void   ext_login_response(int succ, const char *url);

 	void   ext_login(enum yahoo_status login_mode);

 

-	void   AddBuddy(HCONTACT hContact, const char *group, const TCHAR *msg);

+	void   AddBuddy(MCONTACT hContact, const char *group, const TCHAR *msg);

 

 	void   YAHOO_utils_logversion();