- 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

2 files changed, 5 insertions, 54 deletions

diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index 39ffad7c39..045cf3117e 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -78,20 +78,15 @@ MCONTACT __cdecl CToxProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 	return AddContact(address.c_str(), _T(""), flags & PALF_TEMPORARY);

 }

 

-MCONTACT __cdecl CToxProto::AddToListByEvent(int, int, MEVENT) { return 0; }

-

 int __cdecl CToxProto::Authorize(MEVENT hDbEvent)

 {

 	MCONTACT hContact = GetContactFromAuthEvent(hDbEvent);

 	if (hContact == INVALID_CONTACT_ID)

-	{

 		return 1;

-	}

+

 	return OnGrantAuth(hContact, 0);

 }

 

-int __cdecl CToxProto::AuthDeny(MEVENT, const PROTOCHAR*) { return 0; }

-

 int __cdecl CToxProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre)

 {

 	return Proto_AuthRecv(m_szModuleName, pre);

@@ -103,16 +98,6 @@ int __cdecl CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage
 	return OnRequestAuth(hContact, (LPARAM)reason);

 }

 

-HANDLE __cdecl CToxProto::ChangeInfo(int, void*) { return 0; }

-

-int __cdecl CToxProto::GetInfo(MCONTACT, int) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchBasic(const PROTOCHAR*) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchByEmail(const PROTOCHAR*) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*) { return 0; }

-

 HWND __cdecl CToxProto::SearchAdvanced(HWND owner)

 {

 	return OnSearchAdvanced(owner);

@@ -123,37 +108,20 @@ HWND __cdecl CToxProto::CreateExtendedSearchUI(HWND owner)
 	return OnCreateExtendedSearchUI(owner);

 }

 

-int __cdecl CToxProto::RecvContacts(MCONTACT, PROTORECVEVENT*) { return 0; }

-

-int __cdecl CToxProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT *pre)

-{

-	return Proto_RecvFile(hContact, pre);

-}

-

 int __cdecl CToxProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

 {

 	return OnReceiveMessage(hContact, pre);

 }

 

-int __cdecl CToxProto::RecvUrl(MCONTACT, PROTORECVEVENT*) { return 0; }

-

-int __cdecl CToxProto::SendContacts(MCONTACT, int, int, MCONTACT*) { return 0; }

-

 int CToxProto::SendMsg(MCONTACT hContact, int flags, const char *msg)

 {

 	return OnSendMessage(hContact, flags, msg);

 }

 

-int __cdecl CToxProto::SendUrl(MCONTACT, int, const char*) { return 0; }

-

-int __cdecl CToxProto::SetApparentMode(MCONTACT, int) { return 0; }

-

 int __cdecl CToxProto::SetStatus(int iNewStatus)

 {

 	if (iNewStatus == m_iDesiredStatus)

-	{

 		return 0;

-	}

 

 	switch (iNewStatus)

 	{

@@ -223,8 +191,6 @@ int __cdecl CToxProto::SetStatus(int iNewStatus)
 

 HANDLE __cdecl CToxProto::GetAwayMsg(MCONTACT) { return 0; }

 

-int __cdecl CToxProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 0; }

-

 int __cdecl CToxProto::SetAwayMsg(int, const PROTOCHAR *msg)

 {

 	if (IsOnline())

@@ -257,4 +223,4 @@ int __cdecl CToxProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM
 	}

 

 	return 1;

-}
\ No newline at end of file
+}

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index fc6e089f84..39b67e761f 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -15,44 +15,29 @@ public:
 	// Virtual functions

 

 	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	HANDLE   __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszPath);

 	virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszReason);

 	virtual	int      __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** tszFilename);

 

 	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, PROTOFILEEVENT*);

 	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	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	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles);

+

 	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 iStatus, const PROTOCHAR* msg);

 

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