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/TabSRMM/src/container.cpp  | 4 ++--
 plugins/TabSRMM/src/globals.cpp    | 4 ++--
 plugins/TabSRMM/src/msgoptions.cpp | 4 ++--
 plugins/TabSRMM/src/sendqueue.cpp  | 4 ++--
 plugins/TabSRMM/src/trayicon.cpp   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 41cfdfb025..c9b3ebeb1b 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -2191,7 +2191,7 @@ void TSAPI DeleteContainer(int iIndex)
 
 	db_set_ws(0, CONTAINER_KEY, szIndex, L"**free**");
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		ptrW tszValue(db_get_wsa(hContact, SRMSGMOD_T, CONTAINER_SUBKEY));
 		if (!mir_wstrcmp(tszValue, tszContainerName))
 			db_unset(hContact, SRMSGMOD_T, CONTAINER_SUBKEY);
@@ -2225,7 +2225,7 @@ void TSAPI RenameContainer(int iIndex, const wchar_t *szNew)
 
 	db_set_ws(0, CONTAINER_KEY, szIndex, szNew);
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		ptrW tszValue(db_get_wsa(hContact, SRMSGMOD_T, CONTAINER_SUBKEY));
 		if (!mir_wstrcmp(tszValue, tszContainerName))
 			db_set_ws(hContact, SRMSGMOD_T, CONTAINER_SUBKEY, szNew);
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index adc81218a0..11fb6aa266 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -454,7 +454,7 @@ int CGlobals::PreshutdownSendRecv(WPARAM, LPARAM)
 	::TN_ModuleDeInit();
 	::CloseAllContainers();
 
-	for (auto &hContact : contact_iter())
+	for (auto &hContact : Contacts())
 		db_set_dw(hContact, SRMSGMOD_T, "messagecount", 0);
 
 	::SI_DeinitStatusIcons();
@@ -501,7 +501,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 {
 	OBJLIST<MSavedEvent> arEvents(10, NumericKeySortT);
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		if (db_get_dw(hContact, "SendLater", "count", 0))
 			sendLater->addContact(hContact);
 
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index d0b5a2e5dd..e87aa97f88 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -881,7 +881,7 @@ class COptTypingDlg : public CDlgBase
 		if (hItemUnknown && M.GetByte(SRMSGMOD, SRMSGSET_TYPINGUNKNOWN, SRMSGDEFSET_TYPINGUNKNOWN))
 			SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItemUnknown, 1);
 
-		for (auto &hContact : contact_iter()) {
+		for (auto &hContact : Contacts()) {
 			HANDLE hItem = (HANDLE)SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 			if (hItem && db_get_b(hContact, SRMSGMOD, SRMSGSET_TYPING, defType))
 				SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 1);
@@ -896,7 +896,7 @@ class COptTypingDlg : public CDlgBase
 		if (hItemUnknown)
 			db_set_b(0, SRMSGMOD, SRMSGSET_TYPINGUNKNOWN, (BYTE)(SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItemUnknown, 0) ? 1 : 0));
 
-		for (auto &hContact : contact_iter()) {
+		for (auto &hContact : Contacts()) {
 			HANDLE hItem = (HANDLE)SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 			if (hItem)
 				db_set_b(hContact, SRMSGMOD, SRMSGSET_TYPING, (BYTE)(SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0) ? 1 : 0));
diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 43d26950e9..baf21a59d5 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -205,7 +205,7 @@ int SendQueue::sendQueued(CTabBaseDlg *dat, const int iEntry)
 
 		size_t iSendLength = getSendLength(iEntry);
 
-		for (auto &hContact : contact_iter()) {
+		for (auto &hContact : Contacts()) {
 			HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 			if (hItem && SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {
 				CContactCache *c = CContactCache::getContactCache(hContact);
@@ -221,7 +221,7 @@ int SendQueue::sendQueued(CTabBaseDlg *dat, const int iEntry)
 			return 0;
 		}
 
-		for (auto &hContact : contact_iter()) {
+		for (auto &hContact : Contacts()) {
 			HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 			if (hItem && SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {
 				doSendLater(iEntry, nullptr, hContact, false);
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 122266d5f2..2c12278a9a 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -287,7 +287,7 @@ void TSAPI LoadFavoritesAndRecent()
 	if (recentEntries == nullptr)
 		return;
 
-	for (auto &hContact : contact_iter()) {
+	for (auto &hContact : Contacts()) {
 		if (M.GetByte(hContact, "isFavorite", 0))
 			AddContactToFavorites(hContact, nullptr, nullptr, nullptr, 0, nullptr, 1, PluginConfig.g_hMenuFavorites);
 		if ((dwRecent = M.GetDword(hContact, "isRecent", 0)) != 0 && iIndex < nen_options.wMaxRecent) {
-- 
cgit v1.2.3