- 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

8 files changed, 13 insertions, 13 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
index 08a79a64d9..bd6ea8f7dc 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp
@@ -580,7 +580,7 @@ int CSModuleLoaded(WPARAM wParam, LPARAM lParam)
 

 	int count;

 	PROTOACCOUNT** protos;

-	ProtoEnumAccounts(&count, &protos);

+	Proto_EnumAccounts(&count, &protos);

 

 	for (int i = 0; i < count; i++)

 		if (IsSuitableProto(protos[i]))

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
index 2eb6dde172..370819a3f7 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
@@ -46,7 +46,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		

 			PROTOACCOUNT** proto;

 			int protoCount = 0;

-			ProtoEnumAccounts(&protoCount, &proto);

+			Proto_EnumAccounts(&protoCount, &proto);

 			if (protoCount <= 0)

 			{

 				DisableDialog(hwndDlg);

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 7dc9711bb0..2e1af36c2a 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -162,7 +162,7 @@ static void GetCurrentConnectionSettings()
 
 	int count;
 	PROTOACCOUNT** protos;
-	ProtoEnumAccounts(&count, &protos);
+	Proto_EnumAccounts(&count, &protos);
 
 	for (int i = 0; i < count; i++)
 		if (IsSuitableProto(protos[i]))
@@ -836,7 +836,7 @@ static void CheckContinueslyFunction(void *)
 
 		int count;
 		PROTOACCOUNT** protos;
-		ProtoEnumAccounts(&count, &protos);
+		Proto_EnumAccounts(&count, &protos);
 
 		for (int i = 0; i < count; i++) {
 			if (!IsSuitableProto(protos[i]))
@@ -876,7 +876,7 @@ static VOID CALLBACK CheckContinueslyTimer(HWND, UINT, UINT_PTR, DWORD)
 // =============== popup ======================
 static TCHAR* GetHumanName(LPARAM lParam)
 {
-	PROTOACCOUNT *ProtoAccount = ProtoGetAccount((char*)lParam);
+	PROTOACCOUNT *ProtoAccount = Proto_GetAccount((char*)lParam);
 	return (ProtoAccount != NULL) ? ProtoAccount->tszAccountName : TranslateT("Protocol");
 }
 
diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp
index a5ecb7c2fe..452ac6e691 100644
--- a/plugins/StatusPlugins/KeepStatus/options.cpp
+++ b/plugins/StatusPlugins/KeepStatus/options.cpp
@@ -60,7 +60,7 @@ static INT_PTR CALLBACK DlgProcKSBasicOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 

 			int count;

 			PROTOACCOUNT** protos;

-			ProtoEnumAccounts(&count, &protos);

+			Proto_EnumAccounts(&count, &protos);

 

 			for (i = 0; i < count; i++) {

 				if (!IsSuitableProto(protos[i]))

diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index 19032f1316..ca7d35b838 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -39,7 +39,7 @@ static TSettingsList* GetCurrentProtoSettings()
 {

 	int count;

 	PROTOACCOUNT **protos;

-	ProtoEnumAccounts(&count, &protos);

+	Proto_EnumAccounts(&count, &protos);

 

 	TSettingsList *result = new TSettingsList(count, CompareSettings);

 	if (result == NULL)

diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp
index 25c0e0bffd..a3b6687216 100644
--- a/plugins/StatusPlugins/StartupStatus/profiles.cpp
+++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp
@@ -237,7 +237,7 @@ int GetProfile( int profile, TSettingsList& arSettings )
 
 	// if count == 0, continue so the default profile will be returned
 	PROTOACCOUNT** protos;
-	ProtoEnumAccounts( &count, &protos );
+	Proto_EnumAccounts( &count, &protos );
 
 	for ( int i=0; i < count; i++ )
 		if ( IsSuitableProto( protos[i] ))
diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
index b126018a9a..155cc1e17b 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
@@ -290,14 +290,14 @@ static int OnOkToExit(WPARAM, LPARAM)
 	// save last protocolstatus

 	int count;

 	PROTOACCOUNT** protos;

-	ProtoEnumAccounts(&count, &protos);

+	Proto_EnumAccounts(&count, &protos);

 

 	for (int i = 0; i < count; i++) {

 		PROTOACCOUNT *pa = protos[i];

 		if (!IsSuitableProto(pa))

 			continue;

 

-		if (!ProtoGetAccount(pa->szModuleName))

+		if (!Proto_GetAccount(pa->szModuleName))

 			continue;

 

 		char lastName[128], lastMsg[128];

diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index f0423a24cc..fa128665f6 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -135,7 +135,7 @@ static int equalsGlobalStatus(PROTOCOLSETTINGEX **ps)
 

 	int count;

 	PROTOACCOUNT **protos;

-	ProtoEnumAccounts(&count, &protos);

+	Proto_EnumAccounts(&count, &protos);

 

 	for (i = 0; i < count; i++) {

 		if (!IsSuitableProto(protos[i]))

@@ -216,7 +216,7 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM)
 	// set all status messages first

 	for (int i = 0; i < protoList->getCount(); i++) {

 		char *szProto = protoSettings[i]->szName;

-		if (!ProtoGetAccount(szProto)) {

+		if (!Proto_GetAccount(szProto)) {

 			log_debugA("CommonStatus: %s is not loaded", szProto);

 			continue;

 		}

@@ -290,7 +290,7 @@ int GetProtoCount()
 {

 	int pCount = 0, count;

 	PROTOACCOUNT **accs;

-	ProtoEnumAccounts(&count, &accs);

+	Proto_EnumAccounts(&count, &accs);

 

 	for (int i = 0; i < count; i++)

 		if (IsSuitableProto(accs[i]))