From 9af11cd3eecbfb6e524623b6304fcacfe77bbfff Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jul 2016 07:42:30 +0000 Subject: non-redefined function pfnClcBroadcast made static -> Clist_Broadcast also its async variant created and published as Clist_BroadcastAsync git-svn-id: http://svn.miranda-ng.org/main/trunk@17108 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/clc.cpp | 14 +++++++------- plugins/Clist_nicer/src/clcmsgs.cpp | 2 +- plugins/Clist_nicer/src/clistevents.cpp | 4 ++-- plugins/Clist_nicer/src/clistmenus.cpp | 2 +- plugins/Clist_nicer/src/clistopts.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 4 ++-- plugins/Clist_nicer/src/cluiopts.cpp | 2 +- plugins/Clist_nicer/src/extBackg.cpp | 2 +- plugins/Clist_nicer/src/viewmodes.cpp | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index fb81cdbefa..cc7ec10771 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -50,7 +50,7 @@ void SetDBButtonStates(MCONTACT hContact); int AvatarChanged(WPARAM wParam, LPARAM lParam) { - pcli->pfnClcBroadcast(INTM_AVATARCHANGED, wParam, lParam); + Clist_Broadcast(INTM_AVATARCHANGED, wParam, lParam); return 0; } @@ -85,7 +85,7 @@ static int ClcEventAdded(WPARAM hContact, LPARAM lParam) p->dwLastMsgTime = dbei.timestamp; if (new_freq) p->msgFrequency = new_freq; - pcli->pfnClcBroadcast(INTM_FORCESORT, 0, 1); + Clist_Broadcast(INTM_FORCESORT, 0, 1); } } } @@ -96,7 +96,7 @@ static int ClcMetamodeChanged(WPARAM bMetaEnabled, LPARAM) { if (BOOL(bMetaEnabled) != cfg::dat.bMetaEnabled) { cfg::dat.bMetaEnabled = (BYTE)bMetaEnabled; - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); } return 0; } @@ -113,14 +113,14 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) } else if (!__strcmp(cws->szModule, "UserInfo")) { if (!__strcmp(cws->szSetting, "ANSIcodepage")) - pcli->pfnClcBroadcast(INTM_CODEPAGECHANGED, hContact, lParam); + Clist_Broadcast(INTM_CODEPAGECHANGED, hContact, lParam); else if (!__strcmp(cws->szSetting, "Timezone") || !__strcmp(cws->szSetting, "TzName")) ReloadExtraInfo(hContact); } else if (hContact != 0 && (szProto = GetContactProto(hContact)) != NULL) { if (!__strcmp(cws->szModule, "Protocol") && !__strcmp(cws->szSetting, "p")) { char *szProto_s; - pcli->pfnClcBroadcast(INTM_PROTOCHANGED, hContact, lParam); + Clist_Broadcast(INTM_PROTOCHANGED, hContact, lParam); if (cws->value.type == DBVT_DELETED) szProto_s = NULL; else @@ -149,10 +149,10 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) if (!(cfg::dat.dwFlags & CLUI_USEMETAICONS) && !__strcmp(szProto, META_PROTO)) if ((mir_strlen(cws->szSetting) > 6 && !strncmp(cws->szSetting, "Status", 6)) || strstr("Default,ForceSend,Nick", cws->szSetting)) - pcli->pfnClcBroadcast(INTM_NAMEORDERCHANGED, hContact, lParam); + Clist_Broadcast(INTM_NAMEORDERCHANGED, hContact, lParam); } if (cfg::dat.bMetaEnabled && !__strcmp(cws->szModule, META_PROTO) && !__strcmp(cws->szSetting, "IsSubcontact")) - pcli->pfnClcBroadcast(INTM_HIDDENCHANGED, hContact, lParam); + Clist_Broadcast(INTM_HIDDENCHANGED, hContact, lParam); } } else if (!__strcmp(cws->szModule, "Skin") && !__strcmp(cws->szSetting, "UseSound")) { diff --git a/plugins/Clist_nicer/src/clcmsgs.cpp b/plugins/Clist_nicer/src/clcmsgs.cpp index 8d42dddcc7..16859d8fa2 100644 --- a/plugins/Clist_nicer/src/clcmsgs.cpp +++ b/plugins/Clist_nicer/src/clcmsgs.cpp @@ -71,7 +71,7 @@ LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM return 0; contact->flags ^= CONTACTF_PRIORITY; db_set_b(contact->hContact, "CList", "Priority", (BYTE)(contact->flags & CONTACTF_PRIORITY ? 1 : 0)); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); } return 0; diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index a6d54a3798..506aa0ad49 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -293,7 +293,7 @@ CListEvent* AddEvent(CLISTEVENT *cle) HANDLE hItem = (HANDLE)SendMessage(pcli->hwndContactTree, CLM_FINDCONTACT, (WPARAM)p->hContact, 0); if (hItem) { SendMessage(pcli->hwndContactTree, CLM_SETSTICKY, (WPARAM)hItem, 1); - pcli->pfnClcBroadcast(INTM_PROTOCHANGED, (WPARAM)p->hContact, 0); + Clist_Broadcast(INTM_PROTOCHANGED, (WPARAM)p->hContact, 0); } } @@ -356,7 +356,7 @@ int RemoveEvent(MCONTACT hContact, MEVENT hDbEvent) HANDLE hItem = (HANDLE)SendMessage(pcli->hwndContactTree, CLM_FINDCONTACT, hContact, 0); if (hItem) { SendMessage(pcli->hwndContactTree, CLM_SETSTICKY, (WPARAM)hItem, 0); - pcli->pfnClcBroadcast(INTM_PROTOCHANGED, hContact, 0); + Clist_Broadcast(INTM_PROTOCHANGED, hContact, 0); } if (hContact == cfg::dat.hUpdateContact || (INT_PTR)hDbEvent == 1) diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index 89b287527c..cf2ece8265 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -255,7 +255,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA p->dwDFlags = dwFlags; } db_set_b(hContact, "CList", "Priority", (BYTE)(IsDlgButtonChecked(hWnd, IDC_IGN_PRIORITY) ? 1 : 0)); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); } } case IDCANCEL: diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index 4d8f4772b3..50e2a8011d 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -177,7 +177,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0); SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0); pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */ - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); PostMessage(pcli->hwndContactList, CLUIINTM_REDRAW, 0, 0); opt_gen_opts_changed = 0; diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 178962e422..978601ef01 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -339,7 +339,7 @@ void IcoLibReloadIcons() pcli->pfnReloadExtraIcons(); pcli->pfnSetAllExtraIcons(NULL); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); SendMessage(g_hwndViewModeFrame, WM_USER + 100, 0, 0); } @@ -1796,7 +1796,7 @@ buttons_done: static int MetaChanged(WPARAM wParam, LPARAM lParam) { - pcli->pfnClcBroadcast(INTM_METACHANGEDEVENT, wParam, lParam); + Clist_Broadcast(INTM_METACHANGEDEVENT, wParam, lParam); return 0; } diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp index 003f0dfd7d..dec092b6a9 100644 --- a/plugins/Clist_nicer/src/cluiopts.cpp +++ b/plugins/Clist_nicer/src/cluiopts.cpp @@ -298,7 +298,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l opt_clui_changed = 0; pcli->pfnClcOptionsChanged(); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); return TRUE; } break; diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index ff9f79b847..70e9cfedaf 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1569,7 +1569,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if (PathFileExists(tszFinalPath)) { LoadPerContactSkins(tszFinalPath); ReloadSkinItemsToCache(); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); } break; } diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index eb7c557e63..f13f1f6eb7 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -654,7 +654,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP db_unset(NULL, CLVM_MODULE, szBuf); if (!mir_strcmp(cfg::dat.current_viewmode, szBuf) && mir_strlen(szBuf) == mir_strlen(cfg::dat.current_viewmode)) { cfg::dat.bFilterEffective = 0; - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); SetWindowText(hwndSelector, TranslateT("No view mode")); } for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) @@ -969,7 +969,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case IDC_RESETMODES: clvm_reset_command: cfg::dat.bFilterEffective = 0; - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); SetDlgItemText(hwnd, IDC_SELECTMODE, TranslateT("No view mode")); CallService(MS_CLIST_SETHIDEOFFLINE, (WPARAM)cfg::dat.boldHideOffline, 0); cfg::dat.boldHideOffline = (BYTE)-1; @@ -1114,7 +1114,7 @@ void ApplyViewMode(const char *name) CallService(MS_CLIST_SETHIDEOFFLINE, 0, 0); SetWindowTextA(hwndSelector, name); - pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); + Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); SetButtonStates(); db_set_s(NULL, "CList", "LastViewMode", cfg::dat.current_viewmode); -- cgit v1.2.3