From ca5001026a94f702c4012c5e8d2093ad3f51c1fa Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 21 Apr 2018 12:33:31 +0300
Subject: 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
---
 protocols/Twitter/src/proto.cpp | 19 +++----------------
 protocols/Twitter/src/proto.h   | 19 +++++++++----------
 2 files changed, 12 insertions(+), 26 deletions(-)

(limited to 'protocols/Twitter/src')

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 966d749c86..8f98d0e4b1 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -73,7 +73,7 @@ TwitterProto::~TwitterProto()
 
 // *************************
 
-DWORD_PTR TwitterProto::GetCaps(int type, MCONTACT)
+INT_PTR TwitterProto::GetCaps(int type, MCONTACT)
 {
 	switch (type) {
 	case PFLAGNUM_1:
@@ -88,7 +88,7 @@ DWORD_PTR TwitterProto::GetCaps(int type, MCONTACT)
 	case PFLAG_MAXLENOFMESSAGE:
 		return 159; // 140 + <max length of a users name (15 apparently)> + 4 ("RT @").  this allows for the new style retweets
 	case PFLAG_UNIQUEIDTEXT:
-		return (DWORD_PTR) "Username";
+		return (INT_PTR) "Username";
 	}
 	return 0;
 }
@@ -177,18 +177,6 @@ int TwitterProto::SetStatus(int new_status)
 
 // *************************
 
-int TwitterProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
-{
-	switch (event) {
-	case EV_PROTO_ONLOAD:
-		return OnModulesLoaded(wParam, lParam);
-	}
-
-	return 1;
-}
-
-// *************************
-
 INT_PTR TwitterProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
 {
 	return (INT_PTR)CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_TWITTERACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this);
@@ -282,7 +270,7 @@ INT_PTR TwitterProto::OnTweet(WPARAM, LPARAM)
 	return 0;
 }
 
-int TwitterProto::OnModulesLoaded(WPARAM, LPARAM)
+void TwitterProto::OnModulesLoaded()
 {
 	wchar_t descr[512];
 	NETLIBUSER nlu = {};
@@ -329,7 +317,6 @@ int TwitterProto::OnModulesLoaded(WPARAM, LPARAM)
 
 	setAllContactStatuses(ID_STATUS_OFFLINE); // In case we crashed last time
 	SetChatStatus(ID_STATUS_OFFLINE);
-	return 0;
 }
 
 int TwitterProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
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);
 
-- 
cgit v1.2.3