- 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

3 files changed, 2 insertions, 3 deletions

diff --git a/protocols/WhatsApp/src/common.h b/protocols/WhatsApp/src/common.h
index e3e1ceb679..c602a4fc09 100644
--- a/protocols/WhatsApp/src/common.h
+++ b/protocols/WhatsApp/src/common.h
@@ -54,7 +54,6 @@ Copyright © 2013-14 Uli Hecht
 #include <m_protocols.h>

 #include <m_protosvc.h>

 #include <m_protoint.h>

-#include <m_protomod.h>

 #include <m_skin.h>

 #include <m_string.h>

 #include <statusmodes.h>

diff --git a/protocols/WhatsApp/src/contacts.cpp b/protocols/WhatsApp/src/contacts.cpp
index 3756fded33..20c04040f0 100644
--- a/protocols/WhatsApp/src/contacts.cpp
+++ b/protocols/WhatsApp/src/contacts.cpp
@@ -36,7 +36,7 @@ MCONTACT WhatsAppProto::AddToContactList(const std::string &jid, const char *new
 	if ((hContact = CallService(MS_DB_CONTACT_ADD, 0, 0)) == 0)

 		return INVALID_CONTACT_ID;

 

-	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName);

+	Proto_AddToContact(hContact, m_szModuleName);

 	setString(hContact, "ID", jid.c_str());

 	debugLogA("Added contact %s", jid.c_str());

 	setString(hContact, "MirVer", "WhatsApp");

diff --git a/protocols/WhatsApp/src/main.cpp b/protocols/WhatsApp/src/main.cpp
index 93abf0bbc0..5d0697d998 100644
--- a/protocols/WhatsApp/src/main.cpp
+++ b/protocols/WhatsApp/src/main.cpp
@@ -74,7 +74,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	pd.type = PROTOTYPE_PROTOCOL;

 	pd.fnInit = protoInit;

 	pd.fnUninit = protoUninit;

-	CallService(MS_PROTO_REGISTERMODULE, 0, reinterpret_cast<LPARAM>(&pd));

+	Proto_RegisterModule(&pd);

 

 	InitIcons();

 	//InitContactMenus();