From 83310365c69bd40365ee0ae0e16c99c28e24cd0b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 19 Jun 2015 14:24:12 +0000
Subject: - all static protocol services replaced with functions; -
 m_protomod.h removed as useless

git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/Mra.cpp           | 2 +-
 protocols/MRA/src/Mra_functions.cpp | 8 +++++---
 protocols/MRA/src/stdafx.h          | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'protocols/MRA')

diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index a58b7b23ea..0acd463767 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -92,7 +92,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	pd.type = PROTOTYPE_PROTOCOL;
 	pd.fnInit = (pfnInitProto)mraProtoInit;
 	pd.fnUninit = (pfnUninitProto)mraProtoUninit;
-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+	Proto_RegisterModule(&pd);
 	return 0;
 }
 
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index f7ef7aa58c..8197824146 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -543,7 +543,7 @@ MCONTACT CMraProto::MraHContactFromEmail(const CMStringA &szEmail, BOOL bAddIfNe
 		}
 		else {
 			hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-			CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);
+			Proto_AddToContact(hContact, m_szModuleName);
 		}
 
 		if (hContact) {
@@ -711,7 +711,7 @@ bool IsHTTPSProxyUsed(HANDLE hNetlibUser)
 // определяет принадлежность контакта данной копии плагина
 bool CMraProto::IsContactMra(MCONTACT hContact)
 {
-	return CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)m_szModuleName) != 0;
+	return Proto_IsProtoOnContact(hContact, m_szModuleName) != 0;
 }
 
 // определяется является ли контакт контактом MRA протокола, не зависимо от того какому плагину он принадлежит
@@ -887,7 +887,9 @@ void CMraProto::ShowFormattedErrorMessage(LPWSTR lpwszErrText, DWORD dwErrorCode
 static void FakeThread(void* param)
 {
 	Sleep(100);
-	CallService(MS_PROTO_BROADCASTACK, 0, (LPARAM)param);
+	
+	ACKDATA *ack = (ACKDATA*)param;
+	ProtoBroadcastAck(ack->szModule, ack->hContact, ack->type, ack->result, ack->hProcess, ack->lParam);
 	mir_free(param);
 }
 
diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h
index 39d1253497..f5b3741957 100644
--- a/protocols/MRA/src/stdafx.h
+++ b/protocols/MRA/src/stdafx.h
@@ -32,7 +32,6 @@
 #include <m_ignore.h>
 #include <m_message.h>
 #include <m_options.h>
-#include <m_protomod.h>
 #include <m_protosvc.h>
 #include <m_protoint.h>
 #include <m_skin.h>
-- 
cgit v1.2.3