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/Quotes/src/Forex.cpp              | 9 +++------
 plugins/Quotes/src/QuotesProviderBase.cpp | 4 ++--
 plugins/Quotes/src/stdafx.h               | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins/Quotes/src')

diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index 6693535fe9..289696bb4d 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -441,16 +441,13 @@ extern "C"
 		Quotes_IconsInit();
 		Quotes_InitExtraIcons();
 
-		PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };
+		PROTOCOLDESCRIPTOR pd = { 0 };
+		pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;
 		pd.szName = QUOTES_PROTOCOL_NAME;
 		pd.type = PROTOTYPE_VIRTUAL;
-		CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);
+		Proto_RegisterModule(&pd);
 
-		// 		CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETNAME, QuoteProtoFunc_GetName);
-		// 		CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETCAPS, QuoteProtoFunc_GetCaps);
-		// 		CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_SETSTATUS, QuoteProtoFunc_SetStatus);
 		CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETSTATUS, QuoteProtoFunc_GetStatus);
-		// 		CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_LOADICON, QuoteProtoFunc_LoadIcon);
 
 		HookEvent(ME_SYSTEM_MODULESLOADED, QuotesEventFunc_OnModulesLoaded);
 		HookEvent(ME_DB_CONTACT_DELETED, QuotesEventFunc_OnContactDeleted);
diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp
index 74dbfc01f0..a0d1ff989b 100644
--- a/plugins/Quotes/src/QuotesProviderBase.cpp
+++ b/plugins/Quotes/src/QuotesProviderBase.cpp
@@ -573,7 +573,7 @@ namespace
 		dbei.timestamp = static_cast<DWORD>(nTime);
 		dbei.flags = DBEF_READ | DBEF_UTF;
 		dbei.eventType = EVENTTYPE_MESSAGE;
-		dbei.cbBlob = ::mir_strlen(psz) + 1;
+		dbei.cbBlob = (int)::mir_strlen(psz) + 1;
 		dbei.pBlob = (PBYTE)(char*)psz;
 		db_event_add(hContact, &dbei);
 	}
@@ -818,7 +818,7 @@ MCONTACT CQuotesProviderBase::CreateNewContact(const tstring& rsName)
 {
 	MCONTACT hContact = MCONTACT(CallService(MS_DB_CONTACT_ADD, 0, 0));
 	if (hContact) {
-		if (0 == CallService(MS_PROTO_ADDTOCONTACT, WPARAM(hContact), (LPARAM)QUOTES_PROTOCOL_NAME)) {
+		if (0 == Proto_AddToContact(hContact, QUOTES_PROTOCOL_NAME)) {
 			tstring sProvName = GetInfo().m_sName;
 			db_set_ts(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_PROVIDER, sProvName.c_str());
 			db_set_ts(hContact, QUOTES_PROTOCOL_NAME, DB_STR_QUOTE_SYMBOL, rsName.c_str());
diff --git a/plugins/Quotes/src/stdafx.h b/plugins/Quotes/src/stdafx.h
index fe6920d233..7ee55294c5 100644
--- a/plugins/Quotes/src/stdafx.h
+++ b/plugins/Quotes/src/stdafx.h
@@ -21,11 +21,11 @@
 
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_protomod.h>
 #include <win2k.h>
 #include <m_xml.h>
 #include <m_langpack.h>
 #include <m_options.h>
+#include <m_protosvc.h>
 #include <m_extraicons.h>
 #include <m_icolib.h>
 #include <m_genmenu.h>
-- 
cgit v1.2.3