From faf45cfec5d2161aa7ccafad41f6d5f4f54a18bf Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Wed, 25 Sep 2019 23:14:22 +0200 Subject: Extensions: Warn for duplicate page names and option names/values This is easy to miss and causes confusing behavior (e.g. wrong page/option selected) --- src/extension/prefdialog/parameter-optiongroup.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/extension/prefdialog/parameter-optiongroup.cpp') diff --git a/src/extension/prefdialog/parameter-optiongroup.cpp b/src/extension/prefdialog/parameter-optiongroup.cpp index 232c35315..954627e78 100644 --- a/src/extension/prefdialog/parameter-optiongroup.cpp +++ b/src/extension/prefdialog/parameter-optiongroup.cpp @@ -17,6 +17,8 @@ #include "parameter-optiongroup.h" +#include + #include #include #include @@ -62,6 +64,22 @@ ParamOptionGroup::ParamOptionGroup(Inkscape::XML::Node *xml, Inkscape::Extension g_warning("No (valid) choices for parameter '%s' in extension '%s'", _name, _extension->get_id()); } + // check for duplicate option texts and values + std::unordered_set texts; + std::unordered_set values; + for (auto choice : choices) { + auto ret1 = texts.emplace(choice->_text); + if (!ret1.second) { + g_warning("Duplicate option text ('%s') for parameter '%s' in extension '%s'.", + choice->_text.c_str(), _name, _extension->get_id()); + } + auto ret2 = values.emplace(choice->_value); + if (!ret2.second) { + g_warning("Duplicate option value ('%s') for parameter '%s' in extension '%s'.", + choice->_value.c_str(), _name, _extension->get_id()); + } + } + // get value (initialize with value of first choice if pref is empty) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); _value = prefs->getString(pref_name()); -- cgit v1.2.3