From 1a6ae4dcc2b3e20baf392127d590d02e855ba357 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 6 Apr 2018 19:50:12 +0300
Subject: CLIST_INTERFACE::pfnNotifyNewContact => Clist_NotifyNewContact

---
 plugins/Clist_blind/src/clcopts.cpp     | 29 +++++++++++------------------
 plugins/Clist_modern/src/modern_clc.cpp |  2 +-
 plugins/Clist_nicer/src/clc.cpp         |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index 20d98c0557..8abc59289a 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -37,19 +37,15 @@ struct CheckBoxToStyleEx_t
 	int not;
 }
 
-static const checkBoxToStyleEx[] = {
-//	{IDC_DISABLEDRAGDROP, CLS_EX_DISABLEDRAGDROP, 0},
-//	{IDC_NOTEDITLABELS, CLS_EX_EDITLABELS, 1},
-//	{IDC_SHOWSELALWAYS, CLS_EX_SHOWSELALWAYS, 0},
-	{IDC_TRACKSELECT, CLS_EX_TRACKSELECT, 0},
-	{IDC_SHOWGROUPCOUNTS, CLS_EX_SHOWGROUPCOUNTS, 0},
-	{IDC_HIDECOUNTSWHENEMPTY, CLS_EX_HIDECOUNTSWHENEMPTY, 0},
-//	{IDC_DIVIDERONOFF, CLS_EX_DIVIDERONOFF, 0},
-//	{IDC_NOTNOTRANSLUCENTSEL, CLS_EX_NOTRANSLUCENTSEL, 1},
-	{IDC_LINEWITHGROUPS, CLS_EX_LINEWITHGROUPS, 0},
-	{IDC_QUICKSEARCHVISONLY, CLS_EX_QUICKSEARCHVISONLY, 0},
-	{IDC_SORTGROUPSALPHA, CLS_EX_SORTGROUPSALPHA, 0},
-	{IDC_NOTNOSMOOTHSCROLLING, CLS_EX_NOSMOOTHSCROLLING, 1}
+static const checkBoxToStyleEx[] =
+{
+	{ IDC_TRACKSELECT, CLS_EX_TRACKSELECT, 0 },
+	{ IDC_SHOWGROUPCOUNTS, CLS_EX_SHOWGROUPCOUNTS, 0 },
+	{ IDC_HIDECOUNTSWHENEMPTY, CLS_EX_HIDECOUNTSWHENEMPTY, 0 },
+	{ IDC_LINEWITHGROUPS, CLS_EX_LINEWITHGROUPS, 0 },
+	{ IDC_QUICKSEARCHVISONLY, CLS_EX_QUICKSEARCHVISONLY, 0 },
+	{ IDC_SORTGROUPSALPHA, CLS_EX_SORTGROUPSALPHA, 0 },
+	{ IDC_NOTNOSMOOTHSCROLLING, CLS_EX_NOSMOOTHSCROLLING, 1 }
 };
 
 struct CheckBoxValues_t
@@ -128,12 +124,9 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE,
 			GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);
 		{
-			int i;
 			DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle());
-			for (i = 0; i < _countof(checkBoxToStyleEx); i++)
-				CheckDlgButton(hwndDlg, checkBoxToStyleEx[i].id,
-					(exStyle & checkBoxToStyleEx[i].flag) ^ (checkBoxToStyleEx[i].flag *
-						checkBoxToStyleEx[i].not) ? BST_CHECKED : BST_UNCHECKED);
+			for (auto &it : checkBoxToStyleEx)
+				CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not) ? BST_CHECKED : BST_UNCHECKED);
 		}
 		{
 			UDACCEL accel[2] = { {0, 10} , {2, 50} };
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 0aa55e9858..2f73560dd5 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1351,7 +1351,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam
 			if (contact) {
 				contact->iImage = lParam;
 				contact->bImageIsSpecial = bImageIsSpecial;
-				pcli->pfnNotifyNewContact(hwnd, wParam);
+				Clist_NotifyNewContact(hwnd, wParam);
 				dat->bNeedsResort = true;
 			}
 		}
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index ca0c6c673c..e4598bb954 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -331,7 +331,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					Clist_FindItem(hwnd, dat, hContact, &contact, nullptr, nullptr);
 					if (contact) {
 						contact->iImage = (WORD)lParam;
-						pcli->pfnNotifyNewContact(hwnd, hContact);
+						Clist_NotifyNewContact(hwnd, hContact);
 					}
 				}
 			}
-- 
cgit v1.2.3