From 391980ce1e890445542441eeb5d9f9cc18ae1baf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jan 2018 22:31:20 +0300 Subject: code optimization --- plugins/IEView/src/Options.cpp | 4 ++-- plugins/IEView/src/Template.cpp | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/IEView/src') diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index bad5e10bba..5ca9fa0496 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -510,8 +510,8 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED)); { wchar_t* size[] = { L"320 x 205", L"480 x 385", L"560 x 349", L"640 x 390" }; - for (int i = 0; i < _countof(size); ++i) { - int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateW(size[i])); + for (auto &it : size) { + int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateW(it)); SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETITEMDATA, item, 0); } SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETCURSEL, Options::getEmbedsize(), 0); diff --git a/plugins/IEView/src/Template.cpp b/plugins/IEView/src/Template.cpp index 708abda305..c171a141c1 100644 --- a/plugins/IEView/src/Template.cpp +++ b/plugins/IEView/src/Template.cpp @@ -338,12 +338,12 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename, if (sscanf(store, "%s", tmp2) == EOF) continue; //template start bool bFound = false; - for (unsigned i = 0; i < _countof(templateNames); i++) { - if (!strncmp(store, templateNames[i].tokenString, templateNames[i].tokenLen)) { + for (auto &it : templateNames) + if (!strncmp(store, it.tokenString, it.tokenLen)) { bFound = true; break; } - } + if (bFound) { if (wasTemplate) tmap->addTemplate(lastTemplate, templateText); @@ -365,16 +365,16 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename, "MessageOutGroupStart", "MessageOutGroupInner", "hMessageOutGroupStart", "hMessageOutGroupInner" }; tmap->m_grouping = true; - for (int i = 0; i < _countof(groupTemplates); i++) { - if (tmap->getTemplate(groupTemplates[i]) == nullptr) { + for (auto &it : groupTemplates) { + if (tmap->getTemplate(it) == nullptr) { tmap->m_grouping = false; break; } } static const char *rtlTemplates[] = { "MessageInRTL", "MessageOutRTL" }; //"HTMLStartRTL", tmap->m_rtl = true; - for (int i = 0; i < _countof(rtlTemplates); i++) { - if (tmap->getTemplate(rtlTemplates[i]) == nullptr) { + for (auto &it : rtlTemplates) { + if (tmap->getTemplate(it) == nullptr) { tmap->m_rtl = false; break; } -- cgit v1.2.3