From 9613f96e6a6f96ad02a0fc926054132811ae2bb1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 3 Apr 2018 16:30:25 +0300 Subject: Accounts() : iterator for accounts --- plugins/Ping/src/options.cpp | 11 ++--------- plugins/Ping/src/pingthread.cpp | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'plugins/Ping/src') diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index f8ee4ec831..f818782ec7 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -191,15 +191,8 @@ INT_PTR CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTPROTO, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)TranslateT("")); SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTPROTO, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)TranslateT("")); - { - int num_protocols = 0; - PROTOACCOUNT **pppDesc; - - Proto_EnumAccounts(&num_protocols, &pppDesc); - for (int i = 0; i < num_protocols; i++) - SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTPROTO, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)pppDesc[i]->tszAccountName); - - } + for (auto &pa : Accounts()) + SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTPROTO, CB_INSERTSTRING, (WPARAM)-1, (LPARAM)pa->tszAccountName); if (add_edit_addr.pszProto[0] == '\0') { SendDlgItemMessage(hwndDlg, IDC_COMBO_DESTPROTO, CB_SETCURSEL, 0, 0); diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 1cc8632675..0b21f6aac7 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -58,12 +58,8 @@ void set_list_changed(bool f) void SetProtoStatus(wchar_t *pszLabel, char *pszProto, int if_status, int new_status) { if (mir_strcmp(pszProto, Translate("")) == 0) { - int num_protocols; - PROTOACCOUNT **pppDesc; - - Proto_EnumAccounts(&num_protocols, &pppDesc); - for (int i = 0; i < num_protocols; i++) - SetProtoStatus(pszLabel, pppDesc[i]->szModuleName, if_status, new_status); + for (auto &pa : Accounts()) + SetProtoStatus(pszLabel, pa->szModuleName, if_status, new_status); } else { if (ProtoServiceExists(pszProto, PS_GETSTATUS)) { -- cgit v1.2.3