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, 6 insertions, 4 deletions

diff --git a/plugins/CloudFile/src/cloud_file.h b/plugins/CloudFile/src/cloud_file.h
index 3130b2ef65..bca4aa1703 100644
--- a/plugins/CloudFile/src/cloud_file.h
+++ b/plugins/CloudFile/src/cloud_file.h
@@ -24,6 +24,8 @@ protected:
 	virtual void HandleHttpError(NETLIBHTTPREQUEST *response);
 	virtual void HandleJsonError(JSONNode &node) = 0;
 
+	void OnModulesLoaded() override;
+
 	JSONNode GetJsonResponse(NETLIBHTTPREQUEST *response);
 
 public:
@@ -32,11 +34,11 @@ public:
 	CCloudService(const char *protoName, const wchar_t *userName);
 	virtual ~CCloudService();
 
-	DWORD_PTR __cdecl GetCaps(int type, MCONTACT) override;
-	int __cdecl OnEvent(PROTOEVENTTYPE iEventType, WPARAM, LPARAM) override;
+	INT_PTR GetCaps(int type, MCONTACT) override;
+	int OnEvent(PROTOEVENTTYPE iEventType, WPARAM, LPARAM) override;
 
-	int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer) override;
-	HANDLE __cdecl SendFile(MCONTACT hContact, const wchar_t *msg, wchar_t **ppszFiles) override;
+	int FileCancel(MCONTACT hContact, HANDLE hTransfer) override;
+	HANDLE SendFile(MCONTACT hContact, const wchar_t *msg, wchar_t **ppszFiles) override;
 
 	int GetId() const;
 	virtual const char* GetModuleName() const = 0;