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
---
 plugins/Non-IM Contact/src/commonheaders.h | 1 -
 plugins/Non-IM Contact/src/contactinfo.cpp | 6 +++---
 plugins/Non-IM Contact/src/dialog.cpp      | 4 ++--
 plugins/Non-IM Contact/src/main.cpp        | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'plugins/Non-IM Contact')

diff --git a/plugins/Non-IM Contact/src/commonheaders.h b/plugins/Non-IM Contact/src/commonheaders.h
index 4a61d0a0ed..2facfdce1d 100644
--- a/plugins/Non-IM Contact/src/commonheaders.h	
+++ b/plugins/Non-IM Contact/src/commonheaders.h	
@@ -38,7 +38,6 @@ struct DLGTEMPLATEEX
 #include <m_clui.h>
 #include <m_skin.h>
 #include <m_langpack.h>
-#include <m_protomod.h>
 #include <m_database.h>
 #include <m_system.h>
 #include <m_icolib.h>
diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index 86adb17aae..961ec57d88 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp	
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp	
@@ -336,7 +336,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					}
 					free(replace);
 					hContact2 = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-					CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact2, (LPARAM)MODNAME);
+					Proto_AddToContact(hContact2, MODNAME);
 					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact2, IGNOREEVENT_USERONLINE);
 					db_set_s(hContact2, MODNAME, "Nick", Translate("New Non-IM Contact"));
 					// blank dbVar2 so the replaceing doesnt crash..
@@ -396,7 +396,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						msg("contact did not get created", "");
 						return 0;
 					}
-					CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact2, (LPARAM)MODNAME);
+					Proto_AddToContact(hContact2, MODNAME);
 					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact2, IGNOREEVENT_USERONLINE);
 					db_set_s(hContact2, MODNAME, "Nick", Translate("New Non-IM Contact"));
 					db_set_s(hContact2, MODNAME, "Name", dbVar1);
@@ -633,7 +633,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam)
 					msg("contact did get created", "");
 					continue;
 				}
-				CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)MODNAME);
+				Proto_AddToContact(hContact, MODNAME);
 				CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
 				db_set_s(hContact, MODNAME, "Nick", Translate("New Non-IM Contact"));
 				db_set_s(hContact, MODNAME, "Name", name);
diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp
index 1e85c207a5..1565321cb4 100644
--- a/plugins/Non-IM Contact/src/dialog.cpp	
+++ b/plugins/Non-IM Contact/src/dialog.cpp	
@@ -303,7 +303,7 @@ INT_PTR addContact(WPARAM wParam, LPARAM lParam)
 {
 	char tmp[256];
 	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-	CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)MODNAME);
+	Proto_AddToContact(hContact, MODNAME);
 	CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
 	db_set_ts(hContact, MODNAME, "Nick", TranslateT("New Non-IM Contact"));
 	DoPropertySheet(hContact, hInst);
@@ -319,7 +319,7 @@ INT_PTR editContact(WPARAM wParam, LPARAM lParam)
 	char tmp[256];
 	if (!hContact) {
 		hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)MODNAME);
+		Proto_AddToContact(hContact, MODNAME);
 		CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
 		db_set_s(hContact, MODNAME, "Nick", Translate("New Non-IM Contact"));
 	}
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp
index 76bdd444de..7b556e486e 100644
--- a/plugins/Non-IM Contact/src/main.cpp	
+++ b/plugins/Non-IM Contact/src/main.cpp	
@@ -125,7 +125,7 @@ extern "C" __declspec(dllexport) int Load()
 	HookEvent(ME_CLIST_STATUSMODECHANGE, SetLCStatus);
 
 	PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE, MODNAME, PROTOTYPE_VIRTUAL };
-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+	Proto_RegisterModule(&pd);
 
 	//load services (the first 5 are the basic ones needed to make a new protocol)
 	CreateProtoServiceFunction(MODNAME, PS_GETCAPS, GetLCCaps);
-- 
cgit v1.2.3