static function CLIST_INTERFACE::pfnInitAutoRebuild replaced with Clist_InitAutoRebuild

18 files changed, 22 insertions, 22 deletions

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 81865b6ea7..30a0301348 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -253,6 +253,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam
 EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);

 

 EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

+EXTERN_C MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd);

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // CLIST_INTERFACE structure definition

@@ -485,7 +486,6 @@ struct CLIST_INTERFACE
 	 *************************************************************************************/

 	int      (*pfnGetContactIcon)(MCONTACT hContact);

 	int      (*pfnTrayCalcChanged)(const char *szChangedProto, int averageMode, int iProtoCount);

-	void     (*pfnInitAutoRebuild)(HWND hwnd);

 	void     (*pfnSetContactCheckboxes)(ClcContact *cc, int checked);

 };

 

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 42fd239c91..edb5568706 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 829a3e8f95..da9004490c 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index a5853658ac..090f7c5284 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1310,7 +1310,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara
 		SendMessage(GetParent(hwnd), WM_NOTIFY, 0, (LPARAM)&nm);

 		dat->bNeedsResort = true;

 	}

-	pcli->pfnInitAutoRebuild(hwnd);

+	Clist_InitAutoRebuild(hwnd);

 	return 0;

 }

 

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 21f0d99124..f40be03600 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -68,7 +68,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 				SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) &~CLS_HIDEEMPTYGROUPS);

 			BOOL newval = ((GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_HIDEEMPTYGROUPS) != 0);

 			if (newval != old)

-				pcli->pfnInitAutoRebuild(hwnd);

+				Clist_InitAutoRebuild(hwnd);

 		}

 		return 0;

 

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 11f08454c7..a1feb71243 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -562,7 +562,7 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				db_set_b(0, "CList", "PlaceOfflineToRoot", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_OFFLINETOROOT));

 

 				pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */

-				pcli->pfnInitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */

+				Clist_InitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */

 				ClcOptionsChanged(); // Used to force loading avatar an list height related options

 				return TRUE;

 			}

@@ -741,7 +741,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 				pcli->pfnTrayIconIconsChanged();

 				pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */

-				pcli->pfnInitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */

+				Clist_InitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */

 				ClcOptionsChanged(); // Used to force loading avatar an list height related options

 				return TRUE;

 			}

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index f2d6136c4d..908fe8083e 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -141,7 +141,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 		}

 		else if (!strcmp(cws->szModule, META_PROTO) && !memcmp(cws->szSetting, "Status", 6)) { // Status0..N for metacontacts

 			if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled)

-				pcli->pfnInitAutoRebuild(pcli->hwndContactTree);

+				Clist_InitAutoRebuild(pcli->hwndContactTree);

 

 			if ((db_get_w(0, "CList", "SecondLineType", SETTING_SECONDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE || db_get_w(0, "CList", "ThirdLineType", SETTING_THIRDLINE_TYPE_DEFAULT) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->szProto)

 				amRequestAwayMsg(hContact);

@@ -152,7 +152,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 			pdnce->IdleTS = cws->value.dVal;

 		else if (!strcmp(cws->szSetting, "IsSubcontact")) {

 			pdnce->m_bIsSub = (cws->value.type == DBVT_DELETED) ? false : cws->value.bVal != 0;

-			pcli->pfnInitAutoRebuild(pcli->hwndContactTree);

+			Clist_InitAutoRebuild(pcli->hwndContactTree);

 		}

 	}

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 64b47b95d8..04c4ecf386 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1894,7 +1894,7 @@ LRESULT CLUI::OnCreateClc(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)
 	CreateCLC();

 	if (db_get_b(0, "CList", "ShowOnStart", SETTING_SHOWONSTART_DEFAULT))

 		cliShowHide(true);

-	pcli->pfnInitAutoRebuild(pcli->hwndContactTree);

+	Clist_InitAutoRebuild(pcli->hwndContactTree);

 	return FALSE;

 }

 

@@ -2231,7 +2231,7 @@ LRESULT CLUI::OnSysCommand(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnKeyDown(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	if (wParam == VK_F5)

-		pcli->pfnInitAutoRebuild(pcli->hwndContactTree);

+		Clist_InitAutoRebuild(pcli->hwndContactTree);

 	return DefCluiWndProc(msg, wParam, lParam);

 }

 

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index a19b8307cc..d1c94a1ff9 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -398,7 +398,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		if (!Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr))

 			break;

 		if (lParam == 0)

-			pcli->pfnInitAutoRebuild(hwnd);

+			Clist_InitAutoRebuild(hwnd);

 		return DefWindowProc(hwnd, msg, wParam, lParam);

 

 	case INTM_NAMECHANGED:

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 78de87fb99..340b5e8863 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -1514,7 +1514,7 @@ buttons_done:
 				break;
 			case POPUP_SHOWMETAICONS:
 				cfg::dat.dwFlags ^= CLUI_USEMETAICONS;
-				pcli->pfnInitAutoRebuild(pcli->hwndContactTree);
+				Clist_InitAutoRebuild(pcli->hwndContactTree);
 				break;
 			case POPUP_FRAME:
 				cfg::dat.dwFlags ^= CLUI_FRAME_CLISTSUNKEN;
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index d3c92eee22..90c37c5913 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -40,7 +40,7 @@ int g_IconWidth, g_IconHeight;
 

 void FreeDisplayNameCache(void);

 

-void fnInitAutoRebuild(HWND hWnd)

+MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd)

 {

 	if (!cli.bAutoRebuild && hWnd) {

 		cli.bAutoRebuild = true;

@@ -419,7 +419,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case INTM_NAMEORDERCHANGED:

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 

 	case INTM_CONTACTADDED:

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index a0242f6f46..3b82c9c07d 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -42,7 +42,6 @@ extern HIMAGELIST hCListImages;
 extern bool g_bReadyToInitClist;

 

 void fnClcOptionsChanged(void);

-void fnInitAutoRebuild(HWND hWnd);

 

 LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index 66d8cab152..8957ead116 100644
--- a/src/mir_app/src/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -382,17 +382,17 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 			SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | CLS_HIDEEMPTYGROUPS);

 		else

 			SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) & ~CLS_HIDEEMPTYGROUPS);

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 

 	case CLM_SETHIDEOFFLINEROOT:

 		db_set_b(0, "CLC", "HideOfflineRoot", (BYTE)wParam);

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 

 	case CLM_SETINDENT:

 		dat->groupIndent = wParam;

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 

 	case CLM_SETITEMTEXT:

@@ -410,7 +410,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 

 	case CLM_SETOFFLINEMODES:

 		dat->offlineModes = wParam;

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 

 	case CLM_SETSCROLLTIME:

@@ -428,7 +428,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 			SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | CLS_USEGROUPS);

 		else

 			SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) & ~CLS_USEGROUPS);

-		cli.pfnInitAutoRebuild(hwnd);

+		Clist_InitAutoRebuild(hwnd);

 		break;

 	}

 	return 0;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 5fac64e3e2..afac74bb60 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -197,7 +197,6 @@ void InitClistCore()
 	cli.pfnSetAllExtraIcons = fnSetAllExtraIcons;

 

 	cli.pfnGetContactIcon = fnGetContactIcon;

-	cli.pfnInitAutoRebuild = fnInitAutoRebuild;

 }

 

 MIR_APP_DLL(CLIST_INTERFACE*) Clist_GetInterface(void)

diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp
index b81767e776..fa2fa2bad7 100644
--- a/src/mir_app/src/clistsettings.cpp
+++ b/src/mir_app/src/clistsettings.cpp
@@ -94,7 +94,7 @@ void fnInvalidateDisplayNameCacheEntry(MCONTACT hContact)
 {

 	if (hContact == INVALID_CONTACT_ID) {

 		FreeDisplayNameCache();

-		cli.pfnInitAutoRebuild(cli.hwndContactTree);

+		Clist_InitAutoRebuild(cli.hwndContactTree);

 	}

 	else {

 		int idx = clistCache.getIndex((ClcCacheEntry*)&hContact);

diff --git a/src/mir_app/src/cluiservices.cpp b/src/mir_app/src/cluiservices.cpp
index 6cad21f8df..955c92eb52 100644
--- a/src/mir_app/src/cluiservices.cpp
+++ b/src/mir_app/src/cluiservices.cpp
@@ -74,7 +74,7 @@ EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void)
 

 	if (bRebuild) {

 		SetWindowLongPtr(cli.hwndContactTree, GWL_STYLE, dwStyle);

-		cli.pfnInitAutoRebuild(cli.hwndContactTree);

+		Clist_InitAutoRebuild(cli.hwndContactTree);

 	}

 }

 

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 920787e743..cd44fb5702 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -535,3 +535,4 @@ Proto_SetUniqueId @549
 ?SetUniqueId@CMPluginBase@@IAEXPBD@Z @555 NONAME

 Clist_GetProtocolVisibility @556

 ?Accounts@@YGAAU?$LIST@UPROTOACCOUNT@@@@XZ @557 NONAME

+Clist_InitAutoRebuild @558

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index f2939a19fd..2e25954dc0 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -535,3 +535,4 @@ Proto_SetUniqueId @549
 ?SetUniqueId@CMPluginBase@@IEAAXPEBD@Z @555 NONAME

 Clist_GetProtocolVisibility @556

 ?Accounts@@YAAEAU?$LIST@UPROTOACCOUNT@@@@XZ @557 NONAME

+Clist_InitAutoRebuild @558