From 12225716d38830a23477b97a6979b6414faeec7b Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 16 Mar 2018 21:05:31 +0300
Subject: entities' names to be started with capital letters

---
 plugins/DbEditorPP/src/copymodule.cpp     | 4 ++--
 plugins/DbEditorPP/src/deletemodule.cpp   | 4 ++--
 plugins/DbEditorPP/src/exportimport.cpp   | 2 +-
 plugins/DbEditorPP/src/modsettingenum.cpp | 2 +-
 plugins/DbEditorPP/src/moduletree.cpp     | 2 +-
 plugins/DbEditorPP/src/renamemodule.cpp   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/DbEditorPP/src')

diff --git a/plugins/DbEditorPP/src/copymodule.cpp b/plugins/DbEditorPP/src/copymodule.cpp
index 61962fa89c..5ca149ee4e 100644
--- a/plugins/DbEditorPP/src/copymodule.cpp
+++ b/plugins/DbEditorPP/src/copymodule.cpp
@@ -31,7 +31,7 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 			mir_snwprintf(msg, TranslateT("Copy module \"%s\""), _A2T(mac->module));
 			SetWindowText(hwnd, msg);
 
-			for (auto &hContact : contact_iter()) {
+			for (auto &hContact : Contacts()) {
 				if (ApplyProtoFilter(hContact))
 					continue;
 
@@ -61,7 +61,7 @@ INT_PTR CALLBACK copyModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 			}
 			else {
 				SetCursor(LoadCursor(nullptr, IDC_WAIT));
-				for (auto &hContact : contact_iter())
+				for (auto &hContact : Contacts())
 					copyModule(mac->module, mac->hContact, hContact);
 
 				SetCursor(LoadCursor(nullptr, IDC_ARROW));
diff --git a/plugins/DbEditorPP/src/deletemodule.cpp b/plugins/DbEditorPP/src/deletemodule.cpp
index 5d3104d233..4b07c0519b 100644
--- a/plugins/DbEditorPP/src/deletemodule.cpp
+++ b/plugins/DbEditorPP/src/deletemodule.cpp
@@ -47,7 +47,7 @@ void __cdecl PopulateModuleDropListThreadFunc(void *param)
 			continue;
 		}
 
-		for (auto &hContact : contact_iter()) {
+		for (auto &hContact : Contacts()) {
 			if (!IsModuleEmpty(hContact, module->name)) {
 				SendDlgItemMessageA(hwnd, IDC_CONTACTS, CB_ADDSTRING, 0, (LPARAM)module->name);
 				moduleEmpty = 0;
@@ -94,7 +94,7 @@ INT_PTR CALLBACK DeleteModuleDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM)
 			char module[FLD_SIZE];
 			GetDlgItemTextA(hwnd, IDC_CONTACTS, module, _countof(module));
 			SetCursor(LoadCursor(nullptr, IDC_WAIT));
-			for (auto &hContact : contact_iter())
+			for (auto &hContact : Contacts())
 				deleteModule(hContact, module, 0);
 
 			// do the null
diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index 82fc93f5eb..6ae2f27626 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -256,7 +256,7 @@ MCONTACT CheckNewContact(const char *myProto, const char *uid, const char *myNam
 {
 	char szProto[FLD_SIZE], szName[NAME_SIZE];
 
-	for (auto &hContact : contact_iter())
+	for (auto &hContact : Contacts())
 		if (!db_get_static(hContact, "Protocol", "p", szProto, _countof(szProto)))
 			if (!mir_strcmp(szProto, myProto))
 				if (GetValueA(hContact, szProto, uid, szName, _countof(szName)) && !mir_strcmp(szName, myName))
diff --git a/plugins/DbEditorPP/src/modsettingenum.cpp b/plugins/DbEditorPP/src/modsettingenum.cpp
index eef1292d39..630096c738 100644
--- a/plugins/DbEditorPP/src/modsettingenum.cpp
+++ b/plugins/DbEditorPP/src/modsettingenum.cpp
@@ -160,7 +160,7 @@ int fixResidentSettings()
 	fixing = 1;
 	int cnt = 0;
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		for (ModSetLinkLinkItem *module = ModuleList.first; module; module = module->next) {
 			if (IsModuleEmpty(hContact, module->name))
 				continue;
diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp
index 662c66ea85..5502e5c62e 100644
--- a/plugins/DbEditorPP/src/moduletree.cpp
+++ b/plugins/DbEditorPP/src/moduletree.cpp
@@ -46,7 +46,7 @@ int doContacts(HTREEITEM contactsRoot, ModuleSettingLL *modlist, MCONTACT hSelec
 	char szProto[FLD_SIZE];
 	wchar_t name[NAME_SIZE];
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		if (ApplyProtoFilter(hContact))
 			continue;
 
diff --git a/plugins/DbEditorPP/src/renamemodule.cpp b/plugins/DbEditorPP/src/renamemodule.cpp
index c4b12f9b88..f242fe5f1f 100644
--- a/plugins/DbEditorPP/src/renamemodule.cpp
+++ b/plugins/DbEditorPP/src/renamemodule.cpp
@@ -44,7 +44,7 @@ static INT_PTR CALLBACK AddModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 				if (IsDlgButtonChecked(hwnd, CHK_ADD2ALL)) {
 					// null contact
 					db_set_b(NULL, modulename, "(Default)", 0);
-					for (auto &hContact : contact_iter())
+					for (auto &hContact : Contacts())
 						db_set_b(hContact, modulename, "(Default)", 0);
 				}
 				else db_set_b((MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA), modulename, "(Default)", 0);
-- 
cgit v1.2.3