From 90e4f9c10e1c21a8501872070ac7881dd19936b8 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 4 Sep 2024 20:43:39 -0400 Subject: [PATCH 1/6] Changed Default_toggle to hide_category in the proto --- xml_converter/doc/menu/default_visibility.md | 9 ++++++++- xml_converter/proto/waypoint.proto | 2 +- xml_converter/src/category_gen.cpp | 10 +++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xml_converter/doc/menu/default_visibility.md b/xml_converter/doc/menu/default_visibility.md index b598d83d..802825fd 100644 --- a/xml_converter/doc/menu/default_visibility.md +++ b/xml_converter/doc/menu/default_visibility.md @@ -3,7 +3,14 @@ name: Default Visibility type: Boolean applies_to: [Category] xml_fields: [DefaultToggle] -protobuf_field: default_visibility +protobuf_field: hide_category +custom_functions: + read.xml: + function: inverted_xml_attribute_to_bool + side_effects: [] + write.xml: + function: bool_to_inverted_xml_attribute + side_effects: [] --- Notes diff --git a/xml_converter/proto/waypoint.proto b/xml_converter/proto/waypoint.proto index 74d77133..d81d0e9e 100644 --- a/xml_converter/proto/waypoint.proto +++ b/xml_converter/proto/waypoint.proto @@ -21,7 +21,7 @@ message Category { repeated Icon icon = 3; repeated Trail trail = 4; bool is_separator = 5; - bool default_visibility = 6; + bool hide_category = 6; string tip_description = 7; bytes id = 8; } diff --git a/xml_converter/src/category_gen.cpp b/xml_converter/src/category_gen.cpp index 91d69ce7..9134b5a5 100644 --- a/xml_converter/src/category_gen.cpp +++ b/xml_converter/src/category_gen.cpp @@ -49,7 +49,7 @@ bool Category::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vectordefault_visibility), &(this->default_visibility_is_set)); + inverted_xml_attribute_to_bool(attribute, errors, state, &(this->default_visibility), &(this->default_visibility_is_set)); } else if (attributename == "displayname") { xml_attribute_to_string(attribute, errors, state, &(this->display_name), &(this->display_name_is_set)); @@ -79,7 +79,7 @@ vector Category::as_xml(XMLWriterState* state) const { vector xml_node_contents; xml_node_contents.push_back("default_visibility_is_set) { - xml_node_contents.push_back(bool_to_xml_attribute("DefaultToggle", state, &this->default_visibility)); + xml_node_contents.push_back(bool_to_inverted_xml_attribute("DefaultToggle", state, &this->default_visibility)); } if (this->display_name_is_set) { xml_node_contents.push_back(string_to_xml_attribute("DisplayName", state, &this->display_name)); @@ -114,7 +114,7 @@ vector Category::as_xml(XMLWriterState* state) const { waypoint::Category Category::as_protobuf(ProtoWriterState* state) const { waypoint::Category proto_category; if (this->default_visibility_is_set) { - std::function setter = [&proto_category](bool val) { proto_category.set_default_visibility(val); }; + std::function setter = [&proto_category](bool val) { proto_category.set_hide_category(val); }; bool_to_proto(this->default_visibility, state, setter); } if (this->display_name_is_set) { @@ -137,8 +137,8 @@ waypoint::Category Category::as_protobuf(ProtoWriterState* state) const { } void Category::parse_protobuf(waypoint::Category proto_category, ProtoReaderState* state) { - if (proto_category.default_visibility() != 0) { - proto_to_bool(proto_category.default_visibility(), state, &(this->default_visibility), &(this->default_visibility_is_set)); + if (proto_category.hide_category() != 0) { + proto_to_bool(proto_category.hide_category(), state, &(this->default_visibility), &(this->default_visibility_is_set)); } if (proto_category.name() != "") { proto_display_name_to_display_name_and_name(proto_category.name(), state, &(this->display_name), &(this->display_name_is_set), &(this->name), &(this->name_is_set)); From 7800c5b30d3bbec14c8682a1cf49e88b01f04418 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 4 Sep 2024 20:45:56 -0400 Subject: [PATCH 2/6] Added integrations tests --- .../default_toggle/input/pack/xml_file.xml | 16 +++++++++++++++ .../default_toggle/output_proto/markers.bin | 9 +++++++++ .../default_toggle/output_xml/xml_file.xml | 20 +++++++++++++++++++ .../test_cases/default_toggle/testcase.yaml | 5 +++++ 4 files changed, 50 insertions(+) create mode 100644 xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml create mode 100644 xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin create mode 100644 xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml create mode 100644 xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml diff --git a/xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml new file mode 100644 index 00000000..ebea9d36 --- /dev/null +++ b/xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin new file mode 100644 index 00000000..d46368ee --- /dev/null +++ b/xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin @@ -0,0 +1,9 @@ + +. + My Category 2B \Ï)Cf¦RC{ÔWC0B(èÌ“^– +. + My Category 2 2B \Ï)Cf¦RC{ÔWCB(íià4 1b +0 + My Category 3 2B \Ï)Cf¦RC{ÔWC0B(íià5 1b +. + My Category 4 2B \Ï)Cf¦RC{ÔWCB(íià6 1b \ No newline at end of file diff --git a/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml new file mode 100644 index 00000000..b72af1dc --- /dev/null +++ b/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml b/xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml new file mode 100644 index 00000000..9510c793 --- /dev/null +++ b/xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml @@ -0,0 +1,5 @@ +input_paths: + "pack": "xml" +expected_stdout: | +expected_stderr: | +expected_returncode: 0 From f72024f466a777fe6cbf61bc41cbd2b4da414a8f Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 4 Sep 2024 20:51:20 -0400 Subject: [PATCH 3/6] Added tests for the proto input field hide_category --- .../input/pack/markers.bin | 9 +++++++++ .../output_proto/markers.bin | 9 +++++++++ .../output_xml/xml_file.xml | 20 +++++++++++++++++++ .../proto_hide_category/testcase.yaml | 5 +++++ 4 files changed, 43 insertions(+) create mode 100644 xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin create mode 100644 xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin create mode 100644 xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml create mode 100644 xml_converter/integration_tests/test_cases/proto_hide_category/testcase.yaml diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin b/xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin new file mode 100644 index 00000000..d46368ee --- /dev/null +++ b/xml_converter/integration_tests/test_cases/proto_hide_category/input/pack/markers.bin @@ -0,0 +1,9 @@ + +. + My Category 2B \Ï)Cf¦RC{ÔWC0B(èÌ“^– +. + My Category 2 2B \Ï)Cf¦RC{ÔWCB(íià4 1b +0 + My Category 3 2B \Ï)Cf¦RC{ÔWC0B(íià5 1b +. + My Category 4 2B \Ï)Cf¦RC{ÔWCB(íià6 1b \ No newline at end of file diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin new file mode 100644 index 00000000..d46368ee --- /dev/null +++ b/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin @@ -0,0 +1,9 @@ + +. + My Category 2B \Ï)Cf¦RC{ÔWC0B(èÌ“^– +. + My Category 2 2B \Ï)Cf¦RC{ÔWCB(íià4 1b +0 + My Category 3 2B \Ï)Cf¦RC{ÔWC0B(íià5 1b +. + My Category 4 2B \Ï)Cf¦RC{ÔWCB(íià6 1b \ No newline at end of file diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml new file mode 100644 index 00000000..3fdfdf9e --- /dev/null +++ b/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/testcase.yaml b/xml_converter/integration_tests/test_cases/proto_hide_category/testcase.yaml new file mode 100644 index 00000000..d87f4066 --- /dev/null +++ b/xml_converter/integration_tests/test_cases/proto_hide_category/testcase.yaml @@ -0,0 +1,5 @@ +input_paths: + "pack": "proto" +expected_stdout: | +expected_stderr: | +expected_returncode: 0 From 352ce712f467425c15aeb6fba806ff6285fa1e65 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 4 Sep 2024 20:58:38 -0400 Subject: [PATCH 4/6] Changed name of variable in documentation and regenerated code --- ...default_visibility.md => hide_category.md} | 2 +- .../default_toggle/output_xml/xml_file.xml | 8 +++--- .../output_xml/xml_file.xml | 4 +-- xml_converter/src/category_gen.cpp | 28 +++++++++---------- xml_converter/src/category_gen.hpp | 4 +-- 5 files changed, 23 insertions(+), 23 deletions(-) rename xml_converter/doc/menu/{default_visibility.md => hide_category.md} (94%) diff --git a/xml_converter/doc/menu/default_visibility.md b/xml_converter/doc/menu/hide_category.md similarity index 94% rename from xml_converter/doc/menu/default_visibility.md rename to xml_converter/doc/menu/hide_category.md index 802825fd..c1773fc9 100644 --- a/xml_converter/doc/menu/default_visibility.md +++ b/xml_converter/doc/menu/hide_category.md @@ -1,5 +1,5 @@ --- -name: Default Visibility +name: Hide Category type: Boolean applies_to: [Category] xml_fields: [DefaultToggle] diff --git a/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml index b72af1dc..dd9d98b4 100644 --- a/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml @@ -1,14 +1,14 @@ - + - + - + - + diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml index 3fdfdf9e..0bc237c6 100644 --- a/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/proto_hide_category/output_xml/xml_file.xml @@ -1,11 +1,11 @@ - + - + diff --git a/xml_converter/src/category_gen.cpp b/xml_converter/src/category_gen.cpp index 9134b5a5..0cf59014 100644 --- a/xml_converter/src/category_gen.cpp +++ b/xml_converter/src/category_gen.cpp @@ -48,12 +48,12 @@ void Category::init_from_xml(rapidxml::xml_node<>* node, vector* erro bool Category::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vector* errors, XMLReaderState* state) { string attributename; attributename = normalize(get_attribute_name(attribute)); - if (attributename == "defaulttoggle") { - inverted_xml_attribute_to_bool(attribute, errors, state, &(this->default_visibility), &(this->default_visibility_is_set)); - } - else if (attributename == "displayname") { + if (attributename == "displayname") { xml_attribute_to_string(attribute, errors, state, &(this->display_name), &(this->display_name_is_set)); } + else if (attributename == "defaulttoggle") { + inverted_xml_attribute_to_bool(attribute, errors, state, &(this->hide_category), &(this->hide_category_is_set)); + } else if (attributename == "isseparator") { xml_attribute_to_bool(attribute, errors, state, &(this->is_separator), &(this->is_separator_is_set)); } @@ -78,12 +78,12 @@ bool Category::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vector Category::as_xml(XMLWriterState* state) const { vector xml_node_contents; xml_node_contents.push_back("default_visibility_is_set) { - xml_node_contents.push_back(bool_to_inverted_xml_attribute("DefaultToggle", state, &this->default_visibility)); - } if (this->display_name_is_set) { xml_node_contents.push_back(string_to_xml_attribute("DisplayName", state, &this->display_name)); } + if (this->hide_category_is_set) { + xml_node_contents.push_back(bool_to_inverted_xml_attribute("DefaultToggle", state, &this->hide_category)); + } if (this->is_separator_is_set) { xml_node_contents.push_back(bool_to_xml_attribute("IsSeparator", state, &this->is_separator)); } @@ -113,14 +113,14 @@ vector Category::as_xml(XMLWriterState* state) const { waypoint::Category Category::as_protobuf(ProtoWriterState* state) const { waypoint::Category proto_category; - if (this->default_visibility_is_set) { - std::function setter = [&proto_category](bool val) { proto_category.set_hide_category(val); }; - bool_to_proto(this->default_visibility, state, setter); - } if (this->display_name_is_set) { std::function setter = [&proto_category](std::string val) { proto_category.set_name(val); }; display_name_and_name_to_proto_display_name(this->display_name, state, setter, &(this->name), &(this->name_is_set)); } + if (this->hide_category_is_set) { + std::function setter = [&proto_category](bool val) { proto_category.set_hide_category(val); }; + bool_to_proto(this->hide_category, state, setter); + } if (this->is_separator_is_set) { std::function setter = [&proto_category](bool val) { proto_category.set_is_separator(val); }; bool_to_proto(this->is_separator, state, setter); @@ -137,12 +137,12 @@ waypoint::Category Category::as_protobuf(ProtoWriterState* state) const { } void Category::parse_protobuf(waypoint::Category proto_category, ProtoReaderState* state) { - if (proto_category.hide_category() != 0) { - proto_to_bool(proto_category.hide_category(), state, &(this->default_visibility), &(this->default_visibility_is_set)); - } if (proto_category.name() != "") { proto_display_name_to_display_name_and_name(proto_category.name(), state, &(this->display_name), &(this->display_name_is_set), &(this->name), &(this->name_is_set)); } + if (proto_category.hide_category() != 0) { + proto_to_bool(proto_category.hide_category(), state, &(this->hide_category), &(this->hide_category_is_set)); + } if (proto_category.is_separator() != 0) { proto_to_bool(proto_category.is_separator(), state, &(this->is_separator), &(this->is_separator_is_set)); } diff --git a/xml_converter/src/category_gen.hpp b/xml_converter/src/category_gen.hpp index 5a04029b..5746d2d9 100644 --- a/xml_converter/src/category_gen.hpp +++ b/xml_converter/src/category_gen.hpp @@ -17,14 +17,14 @@ class XMLError; class Category : public Parseable { public: - bool default_visibility; std::string display_name; + bool hide_category; bool is_separator; UniqueId menu_id; std::string name; std::string tooltip_description; - bool default_visibility_is_set = false; bool display_name_is_set = false; + bool hide_category_is_set = false; bool is_separator_is_set = false; bool menu_id_is_set = false; bool name_is_set = false; From 42371315a909da35ef2fd7117a6a2411310bca83 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 4 Sep 2024 21:23:30 -0400 Subject: [PATCH 5/6] renamed to match new test format --- .../input/pack/xml_file.xml | 0 .../output_proto/markers.bin | 0 .../output_xml/xml_file.xml | 0 .../{default_toggle => xml_default_toggle}/testcase.yaml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename xml_converter/integration_tests/test_cases/{default_toggle => xml_default_toggle}/input/pack/xml_file.xml (100%) rename xml_converter/integration_tests/test_cases/{default_toggle => xml_default_toggle}/output_proto/markers.bin (100%) rename xml_converter/integration_tests/test_cases/{default_toggle => xml_default_toggle}/output_xml/xml_file.xml (100%) rename xml_converter/integration_tests/test_cases/{default_toggle => xml_default_toggle}/testcase.yaml (100%) diff --git a/xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_default_toggle/input/pack/xml_file.xml similarity index 100% rename from xml_converter/integration_tests/test_cases/default_toggle/input/pack/xml_file.xml rename to xml_converter/integration_tests/test_cases/xml_default_toggle/input/pack/xml_file.xml diff --git a/xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin similarity index 100% rename from xml_converter/integration_tests/test_cases/default_toggle/output_proto/markers.bin rename to xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin diff --git a/xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_default_toggle/output_xml/xml_file.xml similarity index 100% rename from xml_converter/integration_tests/test_cases/default_toggle/output_xml/xml_file.xml rename to xml_converter/integration_tests/test_cases/xml_default_toggle/output_xml/xml_file.xml diff --git a/xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_default_toggle/testcase.yaml similarity index 100% rename from xml_converter/integration_tests/test_cases/default_toggle/testcase.yaml rename to xml_converter/integration_tests/test_cases/xml_default_toggle/testcase.yaml From 5322ee722a4d5a18dd745983cd2cef3dc4a01953 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Sat, 7 Sep 2024 20:47:22 -0400 Subject: [PATCH 6/6] changed name to is_hidden --- .../doc/menu/{hide_category.md => is_hidden.md} | 4 ++-- xml_converter/proto/waypoint.proto | 2 +- xml_converter/src/category_gen.cpp | 16 ++++++++-------- xml_converter/src/category_gen.hpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename xml_converter/doc/menu/{hide_category.md => is_hidden.md} (88%) diff --git a/xml_converter/doc/menu/hide_category.md b/xml_converter/doc/menu/is_hidden.md similarity index 88% rename from xml_converter/doc/menu/hide_category.md rename to xml_converter/doc/menu/is_hidden.md index c1773fc9..a78b08d8 100644 --- a/xml_converter/doc/menu/hide_category.md +++ b/xml_converter/doc/menu/is_hidden.md @@ -1,9 +1,9 @@ --- -name: Hide Category +name: Is Hidden type: Boolean applies_to: [Category] xml_fields: [DefaultToggle] -protobuf_field: hide_category +protobuf_field: is_hidden custom_functions: read.xml: function: inverted_xml_attribute_to_bool diff --git a/xml_converter/proto/waypoint.proto b/xml_converter/proto/waypoint.proto index d81d0e9e..702e07b1 100644 --- a/xml_converter/proto/waypoint.proto +++ b/xml_converter/proto/waypoint.proto @@ -21,7 +21,7 @@ message Category { repeated Icon icon = 3; repeated Trail trail = 4; bool is_separator = 5; - bool hide_category = 6; + bool is_hidden = 6; string tip_description = 7; bytes id = 8; } diff --git a/xml_converter/src/category_gen.cpp b/xml_converter/src/category_gen.cpp index 0cf59014..90be2254 100644 --- a/xml_converter/src/category_gen.cpp +++ b/xml_converter/src/category_gen.cpp @@ -52,7 +52,7 @@ bool Category::init_xml_attribute(rapidxml::xml_attribute<>* attribute, vectordisplay_name), &(this->display_name_is_set)); } else if (attributename == "defaulttoggle") { - inverted_xml_attribute_to_bool(attribute, errors, state, &(this->hide_category), &(this->hide_category_is_set)); + inverted_xml_attribute_to_bool(attribute, errors, state, &(this->is_hidden), &(this->is_hidden_is_set)); } else if (attributename == "isseparator") { xml_attribute_to_bool(attribute, errors, state, &(this->is_separator), &(this->is_separator_is_set)); @@ -81,8 +81,8 @@ vector Category::as_xml(XMLWriterState* state) const { if (this->display_name_is_set) { xml_node_contents.push_back(string_to_xml_attribute("DisplayName", state, &this->display_name)); } - if (this->hide_category_is_set) { - xml_node_contents.push_back(bool_to_inverted_xml_attribute("DefaultToggle", state, &this->hide_category)); + if (this->is_hidden_is_set) { + xml_node_contents.push_back(bool_to_inverted_xml_attribute("DefaultToggle", state, &this->is_hidden)); } if (this->is_separator_is_set) { xml_node_contents.push_back(bool_to_xml_attribute("IsSeparator", state, &this->is_separator)); @@ -117,9 +117,9 @@ waypoint::Category Category::as_protobuf(ProtoWriterState* state) const { std::function setter = [&proto_category](std::string val) { proto_category.set_name(val); }; display_name_and_name_to_proto_display_name(this->display_name, state, setter, &(this->name), &(this->name_is_set)); } - if (this->hide_category_is_set) { - std::function setter = [&proto_category](bool val) { proto_category.set_hide_category(val); }; - bool_to_proto(this->hide_category, state, setter); + if (this->is_hidden_is_set) { + std::function setter = [&proto_category](bool val) { proto_category.set_is_hidden(val); }; + bool_to_proto(this->is_hidden, state, setter); } if (this->is_separator_is_set) { std::function setter = [&proto_category](bool val) { proto_category.set_is_separator(val); }; @@ -140,8 +140,8 @@ void Category::parse_protobuf(waypoint::Category proto_category, ProtoReaderStat if (proto_category.name() != "") { proto_display_name_to_display_name_and_name(proto_category.name(), state, &(this->display_name), &(this->display_name_is_set), &(this->name), &(this->name_is_set)); } - if (proto_category.hide_category() != 0) { - proto_to_bool(proto_category.hide_category(), state, &(this->hide_category), &(this->hide_category_is_set)); + if (proto_category.is_hidden() != 0) { + proto_to_bool(proto_category.is_hidden(), state, &(this->is_hidden), &(this->is_hidden_is_set)); } if (proto_category.is_separator() != 0) { proto_to_bool(proto_category.is_separator(), state, &(this->is_separator), &(this->is_separator_is_set)); diff --git a/xml_converter/src/category_gen.hpp b/xml_converter/src/category_gen.hpp index 5746d2d9..3bc738cf 100644 --- a/xml_converter/src/category_gen.hpp +++ b/xml_converter/src/category_gen.hpp @@ -18,13 +18,13 @@ class XMLError; class Category : public Parseable { public: std::string display_name; - bool hide_category; + bool is_hidden; bool is_separator; UniqueId menu_id; std::string name; std::string tooltip_description; bool display_name_is_set = false; - bool hide_category_is_set = false; + bool is_hidden_is_set = false; bool is_separator_is_set = false; bool menu_id_is_set = false; bool name_is_set = false;