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/UserInfoEx/src/classPsTreeItem.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'plugins/UserInfoEx/src/classPsTreeItem.cpp') diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 1bd103b6f3..36f8abde3c 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -275,16 +275,13 @@ HICON CPsTreeItem::ProtoIcon() if (!_pszName) return nullptr; - PROTOACCOUNT **pa; - int ProtoCount; - Proto_EnumAccounts(&ProtoCount, &pa); - for (int i = 0; i < ProtoCount; i++) { - if (!mir_wstrncmpi(pa[i]->tszAccountName, _A2T(_pszName), mir_wstrlen(pa[i]->tszAccountName))) { + for (auto &pa : Accounts()) { + if (!mir_wstrncmpi(pa->tszAccountName, _A2T(_pszName), mir_wstrlen(pa->tszAccountName))) { CHAR szIconID[MAX_PATH]; - mir_snprintf(szIconID, "core_status_%s1", pa[i]->szModuleName); + mir_snprintf(szIconID, "core_status_%s1", pa->szModuleName); HICON hIco = IcoLib_GetIcon(szIconID); if (!hIco) - hIco = (HICON)CallProtoService(pa[i]->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL); + hIco = (HICON)CallProtoService(pa->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL); return hIco; } -- cgit v1.2.3