From 12d71cc476065d21cc53321cf5ea57e29b4cc124 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 22 Mar 2015 23:05:16 +0000 Subject: - PROTO_INTERFACE got the default implementation; - all unneeded stubs removed from all protocols git-svn-id: http://svn.miranda-ng.org/main/trunk@12481 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraProto.cpp | 23 ----------------------- protocols/MRA/src/MraProto.h | 7 ------- 2 files changed, 30 deletions(-) (limited to 'protocols/MRA/src') diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 8801b90ec0..89605d5631 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -181,14 +181,6 @@ MCONTACT CMraProto::AddToListByEvent(int, int, MEVENT hDbEvent) return 0; } -///////////////////////////////////////////////////////////////////////////////////////// -// Stubs - -int CMraProto::FileResume(HANDLE, int*, const TCHAR**) { return 1; } -int CMraProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 1; } -int CMraProto::RecvUrl(MCONTACT, PROTORECVEVENT*) { return 1; } -int CMraProto::SendUrl(MCONTACT, int, const char*) { return 1; } - ///////////////////////////////////////////////////////////////////////////////////////// int CMraProto::Authorize(MEVENT hDBEvent) @@ -239,11 +231,6 @@ int CMraProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return 0; } -int CMraProto::AuthRequest(MCONTACT, const TCHAR*) -{ - return 1; -} - ///////////////////////////////////////////////////////////////////////////////////////// HANDLE CMraProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR *szPath) @@ -359,16 +346,6 @@ int CMraProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre) return 0; } -int CMraProto::RecvFile(MCONTACT hContact, PROTORECVFILET *pre) -{ - return Proto_RecvFile(hContact, pre); -} - -int CMraProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) -{ - return Proto_RecvMessage(hContact, pre); -} - ///////////////////////////////////////////////////////////////////////////////////////// int CMraProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hContactsList) diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index 6fbab83126..236f6fca80 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -44,12 +44,10 @@ struct CMraProto : public PROTO 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 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); @@ -61,20 +59,15 @@ struct CMraProto : public PROTO virtual HWND __cdecl CreateExtendedSearchUI(HWND owner); virtual int __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*); - 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 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); virtual int __cdecl SetApparentMode(MCONTACT hContact, int mode); virtual int __cdecl SetStatus(int iNewStatus); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt); virtual int __cdecl SetAwayMsg(int m_iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); -- cgit v1.2.3