code cleaning:

- in conformance to C++'11 rules, we don't declare a method as virtual if it's declared as override;
- cause this code isn't visible in Pascal anymore, there's no need to use __cdecl calling convention for virtual methods;
- since PROTO_INTERFACE is a regular C++ class, there's no need to use old style service declarations for virtual methods like OnModulesLoaded / OnShutdown

1 files changed, 26 insertions, 26 deletions

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index e8a327452b..9e11b50b49 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -32,40 +32,42 @@ struct CMsnProto : public PROTO<CMsnProto>
 	// PROTO_INTERFACE

 	//====================================================================================

 

-	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

+	MCONTACT AddToList(int flags, PROTOSEARCHRESULT* psr) override;

+	MCONTACT AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) override;

 

-	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

-	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const wchar_t* szReason);

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const wchar_t* szMessage);

+	int      Authorize(MEVENT hDbEvent) override;

+	int      AuthDeny(MEVENT hDbEvent, const wchar_t* szReason) override;

+	int      AuthRecv(MCONTACT hContact, PROTORECVEVENT*) override;

+	int      AuthRequest(MCONTACT hContact, const wchar_t* szMessage) override;

 

-	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath);

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

-	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason);

-	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const wchar_t** szFilename);

+	HANDLE   FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath) override;

+	int      FileCancel(MCONTACT hContact, HANDLE hTransfer) override;

+	int      FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason) override;

+	int      FileResume(HANDLE hTransfer, int* action, const wchar_t** szFilename) override;

 

-	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

+	INT_PTR  GetCaps(int type, MCONTACT hContact = NULL) override;

+	int      GetInfo(MCONTACT hContact, int infoType) override;

 

-	virtual	HANDLE    __cdecl SearchBasic(const wchar_t* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const wchar_t* email);

+	HANDLE   SearchBasic(const wchar_t* id) override;

+	HANDLE   SearchByEmail(const wchar_t* email) override;

 

-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

+	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

+	int      RecvContacts(MCONTACT hContact, PROTORECVEVENT*) override;

 

-	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

+	int      SendMsg(MCONTACT hContact, int flags, const char* msg) override;

+	int      SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) override;

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

-	virtual	int       __cdecl SetStatus(int iNewStatus);

+	int      SetApparentMode(MCONTACT hContact, int mode) override;

+	int      SetStatus(int iNewStatus) override;

 

-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const wchar_t* msg);

+	HANDLE   GetAwayMsg(MCONTACT hContact) override;

+	int      SetAwayMsg(int m_iStatus, const wchar_t* msg) override;

 

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

+	int      UserIsTyping(MCONTACT hContact, int type) override;

 

-	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

+	int      OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override;

+	void     OnModulesLoaded() override;

+	void     OnShutdown() override;

 

 	//====| Services |====================================================================

 	INT_PTR  __cdecl SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam);

@@ -88,10 +90,8 @@ struct CMsnProto : public PROTO<CMsnProto>
 	int  __cdecl OnContactDeleted(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnIdleChanged(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnGroupChange(WPARAM wParam, LPARAM lParam);

-	int  __cdecl OnModulesLoaded(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnOptionsInit(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam);

-	int  __cdecl OnPreShutdown(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnContactDoubleClicked(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnDbSettingChanged(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnWindowPopup(WPARAM wParam, LPARAM lParam);