Make structured_data_entry use consistent naming and return reference

Author: thk123

src/util/json.cpp

@@ -214,7 +214,7 @@ jsont json_node(const structured_data_entryt &entry)
   else
   {
     json_objectt result;
-    for(const auto sub_entry : entry.get_children())
+    for(const auto sub_entry : entry.children())
     {
       result[sub_entry.first.camel_case()] = json_node(sub_entry.second);
     }

src/util/structured_data.cpp

@@ -80,21 +80,21 @@ structured_data_entryt::structured_data_entryt(const jsont &data) : data(data)
 }
 structured_data_entryt::structured_data_entryt(
   std::map<labelt, structured_data_entryt> children)
-  : children(std::move(children))
+  : _children(std::move(children))
 {
 }
 bool structured_data_entryt::is_leaf() const
 {
-  return children.empty();
+  return _children.empty();
 }
 std::string structured_data_entryt::leaf_data() const
 {
   return data.value;
 }
-std::map<labelt, structured_data_entryt>
-structured_data_entryt::get_children() const
+const std::map<labelt, structured_data_entryt> &
+structured_data_entryt::children() const
 {
-  return children;
+  return _children;
 }
 jsont structured_data_entryt::leaf_object() const
 {
@@ -121,7 +121,7 @@ pretty_node(const std::pair<labelt, structured_data_entryt> &entry)
   {
     const auto indent = [](const std::string line) { return "\t" + line; };
 
-    const auto &children = data.get_children();
+    const auto &children = data.children();
     std::vector<std::vector<std::string>> lines =
       make_range(children)
         .map(pretty_node)

src/util/structured_data.h

@@ -38,15 +38,15 @@ struct structured_data_entryt
   bool is_leaf() const;
   std::string leaf_data() const;
   jsont leaf_object() const;
-  std::map<labelt, structured_data_entryt> get_children() const;
+  const std::map<labelt, structured_data_entryt> &children() const;
 
 private:
   explicit structured_data_entryt(const jsont &data);
   explicit structured_data_entryt(
     std::map<labelt, structured_data_entryt> children);
 
   jsont data;
-  std::map<labelt, structured_data_entryt> children;
+  std::map<labelt, structured_data_entryt> _children;
 };
 
 /// A way of representing nested key/value data. Used for logging on any
@@ -74,7 +74,7 @@ class structured_datat
 {
 public:
   explicit structured_datat(std::map<labelt, structured_data_entryt> data);
-  const std::map<labelt, structured_data_entryt> & data() const;
+  const std::map<labelt, structured_data_entryt> &data() const;
 
 private:
   std::map<labelt, structured_data_entryt> _data;

src/util/xml.cpp

@@ -270,7 +270,7 @@ xmlt xml_node(const std::pair<labelt, structured_data_entryt> &entry)
   }
   else
   {
-    const auto &children = data.get_children();
+    const auto &children = data.children();
     output_data.elements =
       make_range(children).map(xml_node).collect<std::list<xmlt>>();
   }