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/Twitter/src/contacts.cpp | 2 +-
 protocols/Twitter/src/main.cpp     | 2 +-
 protocols/Twitter/src/stdafx.h     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'protocols/Twitter')

diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index 99e954b5f2..ccae792f37 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -237,7 +237,7 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status)
 	// If not, make a new contact!
 	hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
 	if (hContact) {
-		if (CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName) == 0) {
+		if (Proto_AddToContact(hContact, m_szModuleName) == 0) {
 			db_set_s(hContact, m_szModuleName, TWITTER_KEY_UN, name);
 			db_set_w(hContact, m_szModuleName, "Status", ID_STATUS_ONLINE);
 			db_set_utf(hContact, "CList", "StatusMsg", status);
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp
index 2503f64da5..58bc371096 100644
--- a/protocols/Twitter/src/main.cpp
+++ b/protocols/Twitter/src/main.cpp
@@ -96,7 +96,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();
diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index 9c12e052fa..2a2287db6b 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -52,7 +52,6 @@ typedef std::basic_string<TCHAR> tstring;
 #include <m_options.h>
 #include <m_popup.h>
 #include <m_protocols.h>
-#include <m_protomod.h>
 #include <m_protosvc.h>
 #include <m_protoint.h>
 #include <m_skin.h>
-- 
cgit v1.2.3