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
---
src/core/stdauth/src/authdialogs.cpp | 4 ++--
src/core/stdauth/src/commonheaders.h | 1 -
src/core/stdautoaway/src/autoaway.cpp | 2 +-
src/core/stdautoaway/src/commonheaders.h | 1 -
src/core/stdaway/src/commonheaders.h | 1 -
src/core/stdaway/src/sendmsg.cpp | 4 ++--
src/core/stdchat/src/chat.h | 1 -
src/core/stdclist/src/clistopts.cpp | 4 ++--
src/core/stdcrypt/src/commonheaders.h | 1 -
src/core/stdemail/src/commonheaders.h | 1 -
src/core/stdfile/src/commonheaders.h | 1 -
src/core/stdhelp/src/commonheaders.h | 1 -
src/core/stdidle/src/commonheaders.h | 1 -
src/core/stduihist/src/commonheaders.h | 1 -
src/core/stdurl/commonheaders.h | 1 -
src/core/stduserinfo/src/commonheaders.h | 1 -
src/core/stduseronline/src/commonheaders.h | 1 -
src/core/stduseronline/src/useronline.cpp | 2 +-
18 files changed, 8 insertions(+), 21 deletions(-)
(limited to 'src/core')
diff --git a/src/core/stdauth/src/authdialogs.cpp b/src/core/stdauth/src/authdialogs.cpp
index a1a7897249..4d4674d81c 100644
--- a/src/core/stdauth/src/authdialogs.cpp
+++ b/src/core/stdauth/src/authdialogs.cpp
@@ -53,7 +53,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));
- PROTOACCOUNT* acc = ProtoGetAccount(dbei.szModule);
+ PROTOACCOUNT* acc = Proto_GetAccount(dbei.szModule);
TCHAR* lastT = dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last);
TCHAR* firstT = dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first);
@@ -177,7 +177,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));
SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));
- PROTOACCOUNT* acc = ProtoGetAccount(dbei.szModule);
+ PROTOACCOUNT* acc = Proto_GetAccount(dbei.szModule);
ptrT lastT(dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last));
ptrT firstT(dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first));
diff --git a/src/core/stdauth/src/commonheaders.h b/src/core/stdauth/src/commonheaders.h
index 1ba20c8690..9ac9abbf2a 100644
--- a/src/core/stdauth/src/commonheaders.h
+++ b/src/core/stdauth/src/commonheaders.h
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdautoaway/src/autoaway.cpp b/src/core/stdautoaway/src/autoaway.cpp
index e3aa0603de..9084ab7f61 100644
--- a/src/core/stdautoaway/src/autoaway.cpp
+++ b/src/core/stdautoaway/src/autoaway.cpp
@@ -69,7 +69,7 @@ static int AutoAwayEvent(WPARAM, LPARAM lParam)
int numAccounts;
PROTOACCOUNT** accounts;
- ProtoEnumAccounts(&numAccounts, &accounts);
+ Proto_EnumAccounts(&numAccounts, &accounts);
for (int i = 0; i < numAccounts; i++) {
PROTOACCOUNT *pa = accounts[i];
diff --git a/src/core/stdautoaway/src/commonheaders.h b/src/core/stdautoaway/src/commonheaders.h
index efdb7396e7..4e6c33ab90 100644
--- a/src/core/stdautoaway/src/commonheaders.h
+++ b/src/core/stdautoaway/src/commonheaders.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdaway/src/commonheaders.h b/src/core/stdaway/src/commonheaders.h
index ea2707e767..cac3b84b67 100644
--- a/src/core/stdaway/src/commonheaders.h
+++ b/src/core/stdaway/src/commonheaders.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index 1347036dd4..f40abdec32 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -186,7 +186,7 @@ void ChangeAllProtoMessages(char *szProto, int statusMode, TCHAR *msg)
if (szProto == NULL) {
int nAccounts;
PROTOACCOUNT **accounts;
- ProtoEnumAccounts(&nAccounts, &accounts);
+ Proto_EnumAccounts(&nAccounts, &accounts);
for (int i = 0; i < nAccounts; i++) {
PROTOACCOUNT *pa = accounts[i];
@@ -575,7 +575,7 @@ static int AwayMsgSendAccountsChanged(WPARAM, LPARAM)
int nAccounts;
PROTOACCOUNT** accounts;
- ProtoEnumAccounts(&nAccounts, &accounts);
+ Proto_EnumAccounts(&nAccounts, &accounts);
for (int i = 0; i < nAccounts; i++) {
if (!Proto_IsAccountEnabled(accounts[i]))
continue;
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 6e66536072..d2706c8605 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -46,7 +46,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_skin.h>
#include <m_button.h>
-#include <m_protomod.h>
#include <m_protosvc.h>
#include <m_clist.h>
#include <m_clistint.h>
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index aad1364110..4c4d871ec1 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -127,9 +127,9 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
int count;
PROTOACCOUNT **accs;
- ProtoEnumAccounts(&count, &accs);
+ Proto_EnumAccounts(&count, &accs);
for (int i = 0; i < count; i++) {
- if (!IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
+ if (!Proto_IsAccountEnabled(accs[i]) || CallProtoService(accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)
continue;
item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM)accs[i]->tszAccountName);
diff --git a/src/core/stdcrypt/src/commonheaders.h b/src/core/stdcrypt/src/commonheaders.h
index 43da7d6c65..32c6f26034 100644
--- a/src/core/stdcrypt/src/commonheaders.h
+++ b/src/core/stdcrypt/src/commonheaders.h
@@ -50,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdemail/src/commonheaders.h b/src/core/stdemail/src/commonheaders.h
index 537c6293fa..5d64b310f8 100644
--- a/src/core/stdemail/src/commonheaders.h
+++ b/src/core/stdemail/src/commonheaders.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdfile/src/commonheaders.h b/src/core/stdfile/src/commonheaders.h
index b476a77cf1..c028084e09 100644
--- a/src/core/stdfile/src/commonheaders.h
+++ b/src/core/stdfile/src/commonheaders.h
@@ -56,7 +56,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_protoint.h>
#include <m_options.h>
diff --git a/src/core/stdhelp/src/commonheaders.h b/src/core/stdhelp/src/commonheaders.h
index e1763c4cc8..ef3c230d8f 100644
--- a/src/core/stdhelp/src/commonheaders.h
+++ b/src/core/stdhelp/src/commonheaders.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdidle/src/commonheaders.h b/src/core/stdidle/src/commonheaders.h
index 4294473f85..565408f1ba 100644
--- a/src/core/stdidle/src/commonheaders.h
+++ b/src/core/stdidle/src/commonheaders.h
@@ -53,7 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stduihist/src/commonheaders.h b/src/core/stduihist/src/commonheaders.h
index 93fb17ecb2..52ab245752 100644
--- a/src/core/stduihist/src/commonheaders.h
+++ b/src/core/stduihist/src/commonheaders.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h
index 6651d1f240..3acf6d5748 100644
--- a/src/core/stdurl/commonheaders.h
+++ b/src/core/stdurl/commonheaders.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stduserinfo/src/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h
index ec79f2ea84..49583b6a21 100644
--- a/src/core/stduserinfo/src/commonheaders.h
+++ b/src/core/stduserinfo/src/commonheaders.h
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stduseronline/src/commonheaders.h b/src/core/stduseronline/src/commonheaders.h
index 774e7c6dcc..df5c89598e 100644
--- a/src/core/stduseronline/src/commonheaders.h
+++ b/src/core/stduseronline/src/commonheaders.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_clistint.h>
#include <m_button.h>
#include <m_protosvc.h>
-#include <m_protomod.h>
#include <m_protocols.h>
#include <m_options.h>
#include <m_skin.h>
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index e2cb2cc85b..32e5bcb2b8 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -93,7 +93,7 @@ static int UserOnlineModulesLoaded(WPARAM, LPARAM)
{
int numAccounts;
PROTOACCOUNT** accounts;
- ProtoEnumAccounts(&numAccounts, &accounts);
+ Proto_EnumAccounts(&numAccounts, &accounts);
// reset the counter
for (int i = 0; i < numAccounts; i++)
--
cgit v1.2.3