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/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index 6f3e29b71c..2f92f63a5c 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -223,7 +223,7 @@ int FacebookProto::SetStatus(int new_status)
 	return 0;
 }
 
-int FacebookProto::SetAwayMsg(int, const PROTOCHAR *msg)
+int FacebookProto::SetAwayMsg(int, const TCHAR *msg)
 {
 	if (!msg) {
 		last_status_msg_.clear();
@@ -255,7 +255,7 @@ void FacebookProto::SetAwayMsgWorker(void *p)
 	}
 }
 
-HANDLE FacebookProto::SearchBasic(const PROTOCHAR* id)
+HANDLE FacebookProto::SearchBasic(const TCHAR* id)
 {
 	if (isOffline())
 		return 0;
@@ -265,7 +265,7 @@ HANDLE FacebookProto::SearchBasic(const PROTOCHAR* id)
 	return tid;
 }
 
-HANDLE FacebookProto::SearchByEmail(const PROTOCHAR* email)
+HANDLE FacebookProto::SearchByEmail(const TCHAR* email)
 {
 	if (isOffline())
 		return 0;
@@ -275,7 +275,7 @@ HANDLE FacebookProto::SearchByEmail(const PROTOCHAR* email)
 	return temail;
 }
 
-HANDLE FacebookProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName)
+HANDLE FacebookProto::SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName)
 {
 	TCHAR arg[200];
 	mir_sntprintf(arg, SIZEOF(arg), _T("%s %s %s"), nick, firstName, lastName);
@@ -317,7 +317,7 @@ MCONTACT FacebookProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return hContact;
 }
 
-int FacebookProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *)
+int FacebookProto::AuthRequest(MCONTACT hContact, const TCHAR *)
 {
 	return RequestFriendship(hContact, NULL);
 }
@@ -334,7 +334,7 @@ int FacebookProto::Authorize(MEVENT hDbEvent)
 	return ApproveFriendship(hContact, NULL);
 }
 
-int FacebookProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR *)
+int FacebookProto::AuthDeny(MEVENT hDbEvent, const TCHAR *)
 {
 	if (!hDbEvent || isOffline())
 		return 1;
diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index f4b4d208de..9ee8f3ab07 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -78,15 +78,15 @@ public:
 	virtual	MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);
 
 	virtual	int      __cdecl Authorize(MEVENT hDbEvent);
-	virtual	int      __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason);
-	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage);
+	virtual	int      __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason);
+	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage);
 
 	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	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);
 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);
@@ -94,7 +94,7 @@ public:
 	virtual	int       __cdecl SetStatus(int iNewStatus);
 
 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);
-	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);