From f24f29830bd9b359f855ab9a3267340fc38dacbc Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 18 Aug 2022 11:19:04 -0700 Subject: [PATCH] [options] Change std::cerr stream output to PWARN. Remove temporary diagnostic. --- libgnucash/app-utils/gnc-option-impl.cpp | 4 ++-- libgnucash/app-utils/gnc-optiondb.cpp | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libgnucash/app-utils/gnc-option-impl.cpp b/libgnucash/app-utils/gnc-option-impl.cpp index ef193ca7e2..dbdad678ce 100644 --- a/libgnucash/app-utils/gnc-option-impl.cpp +++ b/libgnucash/app-utils/gnc-option-impl.cpp @@ -278,7 +278,7 @@ GncOptionAccountListValue::validate(const GncOptionAccountList& values) const if ((get_ui_type() == GncOptionUIType::ACCOUNT_SEL || !m_multiselect) && values.size() != 1) { - std::cerr << "GncOptionAccountListValue::validate: Multiple values for a non-multiselect option." << std::endl; + PWARN("GncOptionAccountListValue::validate: Multiple values for a non-multiselect option."); return false; } if (m_allowed.empty()) @@ -289,7 +289,7 @@ GncOptionAccountListValue::validate(const GncOptionAccountList& values) const if (std::find(m_allowed.begin(), m_allowed.end(), xaccAccountGetType(xaccAccountLookup(&guid, book))) == m_allowed.end()) { - std::cerr << "GncOptionAccountListValue::validate: Account " << gnc::GUID(guid).to_string() << " is not of an allowed type" << std::endl; + PWARN("GncOptionAccountListValue::validate: Account %s is not of an allowed type", gnc::GUID(guid).to_string().c_str()); return false; } } return true; diff --git a/libgnucash/app-utils/gnc-optiondb.cpp b/libgnucash/app-utils/gnc-optiondb.cpp index 7c9af496fb..4c52629d71 100644 --- a/libgnucash/app-utils/gnc-optiondb.cpp +++ b/libgnucash/app-utils/gnc-optiondb.cpp @@ -702,22 +702,13 @@ gnc_register_account_list_limited_option(GncOptionDB* db, { try { - std::cout << "gnc_register_account_list_limited_option for accounts "; - std::for_each(value.begin(), value.end(), [](auto& guid){ - std::cout << gnc::GUID(guid).to_string() << " "; - }); - std::cout << "and types "; - std::for_each(allowed.begin(), allowed.end(), [](auto type) { - std::cout << xaccAccountTypeEnumAsString(type) << " "; - }); - std::cout << std::endl; GncOption option{GncOptionAccountListValue{section, name, key, doc_string, GncOptionUIType::ACCOUNT_LIST, value, std::move(allowed)}}; db->register_option(section, std::move(option)); } catch (const std::invalid_argument& err) { - std::cerr << "Account List Limited Option, value failed validation, option not registered.\n"; + PWARN("Account List Limited Option, value failed validation, option not registered."); } } @@ -763,7 +754,7 @@ gnc_register_account_sel_limited_option(GncOptionDB* db, } catch (const std::invalid_argument& err) { - std::cerr <<"Account Sel Limited Option, value failed validation, option not registerd.\n"; + PWARN("Account Sel Limited Option, value failed validation, option not registerd."); } } @@ -815,7 +806,8 @@ gnc_register_number_range_option(GncOptionDB* db, const char* section, } catch(const std::invalid_argument& err) { - std::cerr <<"Number Range Option " << err.what() << ", option not registerd.\n"; + PWARN("Number Range Option %s, option not registerd.", + err.what()); } }