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

2 files changed, 23 insertions, 30 deletions

diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index 8c0aaa1abd..003079a283 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -92,7 +92,7 @@ CDiscordProto::~CDiscordProto()
 	::CloseHandle(m_evRequestsQueue);
 }
 
-DWORD_PTR CDiscordProto::GetCaps(int type, MCONTACT)
+INT_PTR CDiscordProto::GetCaps(int type, MCONTACT)
 {
 	switch (type) {
 	case PFLAGNUM_1:
@@ -104,7 +104,7 @@ DWORD_PTR CDiscordProto::GetCaps(int type, MCONTACT)
 	case PFLAGNUM_4:
 		return PF4_FORCEADDED | PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_SUPPORTIDLE | PF4_AVATARS | PF4_IMSENDOFFLINE;
 	case PFLAG_UNIQUEIDTEXT:
-		return (DWORD_PTR)Translate("User ID");
+		return (INT_PTR)Translate("User ID");
 	}
 	return 0;
 }
@@ -549,7 +549,7 @@ HANDLE CDiscordProto::SendFile(MCONTACT hContact, const wchar_t *szDescription,
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int CDiscordProto::OnModulesLoaded(WPARAM, LPARAM)
+void CDiscordProto::OnModulesLoaded()
 {
 	// Fill users list
 	for (auto &hContact : AccContacts()) {
@@ -575,10 +575,9 @@ int CDiscordProto::OnModulesLoaded(WPARAM, LPARAM)
 	HookProtoEvent(ME_GC_BUILDMENU, &CDiscordProto::GroupchatMenuHook);
 
 	InitMenus();
-	return 0;
 }
 
-int CDiscordProto::OnPreShutdown(WPARAM, LPARAM)
+void CDiscordProto::OnShutdown()
 {
 	debugLogA("CDiscordProto::OnPreShutdown");
 
@@ -587,20 +586,13 @@ int CDiscordProto::OnPreShutdown(WPARAM, LPARAM)
 
 	if (m_hGatewayConnection)
 		Netlib_Shutdown(m_hGatewayConnection);
-	return 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int CDiscordProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
+int CDiscordProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM)
 {
 	switch (event) {
-	case EV_PROTO_ONLOAD:
-		return OnModulesLoaded(wParam, lParam);
-
-	case EV_PROTO_ONEXIT:
-		return OnPreShutdown(wParam, lParam);
-
 	case EV_PROTO_ONCONTACTDELETED:
 		return OnDeleteContact((MCONTACT)wParam);
 	}
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index a33511d3bd..0b095d70da 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -258,28 +258,31 @@ public:
 	~CDiscordProto();
 
 	// PROTO_INTERFACE
-	virtual DWORD_PTR __cdecl GetCaps(int, MCONTACT = 0) override;
+	INT_PTR GetCaps(int, MCONTACT = 0) override;
 
-	virtual HWND __cdecl CreateExtendedSearchUI(HWND owner) override;
-	virtual HWND __cdecl SearchAdvanced(HWND owner) override;
+	HWND CreateExtendedSearchUI(HWND owner) override;
+	HWND SearchAdvanced(HWND owner) override;
 
-	virtual HANDLE __cdecl SearchBasic(const wchar_t* id) override;
-	virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr) override;
+	HANDLE SearchBasic(const wchar_t* id) override;
+	MCONTACT AddToList(int flags, PROTOSEARCHRESULT* psr) override;
 	
-	virtual int __cdecl AuthRecv(MCONTACT, PROTORECVEVENT* pre) override;
-	virtual int __cdecl Authorize(MEVENT hDbEvent) override;
-	virtual int __cdecl AuthDeny(MEVENT hDbEvent, const wchar_t* szReason) override;
-	virtual int __cdecl AuthRequest(MCONTACT hContact, const wchar_t*) override;
+	int AuthRecv(MCONTACT, PROTORECVEVENT* pre) override;
+	int Authorize(MEVENT hDbEvent) override;
+	int AuthDeny(MEVENT hDbEvent, const wchar_t* szReason) override;
+	int AuthRequest(MCONTACT hContact, const wchar_t*) override;
 
-	virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt) override;
-	virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* pszSrc) override;
+	int RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt) override;
+	int SendMsg(MCONTACT hContact, int flags, const char* pszSrc) override;
 
-	virtual HANDLE __cdecl SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;
+	HANDLE SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;
 
-	virtual	int __cdecl UserIsTyping(MCONTACT hContact, int type) override;
+	int UserIsTyping(MCONTACT hContact, int type) override;
 
-	virtual int __cdecl SetStatus(int iNewStatus) override;
-	virtual int __cdecl OnEvent(PROTOEVENTTYPE, WPARAM, LPARAM) override;
+	int SetStatus(int iNewStatus) override;
+	int OnEvent(PROTOEVENTTYPE, WPARAM, LPARAM) override;
+
+	void OnModulesLoaded() override;
+	void OnShutdown() override;
 
 	// Services
 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM);
@@ -290,8 +293,6 @@ public:
 	INT_PTR __cdecl SetMyAvatar(WPARAM, LPARAM);
 
 	// Events
-	int  __cdecl OnModulesLoaded(WPARAM, LPARAM);
-	int  __cdecl OnPreShutdown(WPARAM, LPARAM);
 	int  __cdecl OnOptionsInit(WPARAM, LPARAM);
 	int  __cdecl OnDbEventRead(WPARAM, LPARAM);