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, 9 insertions, 10 deletions

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index 79fee1f1e0..077f105a6d 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -28,21 +28,21 @@ public:
 

 	//PROTO_INTERFACE

 

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

+	MCONTACT AddToList(int,PROTOSEARCHRESULT *) override;

 

-	virtual	DWORD_PTR __cdecl GetCaps(int, MCONTACT = 0);

-	virtual	int       __cdecl GetInfo(MCONTACT, int);

+	INT_PTR  GetCaps(int, MCONTACT = 0) override;

+	int      GetInfo(MCONTACT, int) override;

 

-	virtual	HANDLE    __cdecl SearchBasic(const wchar_t *);

-	virtual	HANDLE    __cdecl SearchByEmail(const wchar_t *);

+	HANDLE   SearchBasic(const wchar_t *) override;

+	HANDLE   SearchByEmail(const wchar_t *) override;

 

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

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

 

-	virtual	int       __cdecl SetStatus(int);

+	int      SetStatus(int) override;

 

-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT);

+	HANDLE   GetAwayMsg(MCONTACT) override;

 

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

+	void     OnModulesLoaded() override;

 

 	void UpdateSettings();

 

@@ -62,7 +62,6 @@ public:
 	int  __cdecl OnContactDeleted(WPARAM,LPARAM);

 	int  __cdecl OnBuildStatusMenu(WPARAM,LPARAM);

 	int  __cdecl OnOptionsInit(WPARAM,LPARAM);

-	int  __cdecl OnModulesLoaded(WPARAM,LPARAM);

 	int  __cdecl OnPrebuildContactMenu(WPARAM,LPARAM);

 	int  __cdecl OnChatOutgoing(WPARAM,LPARAM);