IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

C++ - use more expressive std::any_of rather than std::find

Browse Source 
What's looked for is encapsulated in a lambda function
named is_req_column_type. This compares values in the vector
with a value captured from the main context, which is updated
for each call of std::any.
This commit is contained in:
Geert Janssens 2022-12-30 19:28:00 +01:00
parent 0ed0be4ef2
commit 16cc218097
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
View File

@ -1683,11 +1683,13 @@ void CsvImpPriceAssist::preview_refresh_table ()
preview_style_column (i, combostore);
auto column_types = price_imp->column_types_price();
GncPricePropType req_column_type;
auto is_req_column_type = [&req_column_type] (GncPricePropType column_type)->bool
{ return column_type == req_column_type; };
// look for a namespace column, clear the commodity combo
auto col_type_name = std::find (column_types.begin(),
column_types.end(), GncPricePropType::FROM_NAMESPACE);
if (col_type_name != column_types.end())
req_column_type = GncPricePropType::FROM_NAMESPACE; // Used by is_column_type()
if (std::any_of (column_types.begin(), column_types.end(), is_req_column_type))
{
g_signal_handlers_block_by_func (commodity_selector, (gpointer) csv_price_imp_preview_commodity_sel_cb, this);
set_commodity_for_combo (GTK_COMBO_BOX(commodity_selector), nullptr);
@ -1695,9 +1697,8 @@ void CsvImpPriceAssist::preview_refresh_table ()
}
// look for a symbol column, clear the commodity combo
auto col_type_sym = std::find (column_types.begin(),
column_types.end(), GncPricePropType::FROM_SYMBOL);
if (col_type_sym != column_types.end())
req_column_type = GncPricePropType::FROM_SYMBOL; // Used by is_column_type()
if (std::any_of (column_types.begin(), column_types.end(), is_req_column_type))
{
g_signal_handlers_block_by_func (commodity_selector, (gpointer) csv_price_imp_preview_commodity_sel_cb, this);
set_commodity_for_combo (GTK_COMBO_BOX(commodity_selector), nullptr);
@ -1705,9 +1706,8 @@ void CsvImpPriceAssist::preview_refresh_table ()
}
// look for a currency column, clear the currency combo
auto col_type_curr = std::find (column_types.begin(),
column_types.end(), GncPricePropType::TO_CURRENCY);
if (col_type_curr != column_types.end())
req_column_type = GncPricePropType::TO_CURRENCY; // Used by is_column_type()
if (std::any_of (column_types.begin(), column_types.end(), is_req_column_type))
{
g_signal_handlers_block_by_func (currency_selector, (gpointer) csv_price_imp_preview_currency_sel_cb, this);
set_commodity_for_combo (GTK_COMBO_BOX(currency_selector), nullptr);