useless wrappers removed & replaced with PROTO_INTERFACE method calls

2 files changed, 2 insertions, 14 deletions

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 6231df6990..d105f55862 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -229,6 +229,8 @@ public:
 

 template<class T> struct PROTO : public PROTO_INTERFACE

 {

+	typedef PROTO_INTERFACE CSuper;

+

 	__forceinline PROTO(const char *szProto, const wchar_t *tszUserName) :

 		PROTO_INTERFACE(szProto, tszUserName)

 	{}

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 0ccd3d3c46..e376c3d4ab 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -770,14 +770,6 @@ struct PROTORECVEVENT
 

 #define PSR_MESSAGE   "/RecvMessage"

 

-#define MS_PROTO_RECVMSG "Proto/RecvMessage"

-

-__forceinline INT_PTR Proto_RecvMessage(MCONTACT hContact, PROTORECVEVENT *pcre)

-{

-	CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)pcre };

-	return CallService(MS_PROTO_RECVMSG, 0, (LPARAM)&ccs);

-}

-

 __forceinline INT_PTR ProtoChainRecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

 {

 	CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)pre };

@@ -817,12 +809,6 @@ struct PROTORECVFILE
 

 #define MS_PROTO_RECVFILET "Proto/RecvFileT"

 

-__forceinline INT_PTR Proto_RecvFile(MCONTACT hContact, PROTORECVFILE *pcre)

-{

-	CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)pcre };

-	return CallService(MS_PROTO_RECVFILET, 0, (LPARAM)&ccs);

-}

-

 __forceinline INT_PTR ProtoChainRecvFile(MCONTACT hContact, PROTORECVFILE *pre)

 {

 	CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)pre };