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/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index 27aed96317..01f3f43e23 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -46,14 +46,14 @@ CSkypeProto::~CSkypeProto()
 	}

 }

 

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

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

 {

 	CContact::Ref contact;

 	this->GetContact((char *)mir_ptr<char>(::mir_utf8encodeW(psr->id)), contact);

 	return this->AddContact(contact);

 }

 

-HANDLE __cdecl CSkypeProto::AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)

+HCONTACT __cdecl CSkypeProto::AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)

 {

 	DBEVENTINFO dbei = {0};

 	dbei.cbSize = sizeof(dbei);

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index 761607c9c4..972d450e0f 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -179,50 +179,50 @@ public:
 	~CSkypeProto();

 

 	// PROTO_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 TCHAR* id );

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

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

-	virtual	HWND   __cdecl SearchAdvanced( HWND owner );

-	virtual	HWND   __cdecl CreateExtendedSearchUI( HWND owner );

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

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

+	virtual	HANDLE    __cdecl SearchByName( const TCHAR* nick, const TCHAR* firstName, const TCHAR* 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 );

 

 	// instances

 	static CSkypeProto* InitSkypeProto(const char* protoName, const wchar_t* userName);