From d28931ebdfc4ff561d05ab000aee4cbb5ac24d62 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 22 Apr 2018 00:55:51 +0300
Subject: OnEvent(EV_PROTO_ONCONTACTDELETED) =>
 PROTO_INTERFACE::OnContactDeleted

---
 protocols/VKontakte/src/vk_proto.cpp | 22 ++++------------------
 protocols/VKontakte/src/vk_proto.h   |  3 +--
 2 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'protocols/VKontakte')

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index eaf507aabd..e8325d3d41 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -518,18 +518,6 @@ INT_PTR CVkProto::GetCaps(int type, MCONTACT)
 
 //////////////////////////////////////////////////////////////////////////////
 
-int CVkProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
-{
-	switch (event) {
-	case EV_PROTO_ONCONTACTDELETED:
-		return OnContactDeleted(wParam, lParam);
-	}
-
-	return 1;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
 MCONTACT CVkProto::AddToList(int, PROTOSEARCHRESULT *psr)
 {
 	debugLogA("CVkProto::AddToList");
@@ -657,17 +645,17 @@ int CVkProto::GetInfo(MCONTACT hContact, int)
 	return 0;
 }
 
-int CVkProto::OnContactDeleted(WPARAM hContact, LPARAM)
+void CVkProto::OnContactDeleted(MCONTACT hContact)
 {
 	ptrW pwszNick(db_get_wsa(hContact, m_szModuleName, "Nick"));
 	debugLogW(L"CVkProto::OnContactDeleted %s", pwszNick);
 
 	if (db_get_b(hContact, "CList", "NotOnList") || getBool(hContact, "SilentDelete") || isChatRoom((MCONTACT)hContact))
-		return 0;
+		return;
 
 	LONG userID = getDword(hContact, "ID", VK_INVALID_USER);
 	if (userID == VK_INVALID_USER || userID == VK_FEED_USER)
-		return 0;
+		return;
 
 	CONTACTDELETE_FORM_PARAMS *param = new CONTACTDELETE_FORM_PARAMS(pwszNick, true, !getBool(hContact, "Auth", true), true);
 	CVkContactDeleteForm dlg(this, param);
@@ -675,7 +663,7 @@ int CVkProto::OnContactDeleted(WPARAM hContact, LPARAM)
 
 	debugLogW(L"CVkProto::OnContactDeleted %s DeleteDialog=%d DeleteFromFriendlist=%d", pwszNick, param->bDeleteDialog,  param->bDeleteFromFriendlist);
 	if (!(param->bDeleteDialog || param->bDeleteFromFriendlist))
-		return 0;
+		return;
 
 	CMStringA code(FORMAT, "var userID=\"%d\";", userID);
 	if (param->bDeleteDialog)
@@ -688,6 +676,4 @@ int CVkProto::OnContactDeleted(WPARAM hContact, LPARAM)
 
 	Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/execute.json", true, &CVkProto::OnReceiveSmth)
 		<< CHAR_PARAM("code", code.c_str()));
-
-	return 0;
 }
\ No newline at end of file
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 50e5924afe..f1fd68ba43 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -66,14 +66,13 @@ struct CVkProto : public PROTO<CVkProto>
 	int      SetStatus(int iNewStatus) override;
 	int      UserIsTyping(MCONTACT hContact, int type) override;
 	
-	int      OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override;
+	void     OnContactDeleted(MCONTACT) override;
 	void     OnModulesLoaded() override;
 	void     OnShutdown() override;
 
 	//==== Events ========================================================================
 
 	int __cdecl OnOptionsInit(WPARAM, LPARAM);
-	int __cdecl OnContactDeleted(WPARAM, LPARAM);
 	void OnOAuthAuthorize(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 	void OnReceiveAvatar(NETLIBHTTPREQUEST*, AsyncHttpRequest*);
 
-- 
cgit v1.2.3