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, 2 insertions, 5 deletions

diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 6adc868b82..3246dccc53 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -186,7 +186,7 @@ int CSametimeProto::OnIdleChanged(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-int CSametimeProto::OnModulesLoaded(WPARAM, LPARAM)

+void CSametimeProto::OnModulesLoaded()

 {

 	// register with chat module

 	GCREGISTER gcr = {};

@@ -194,15 +194,12 @@ int CSametimeProto::OnModulesLoaded(WPARAM, LPARAM)
 	gcr.ptszDispName = m_tszUserName;

 	gcr.iMaxText = MAX_MESSAGE_SIZE;

 	Chat_Register(&gcr);

-	return 0;

 }

 

-int CSametimeProto::OnPreShutdown(WPARAM, LPARAM)

+void CSametimeProto::OnShutdown()

 {

 	if (m_iStatus != ID_STATUS_OFFLINE)

 		LogOut();

-

-	return 0;

 }

 

 int CSametimeProto::OnSametimeContactDeleted(WPARAM hContact, LPARAM)