summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-04-04 20:33:57 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-04-04 20:33:57 +0300
commit53156bdc6edde511dbdf5e999756cd80d0a97e13 (patch)
tree4636c471ae1f8f06519cbd10efc41da47a9a18d1 /src
parent5da898f7cca8599ecff44b3fa10eafb753308a4d (diff)
static function CLIST_INTERFACE::pfnInitAutoRebuild replaced with Clist_InitAutoRebuild
Diffstat (limited to 'src')
-rw-r--r--src/mir_app/src/clc.cpp4
-rw-r--r--src/mir_app/src/clc.h1
-rw-r--r--src/mir_app/src/clcmsgs.cpp10
-rw-r--r--src/mir_app/src/clistcore.cpp1
-rw-r--r--src/mir_app/src/clistsettings.cpp2
-rw-r--r--src/mir_app/src/cluiservices.cpp2
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
8 files changed, 11 insertions, 11 deletions
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