From 66b61f42871089f3962920924f9030cd6dff2ad8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 3 Apr 2018 13:37:13 +0300 Subject: CLIST_INTERFACE: - unused members removed (requires new History++ for people who compile Miranda themselves); - useless helpers Proto_IsAccountEnabled & Proto_IsProtocolLocked replaced with direct calls of PROTOACCOUNT members IsEnabled & IsLocked respectively; - static interface member pfnGetProtocolVisibility replaced with static function Clist_GetProtocolVisibility or PROTOACCOUNT::IsVisible when possible --- plugins/AddContactPlus/src/addcontact.cpp | 4 ++-- plugins/AddContactPlus/src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/AddContactPlus') diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index fdd5c6dafc..479dfd3fed 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -84,7 +84,7 @@ bool AddContactDlgAccounts(HWND hdlg, AddDialogParam *acs) Proto_EnumAccounts(&iRealAccCount, &pAccounts); for (int i = 0; i < iRealAccCount; i++) { - if (!Proto_IsAccountEnabled(pAccounts[i])) + if (!pAccounts[i]->IsEnabled()) continue; DWORD dwCaps = (DWORD)CallProtoService(pAccounts[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); @@ -113,7 +113,7 @@ bool AddContactDlgAccounts(HWND hdlg, AddDialogParam *acs) HDC hdc = GetDC(hdlg); SelectObject(hdc, (HFONT)SendDlgItemMessage(hdlg, IDC_PROTO, WM_GETFONT, 0, 0)); for (int i = 0; i < iRealAccCount; i++) { - if (!Proto_IsAccountEnabled(pAccounts[i])) continue; + if (!pAccounts[i]->IsEnabled()) continue; DWORD dwCaps = (DWORD)CallProtoService(pAccounts[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); if (!(dwCaps & PF1_BASICSEARCH) && !(dwCaps & PF1_EXTSEARCH) && !(dwCaps & PF1_SEARCHBYEMAIL) && !(dwCaps & PF1_SEARCHBYNAME)) continue; diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index ea7a8cc5db..9c80075431 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -79,7 +79,7 @@ static int OnAccListChanged(WPARAM, LPARAM) Proto_EnumAccounts(&iRealAccCount, &pAccounts); for (int i = 0; i < iRealAccCount; i++) { - if (!Proto_IsAccountEnabled(pAccounts[i])) + if (!pAccounts[i]->IsEnabled()) continue; DWORD dwCaps = (DWORD)CallProtoService(pAccounts[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); -- cgit v1.2.3