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, 7 deletions

diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index ee6dd91f9d..90a114da31 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -45,23 +45,22 @@ public:
 

 	// PROTO_INTERFACE

 

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

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

 

-	virtual	int       __cdecl SetStatus(int iNewStatus);

+	int     SetStatus(int iNewStatus) override;

 

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

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

 

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

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

+	void    OnModulesLoaded() override;

+	void    OnShutdown() override;

 

 	// Services

 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM);

 

 	// Events

-	int  __cdecl OnModulesLoaded(WPARAM, LPARAM);

 	int  __cdecl OnOptionsInit(WPARAM, LPARAM);

 	int  __cdecl OnContactDeleted(WPARAM, LPARAM);

-	int  __cdecl OnPreShutdown(WPARAM, LPARAM);

-	int  __cdecl OnPrebuildContactMenu(WPARAM, LPARAM);

 

 	// Chat handling

 	int     __cdecl OnChatEvent(WPARAM, LPARAM);