another bunch of crutches buried in a trash can: PROTOCHAR & PROTOFILEEVENT

glory, glory, hallelujah

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

3 files changed, 19 insertions, 19 deletions

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index 603d7d6442..f49661869c 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -665,7 +665,7 @@ void __cdecl CYahooProto::send_filethread(void *psf)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SendFile - sends a file

 

-HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles )

+HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles)

 {

 	LOG(("[YahooSendFile]"));

 	

@@ -718,7 +718,7 @@ HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescr
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileAllow - starts a file transfer

 

-HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath)

+HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath)

 {

 	y_filetransfer *ft = (y_filetransfer *)hTransfer;

 

@@ -769,7 +769,7 @@ int __cdecl CYahooProto::FileCancel(MCONTACT hContact, HANDLE hTransfer)
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileDeny - denies a file transfer

 

-int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR*)

+int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*)

 {

 	/* deny file receive request.. just ignore it! */

 	y_filetransfer *ft = (y_filetransfer *)hTransfer;

@@ -800,7 +800,7 @@ int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PRO
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileResume - processes file renaming etc

 

-int __cdecl CYahooProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename)

+int __cdecl CYahooProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename)

 {

 	y_filetransfer *ft = (y_filetransfer *)hTransfer;

 

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index f144d89c9b..7d935a3418 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -540,7 +540,7 @@ HANDLE __cdecl CYahooProto::GetAwayMsg(MCONTACT hContact)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SetAwayMsg - sets the away status message

 

-int __cdecl CYahooProto::SetAwayMsg(int status, const PROTOCHAR* msg)

+int __cdecl CYahooProto::SetAwayMsg(int status, const TCHAR* msg)

 {

 	char *c = msg && msg[0] ? mir_utf8encodeT(msg) : NULL;

 

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

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

 

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

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

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

+	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

 

-	virtual	int       __cdecl Authorize( MEVENT hDbEvent );

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

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

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

+	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

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

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

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

 

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

+	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *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	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason );

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

 

 	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	HWND      __cdecl SearchAdvanced( HWND owner );

-	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

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

+	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

+	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

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

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

 

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

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

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

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

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

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

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

 

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