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, 28 insertions, 28 deletions

diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h
index 4e6d281214..1923125e1f 100644
--- a/protocols/Tlen/src/tlen.h
+++ b/protocols/Tlen/src/tlen.h
@@ -213,35 +213,35 @@ struct TlenProtocol : public PROTO<TlenProtocol>
 	// 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 PROTOCHAR* szReason);

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

-	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* 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	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	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 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	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

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

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

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);

+	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(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

-	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 SendUrl(MCONTACT hContact, int flags, const char* url);

 

@@ -250,7 +250,7 @@ struct TlenProtocol : public PROTO<TlenProtocol>
 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

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

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

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

 

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

 

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 705b4ca150..005f9af3ab 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -85,7 +85,7 @@ void TlenResetSearchQuery(TlenProtocol *proto) {
 	proto->searchID = TlenSerialNext(proto);

 }

 

-HANDLE TlenProtocol::SearchBasic(const PROTOCHAR* id)

+HANDLE TlenProtocol::SearchBasic(const TCHAR* id)

 {

 	int iqId = 0;

 	if (!isOnline) return 0;

@@ -103,7 +103,7 @@ HANDLE TlenProtocol::SearchBasic(const PROTOCHAR* id)
 	return (HANDLE)iqId;

 }

 

-HANDLE TlenProtocol::SearchByEmail(const PROTOCHAR* email)

+HANDLE TlenProtocol::SearchByEmail(const TCHAR* email)

 {

 	int iqId = 0;

 

@@ -122,7 +122,7 @@ HANDLE TlenProtocol::SearchByEmail(const PROTOCHAR* email)
 	return (HANDLE)iqId;

 }

 

-HANDLE TlenProtocol::SearchByName(const PROTOCHAR* nickT, const PROTOCHAR* firstNameT, const PROTOCHAR* lastNameT)

+HANDLE TlenProtocol::SearchByName(const TCHAR* nickT, const TCHAR* firstNameT, const TCHAR* lastNameT)

 {

 	if (!isOnline) return 0;

 

@@ -309,7 +309,7 @@ int TlenProtocol::Authorize(MEVENT hDbEvent)
 	return 0;

 }

 

-int TlenProtocol::AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason)

+int TlenProtocol::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason)

 {

 	if (!isOnline)

 		return 1;

@@ -411,7 +411,7 @@ INT_PTR TlenProtocol::GetStatus(WPARAM wParam, LPARAM lParam)
 	return m_iStatus;

 }

 

-int TlenProtocol::SetAwayMsg(int iStatus, const PROTOCHAR* msg)

+int TlenProtocol::SetAwayMsg(int iStatus, const TCHAR* msg)

 {

 	char **szMsg;

 	char *newModeMsg;

@@ -708,12 +708,12 @@ int TlenProtocol::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt)
 	return 0;

 }

 

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

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

 {

 	if (!isOnline) return 0;

 

 	TLEN_FILE_TRANSFER *ft = (TLEN_FILE_TRANSFER *) hTransfer;

-	ft->szSavePath = mir_strdup(mir_t2a(szPath));	//TODO convert to PROTOCHAR*

+	ft->szSavePath = mir_strdup(mir_t2a(szPath));	//TODO convert to TCHAR*

 	TLEN_LIST_ITEM *item = TlenListAdd(this, LIST_FILE, ft->iqId);

 	if (item != NULL) {

 		item->ft = ft;

@@ -728,7 +728,7 @@ HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOC
 	return (HANDLE)hTransfer;

 }

 

-int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason)

+int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason)

 {

 	if (!isOnline) return 1;

 

@@ -744,7 +744,7 @@ int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR*
 	return 0;

 }

 

-int TlenProtocol::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) {

+int TlenProtocol::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) {

 	return 0;

 }

 

@@ -767,7 +767,7 @@ int TlenProtocol::FileCancel(MCONTACT hContact, HANDLE hTransfer)
 	return 0;

 }

 

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

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

 {

 	int i, j;

 	struct _stat statbuf;

@@ -846,7 +846,7 @@ int TlenProtocol::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt)
 	return Proto_RecvMessage(hContact, evt);

 }

 

-int TlenProtocol::RecvFile(MCONTACT hContact, PROTOFILEEVENT* evt)

+int TlenProtocol::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)

 {

 	return Proto_RecvFile(hContact, evt);

 }

@@ -1176,7 +1176,7 @@ int TlenProtocol::AuthRecv(MCONTACT hContact, PROTORECVEVENT* evt)
 }

 

 // PSS_AUTHREQUEST

-int TlenProtocol::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage)

+int TlenProtocol::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)

 {

 	return 1;

 }