From c5d907a56bb4dad8fdcb17530f9dd196ec1aa762 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 6 Nov 2023 12:20:06 +0300 Subject: code cleaning --- plugins/Clist_modern/src/modern_toolbar.cpp | 30 +++++++-------- plugins/Clist_nicer/src/CLCButton.cpp | 60 ++++++++++++++--------------- 2 files changed, 45 insertions(+), 45 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 564cb31117..fc5ab73936 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -57,32 +57,32 @@ static void SetButtonPressed(int i, int state) void Modern_InitButtons() { - for (int i = 0; i < _countof(BTNS); i++) { + for (auto &it : BTNS) { TTBButton tbb = {}; - if (BTNS[i].pszButtonID) { - tbb.name = LPGEN(BTNS[i].pszButtonName); - tbb.pszService = BTNS[i].pszServiceName; - tbb.pszTooltipUp = LPGEN(BTNS[i].pszTooltipUp); - tbb.pszTooltipDn = LPGEN(BTNS[i].pszTooltipDn); + if (it.pszButtonID) { + tbb.name = it.pszButtonName; + tbb.pszService = it.pszServiceName; + tbb.pszTooltipUp = it.pszTooltipUp; + tbb.pszTooltipDn = it.pszTooltipDn; char buf[255]; - if (i != 0) { - mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn"); - tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, L"icons\\toolbar_icons.dll", BTNS[i].icoDefIdx, g_plugin.getInst(), BTNS[i].defResource); + if (&it != BTNS) { + mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, it.pszButtonID, "_dn"); + tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", it.pszTooltipUp, L"icons\\toolbar_icons.dll", it.icoDefIdx, g_plugin.getInst(), it.defResource); } - else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, nullptr, 0, nullptr, SKINICON_OTHER_MAINMENU); + else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", it.pszTooltipUp, nullptr, 0, nullptr, SKINICON_OTHER_MAINMENU); - if (BTNS[i].pszTooltipDn) { - mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up"); - tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, L"icons\\toolbar_icons.dll", BTNS[i].icoDefIdx + 1, g_plugin.getInst(), BTNS[i].defResource2); + if (it.pszTooltipDn) { + mir_snprintf(buf, "%s%s%s", TTB_OPTDIR, it.pszButtonID, "_up"); + tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", it.pszTooltipDn, L"icons\\toolbar_icons.dll", it.icoDefIdx + 1, g_plugin.getInst(), it.defResource2); } else tbb.hIconHandleDn = nullptr; } else tbb.dwFlags |= TTBBF_ISSEPARATOR; - tbb.dwFlags |= (BTNS[i].bVisByDefault ? TTBBF_VISIBLE : 0); - BTNS[i].hButton = g_plugin.addTTB(&tbb); + tbb.dwFlags |= (it.bVisByDefault ? TTBBF_VISIBLE : 0); + it.hButton = g_plugin.addTTB(&tbb); } SetButtonPressed(3, Clist::HideOffline); diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp index b046a55ffc..c5888edc88 100644 --- a/plugins/Clist_nicer/src/CLCButton.cpp +++ b/plugins/Clist_nicer/src/CLCButton.cpp @@ -26,44 +26,44 @@ HANDLE hToolbarFrame = (HANDLE)-1; struct CluiTopButton BTNS[] = { - { IDC_TBTOPMENU, "CLN_topmenu", nullptr, LPGEN("Show menu"), 1, 1, 1 }, - { IDC_TBHIDEOFFLINE, "CLN_online", nullptr, LPGEN("Show/Hide offline contacts"), 0, 1, 0 }, - { IDC_TBHIDEGROUPS, "CLN_groups", nullptr, LPGEN("Use/Disable groups"), 0, 1, 0 }, - { IDC_TBFINDANDADD, "CLN_findadd", nullptr, LPGEN("Find and add contacts"), 1, 1, 0 }, - { IDC_TBACCOUNTS, "CLN_accounts", nullptr, LPGEN("Accounts"), 1, 1, 0 }, - { IDC_TBOPTIONS, "CLN_options", nullptr, LPGEN("Open preferences"), 1, 1, 0 }, - { IDC_TBSOUND, "CLN_sound", "CLN_soundsoff", LPGEN("Enable/Disable sounds"), 0, 1, 0 }, - { IDC_TBMINIMIZE, "CLN_minimize", nullptr, LPGEN("Minimize contact list"), 1, 0, 0 }, - { IDC_TBTOPSTATUS, "CLN_topstatus", nullptr, LPGEN("Status menu"), 1, 0, 1 }, - - { IDC_TBSELECTVIEWMODE, "CLN_CLVM_select", nullptr, LPGEN("Select view mode"), 1, 0, 1 }, - { IDC_TBCONFIGUREVIEWMODE, "CLN_CLVM_options", nullptr, LPGEN("Setup view modes"), 1, 0, 0 }, - { IDC_TBCLEARVIEWMODE, "CLN_CLVM_reset", nullptr, LPGEN("Clear view mode"), 1, 0, 0 } + { IDC_TBTOPMENU, "CLN_topmenu", nullptr, LPGEN("Show menu"), 1, 1, 1 }, + { IDC_TBHIDEOFFLINE, "CLN_online", nullptr, LPGEN("Show/Hide offline contacts"), 0, 1, 0 }, + { IDC_TBHIDEGROUPS, "CLN_groups", nullptr, LPGEN("Use/Disable groups"), 0, 1, 0 }, + { IDC_TBFINDANDADD, "CLN_findadd", nullptr, LPGEN("Find and add contacts"), 1, 1, 0 }, + { IDC_TBACCOUNTS, "CLN_accounts", nullptr, LPGEN("Accounts"), 1, 1, 0 }, + { IDC_TBOPTIONS, "CLN_options", nullptr, LPGEN("Open preferences"), 1, 1, 0 }, + { IDC_TBSOUND, "CLN_sound", "CLN_soundsoff", LPGEN("Enable/Disable sounds"), 0, 1, 0 }, + { IDC_TBMINIMIZE, "CLN_minimize", nullptr, LPGEN("Minimize contact list"), 1, 0, 0 }, + { IDC_TBTOPSTATUS, "CLN_topstatus", nullptr, LPGEN("Status menu"), 1, 0, 1 }, + + { IDC_TBSELECTVIEWMODE, "CLN_CLVM_select", nullptr, LPGEN("Select view mode"), 1, 0, 1 }, + { IDC_TBCONFIGUREVIEWMODE, "CLN_CLVM_options", nullptr, LPGEN("Setup view modes"), 1, 0, 0 }, + { IDC_TBCLEARVIEWMODE, "CLN_CLVM_reset", nullptr, LPGEN("Clear view mode"), 1, 0, 0 } }; -static int g_index = -1; +static CluiTopButton *g_pButton = nullptr; static void InitDefaultButtons() { - for (int i = 0; i < _countof(BTNS); i++) { - TTBButton tbb = {}; + for (auto &it : BTNS) { + g_pButton = ⁢ - g_index = i; - if (BTNS[i].pszButtonID) { - if (!BTNS[i].isPush) + TTBButton tbb = {}; + if (it.pszButtonID) { + if (!it.isPush) tbb.dwFlags |= TTBBF_ASPUSHBUTTON; - tbb.pszTooltipUp = tbb.name = LPGEN(BTNS[i].pszButtonName); - tbb.hIconHandleUp = IcoLib_GetIconHandle(BTNS[i].pszButtonID); - if (BTNS[i].pszButtonDn) - tbb.hIconHandleDn = IcoLib_GetIconHandle(BTNS[i].pszButtonDn); + tbb.pszTooltipUp = tbb.name = LPGEN(it.pszButtonName); + tbb.hIconHandleUp = IcoLib_GetIconHandle(it.pszButtonID); + if (it.pszButtonDn) + tbb.hIconHandleDn = IcoLib_GetIconHandle(it.pszButtonDn); } else tbb.dwFlags |= TTBBF_ISSEPARATOR; - tbb.dwFlags |= (BTNS[i].isVis ? TTBBF_VISIBLE : 0); - BTNS[i].hButton = g_plugin.addTTB(&tbb); + tbb.dwFlags |= (it.isVis ? TTBBF_VISIBLE : 0); + it.hButton = g_plugin.addTTB(&tbb); } - g_index = -1; + g_pButton = nullptr; ClcSetButtonState(IDC_TBHIDEOFFLINE, Clist::HideOffline); ClcSetButtonState(IDC_TBHIDEGROUPS, Clist::UseGroups); @@ -572,11 +572,11 @@ static void CustomizeToolbar(HANDLE hButton, HWND hWnd, LPARAM) mir_subclassWindow(hWnd, TSButtonWndProc); MButtonExtension *bct = (MButtonExtension*)GetWindowLongPtr(hWnd, 0); - if (g_index != -1) { // adding built-in button - BTNS[g_index].hwndButton = hWnd; - if (BTNS[g_index].isAction) + if (g_pButton) { // adding built-in button + g_pButton->hwndButton = hWnd; + if (g_pButton->isAction) bct->bSendOnDown = true; - if (!BTNS[g_index].isPush) + if (!g_pButton->isPush) bct->bIsPushBtn = true; } else { -- cgit v1.2.3