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/IRCG/src/irc.h | 19 ------ protocols/IRCG/src/ircproto.cpp | 130 ---------------------------------------- 2 files changed, 149 deletions(-) (limited to 'protocols/IRCG') diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h index 991a01988d..7af8860637 100644 --- a/protocols/IRCG/src/irc.h +++ b/protocols/IRCG/src/irc.h @@ -212,12 +212,9 @@ struct CIrcProto : public PROTO // Protocol interface 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 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 ); @@ -225,33 +222,17 @@ struct CIrcProto : public PROTO 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 HWND __cdecl SearchAdvanced(HWND owner); - 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); - virtual int __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam); // Services diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 0a259851c1..7dd787fe5d 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -335,14 +335,6 @@ MCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr) return hContact; } -//////////////////////////////////////////////////////////////////////////////////////// -// AddToList - adds a contact to the contact list - -MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, MEVENT) -{ - return NULL; -} - //////////////////////////////////////////////////////////////////////////////////////// // AuthAllow - processes the successful authorization @@ -359,22 +351,6 @@ int __cdecl CIrcProto::AuthDeny(MEVENT, const TCHAR*) return 0; } -//////////////////////////////////////////////////////////////////////////////////////// -// PSR_AUTH - -int __cdecl CIrcProto::AuthRecv(MCONTACT, PROTORECVEVENT*) -{ - return 1; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// PSS_AUTHREQUEST - -int __cdecl CIrcProto::AuthRequest(MCONTACT, const TCHAR*) -{ - return 1; -} - //////////////////////////////////////////////////////////////////////////////////////// // FileAllow - starts a file transfer @@ -499,14 +475,6 @@ DWORD_PTR __cdecl CIrcProto::GetCaps(int type, MCONTACT) return 0; } -//////////////////////////////////////////////////////////////////////////////////////// -// GetInfo - retrieves a contact info - -int __cdecl CIrcProto::GetInfo(MCONTACT, int) -{ - return 1; -} - //////////////////////////////////////////////////////////////////////////////////////// // SearchBasic - searches the contact by JID @@ -541,72 +509,6 @@ HANDLE __cdecl CIrcProto::SearchBasic(const PROTOCHAR* szId) return 0; } -//////////////////////////////////////////////////////////////////////////////////////// -// SearchByEmail - searches the contact by its e-mail - -HANDLE __cdecl CIrcProto::SearchByEmail(const PROTOCHAR*) -{ - return NULL; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// upsupported search functions - -HANDLE __cdecl CIrcProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*) -{ - return NULL; -} - -HWND __cdecl CIrcProto::CreateExtendedSearchUI(HWND) -{ - return NULL; -} - -HWND __cdecl CIrcProto::SearchAdvanced(HWND) -{ - return NULL; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// RecvContacts - -int __cdecl CIrcProto::RecvContacts(MCONTACT, PROTORECVEVENT*) -{ - return 1; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// RecvFile - -int __cdecl CIrcProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt) -{ - return Proto_RecvFile(hContact, evt); -} - -//////////////////////////////////////////////////////////////////////////////////////// -// RecvMsg - -int __cdecl CIrcProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt) -{ - return Proto_RecvMessage(hContact, evt); -} - -//////////////////////////////////////////////////////////////////////////////////////// -// RecvUrl - -int __cdecl CIrcProto::RecvUrl(MCONTACT, PROTORECVEVENT*) -{ - return 1; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// SendContacts - -int __cdecl CIrcProto::SendContacts(MCONTACT, int, int, MCONTACT*) -{ - return 1; -} - //////////////////////////////////////////////////////////////////////////////////////// // SendFile - sends a file @@ -814,22 +716,6 @@ int __cdecl CIrcProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc) return seq; } -//////////////////////////////////////////////////////////////////////////////////////// -// SendUrl - -int __cdecl CIrcProto::SendUrl(MCONTACT, int, const char*) -{ - return 1; -} - -//////////////////////////////////////////////////////////////////////////////////////// -// SetApparentMode - sets the visibility status - -int __cdecl CIrcProto::SetApparentMode(MCONTACT, int) -{ - return 0; -} - //////////////////////////////////////////////////////////////////////////////////////// // SetStatus - sets the protocol status @@ -928,14 +814,6 @@ HANDLE __cdecl CIrcProto::GetAwayMsg(MCONTACT hContact) return (HANDLE)1; } -//////////////////////////////////////////////////////////////////////////////////////// -// PSR_AWAYMSG - -int __cdecl CIrcProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) -{ - return 1; -} - //////////////////////////////////////////////////////////////////////////////////////// // SetAwayMsg - sets the away status message @@ -963,14 +841,6 @@ int __cdecl CIrcProto::SetAwayMsg(int status, const TCHAR* msg) return 0; } -///////////////////////////////////////////////////////////////////////////////////////// -// UserIsTyping - sends a UTN notification - -int __cdecl CIrcProto::UserIsTyping(MCONTACT, int) -{ - return 0; -} - ///////////////////////////////////////////////////////////////////////////////////////// // OnEvent - maintain protocol events -- cgit v1.2.3