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

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 867329bdec..eaf507aabd 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-static int sttCompareProtocols(const CVkProto *p1, const CVkProto *p2)

-{

-	return mir_wstrcmp(p1->m_tszUserName, p2->m_tszUserName);

-}

-

 static int sttCompareAsyncHttpRequest(const AsyncHttpRequest *p1, const AsyncHttpRequest *p2)

 {

 	if (p1->m_priority == p2->m_priority)

@@ -92,7 +87,7 @@ CVkProto::~CVkProto()
 		Popup_UnregisterClass(m_hPopupClassNotification);

 }

 

-int CVkProto::OnModulesLoaded(WPARAM, LPARAM)

+void CVkProto::OnModulesLoaded()

 {

 	Clist_GroupCreate(0, m_vkOptions.pwszDefaultGroup);

 

@@ -118,7 +113,6 @@ int CVkProto::OnModulesLoaded(WPARAM, LPARAM)
 	InitPopups();

 	InitMenus();

 	InitDBCustomEvents();

-	return 0;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -483,18 +477,17 @@ void  CVkProto::InitDBCustomEvents()
 

 //////////////////////////////////////////////////////////////////////////////

 

-int CVkProto::OnPreShutdown(WPARAM, LPARAM)

+void CVkProto::OnShutdown()

 {

 	debugLogA("CVkProto::OnPreShutdown");

 

 	m_bTerminated = true;

 	SetEvent(m_evRequestsQueue);

-	return 0;

 }

 

 //////////////////////////////////////////////////////////////////////////////

 

-DWORD_PTR CVkProto::GetCaps(int type, MCONTACT)

+INT_PTR CVkProto::GetCaps(int type, MCONTACT)

 {

 	switch (type) {

 	case PFLAGNUM_1:

@@ -518,7 +511,7 @@ DWORD_PTR CVkProto::GetCaps(int type, MCONTACT)
 		return 4096;

 

 	case PFLAG_UNIQUEIDTEXT:

-		return (DWORD_PTR)"VKontakte ID";

+		return (INT_PTR)"VKontakte ID";

 	}

 	return 0;

 }

@@ -528,12 +521,6 @@ DWORD_PTR CVkProto::GetCaps(int type, MCONTACT)
 int CVkProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)

 {

 	switch (event) {

-	case EV_PROTO_ONLOAD:

-		return OnModulesLoaded(wParam, lParam);

-

-	case EV_PROTO_ONEXIT:

-		return OnPreShutdown(wParam, lParam);

-

 	case EV_PROTO_ONCONTACTDELETED:

 		return OnContactDeleted(wParam, lParam);

 	}