- 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

4 files changed, 4 insertions, 4 deletions

diff --git a/plugins/NewsAggregator/Src/Common.h b/plugins/NewsAggregator/Src/Common.h
index 11b78ad76f..7a2c424978 100644
--- a/plugins/NewsAggregator/Src/Common.h
+++ b/plugins/NewsAggregator/Src/Common.h
@@ -32,12 +32,12 @@ Boston, MA 02111-1307, USA.
 #include <m_clist.h>

 #include <m_langpack.h>

 #include <m_options.h>

+#include <m_protosvc.h>

 #include <m_database.h>

 #include <m_netlib.h>

 #include <m_icolib.h>

 #include <m_message.h>

 #include <win2k.h>

-#include <m_protomod.h>

 #include <m_xml.h>

 #include <m_avatars.h>

 #include <m_hotkeys.h>

diff --git a/plugins/NewsAggregator/Src/ExportImport.cpp b/plugins/NewsAggregator/Src/ExportImport.cpp
index a7da89e57d..3b2ef7fd8c 100644
--- a/plugins/NewsAggregator/Src/ExportImport.cpp
+++ b/plugins/NewsAggregator/Src/ExportImport.cpp
@@ -150,7 +150,7 @@ INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 									}

 

 									MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

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

+									Proto_AddToContact(hContact, MODULE);

 									db_set_ts(hContact, MODULE, "Nick", text);

 									db_set_ts(hContact, MODULE, "URL", url);

 									db_set_ts(hContact, MODULE, "Homepage", siteurl);

diff --git a/plugins/NewsAggregator/Src/NewsAggregator.cpp b/plugins/NewsAggregator/Src/NewsAggregator.cpp
index 112b90b7ef..fc40b58c16 100644
--- a/plugins/NewsAggregator/Src/NewsAggregator.cpp
+++ b/plugins/NewsAggregator/Src/NewsAggregator.cpp
@@ -72,7 +72,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	pd.cbSize = sizeof(pd);

 	pd.szName = MODULE;

 	pd.type = PROTOTYPE_VIRTUAL;

-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

+	Proto_RegisterModule(&pd);

 

 	CreateProtoServiceFunction(MODULE, PS_GETNAME, NewsAggrGetName);

 	CreateProtoServiceFunction(MODULE, PS_GETCAPS, NewsAggrGetCaps);

diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp
index 40882267b7..b8849fc775 100644
--- a/plugins/NewsAggregator/Src/Options.cpp
+++ b/plugins/NewsAggregator/Src/Options.cpp
@@ -54,7 +54,7 @@ INT_PTR CALLBACK DlgProcAddFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				}

 

 				MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

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

+				Proto_AddToContact(hContact, MODULE);

 				GetDlgItemText(hwndDlg, IDC_FEEDTITLE, str, SIZEOF(str));

 				db_set_ts(hContact, MODULE, "Nick", str);