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

2 files changed, 12 insertions, 12 deletions

diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index c6f52f054a..e12ed362b1 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -153,7 +153,7 @@ int __cdecl CAimProto::AuthRequest(MCONTACT hContact, const TCHAR*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileAllow - starts a file transfer

 

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

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

 {

 	file_transfer *ft = (file_transfer*)hTransfer;

 	if (ft && ft_list.find_by_ft(ft))

@@ -204,7 +204,7 @@ int __cdecl CAimProto::FileCancel(MCONTACT, HANDLE hTransfer)
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileDeny - denies a file transfer

 

-int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*szReason*/)

+int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR* /*szReason*/)

 {

 	file_transfer *ft = (file_transfer*)hTransfer;

 	if (!ft_list.find_by_ft(ft)) return 0;

@@ -218,7 +218,7 @@ int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*s
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileResume - processes file renaming etc

 

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

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

 {

 	file_transfer *ft = (file_transfer*)hTransfer;

 	if (!ft_list.find_by_ft(ft)) return 0;

@@ -322,7 +322,7 @@ void __cdecl CAimProto::basic_search_ack_success(void* p)
 	mir_free(p);

 }

 

-HANDLE __cdecl CAimProto::SearchBasic(const PROTOCHAR* szId)

+HANDLE __cdecl CAimProto::SearchBasic(const TCHAR* szId)

 {

 	if (state != 1)

 		return 0;

@@ -335,7 +335,7 @@ HANDLE __cdecl CAimProto::SearchBasic(const PROTOCHAR* szId)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SearchByEmail - searches the contact by its e-mail

 

-HANDLE __cdecl CAimProto::SearchByEmail(const PROTOCHAR* email)

+HANDLE __cdecl CAimProto::SearchByEmail(const TCHAR* email)

 {

 	// Maximum email size should really be 320, but the char string is limited to 255.

 	if (state != 1 || email == NULL || mir_tstrlen(email) >= 254)

@@ -371,7 +371,7 @@ int __cdecl CAimProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SendFile - sends a file

 

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

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

 {

 	if (state != 1) return 0;

 

diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h
index b5e77ed9bc..fc4b9b9c37 100644
--- a/protocols/AimOscar/src/proto.h
+++ b/protocols/AimOscar/src/proto.h
@@ -32,19 +32,19 @@ struct CAimProto : public PROTO<CAimProto>
 

 	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	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

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

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

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

 

 	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 SetStatus( int iNewStatus );