From 477a6ea70d0bb1b1dfe9cbd9a15b6dad0284ddeb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:40:03 +0300 Subject: all another C++'11 iterators --- plugins/YAPP/src/options.cpp | 3 +-- plugins/YAPP/src/services.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'plugins/YAPP/src') diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index 423299490d..10da330778 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -451,8 +451,7 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam if (((LPNMHDR)lParam)->code == PSN_APPLY) { arClasses = arNewClasses; char setting[256]; - for (int i = 0; i < arClasses.getCount(); i++) { - POPUPCLASS *pc = arClasses[i]; + for (auto &pc : arClasses) { mir_snprintf(setting, "%s/Timeout", pc->pszName); db_set_w(0, MODULE, setting, pc->iSeconds); mir_snprintf(setting, "%s/TextCol", pc->pszName); diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp index 71f68a7b05..87ef273df9 100644 --- a/plugins/YAPP/src/services.cpp +++ b/plugins/YAPP/src/services.cpp @@ -381,9 +381,9 @@ static INT_PTR CreateClassPopup(WPARAM wParam, LPARAM lParam) if (wParam) pc = (POPUPCLASS *)wParam; else { - for (int i = 0; i < arClasses.getCount(); i++) { - if (mir_strcmp(arClasses[i]->pszName, pdc->pszClassName) == 0) { - pc = arClasses[i]; + for (auto &it : arClasses) { + if (mir_strcmp(it->pszName, pdc->pszClassName) == 0) { + pc = it; break; } } @@ -446,6 +446,6 @@ void DeinitServices() { DestroyHookableEvent(hEventNotify); - for (int i = 0; i < arClasses.getCount(); i++) - FreePopupClass(arClasses[i]); + for (auto &it : arClasses) + FreePopupClass(it); } -- cgit v1.2.3