Refactored class_mode diagram class

src/uml/class_diagram_model.cc

@@ -261,10 +261,17 @@ std::string enum_::full_name(bool relative) const
 //
 // diagram
 //
+std::string diagram::name() const { return name_; }
+
+void diagram::set_name(const std::string &name) { name_ = name; }
+
+const std::vector<class_> diagram::classes() const { return classes_; }
+
+const std::vector<enum_> diagram::enums() const { return enums_; }
 
 bool diagram::has_class(const class_ &c) const
 {
-    return std::any_of(classes.cbegin(), classes.cend(),
+    return std::any_of(classes_.cbegin(), classes_.cend(),
         [&c](const auto &cc) { return cc.full_name() == c.full_name(); });
 }
 
@@ -272,14 +279,14 @@ void diagram::add_type_alias(type_alias &&ta)
 {
     LOG_DBG("Adding global alias: {} -> {}", ta.alias, ta.underlying_type);
 
-    type_aliases[ta.alias] = std::move(ta);
+    type_aliases_[ta.alias] = std::move(ta);
 }
 
 void diagram::add_class(class_ &&c)
 {
     LOG_DBG("Adding class: {}, {}", c.name(), c.full_name());
     if (!has_class(c))
-        classes.emplace_back(std::move(c));
+        classes_.emplace_back(std::move(c));
     else
         LOG_DBG("Class {} ({}) already in the model", c.name(), c.full_name());
 }
@@ -287,9 +294,9 @@ void diagram::add_class(class_ &&c)
 void diagram::add_enum(enum_ &&e)
 {
     LOG_DBG("Adding enum: {}", e.name());
-    auto it = std::find(enums.begin(), enums.end(), e);
-    if (it == enums.end())
-        enums.emplace_back(std::move(e));
+    auto it = std::find(enums_.begin(), enums_.end(), e);
+    if (it == enums_.end())
+        enums_.emplace_back(std::move(e));
     else
         LOG_DBG("Enum {} already in the model", e.name());
 }
@@ -298,13 +305,13 @@ std::string diagram::to_alias(const std::string &full_name) const
 {
     LOG_DBG("Looking for alias for {}", full_name);
 
-    for (const auto &c : classes) {
+    for (const auto &c : classes_) {
         if (c.full_name() == full_name) {
             return c.alias();
         }
     }
 
-    for (const auto &e : enums) {
+    for (const auto &e : enums_) {
         if (e.full_name() == full_name) {
             return e.alias();
         }

src/uml/class_diagram_model.h

@@ -219,11 +219,15 @@ private:
     std::vector<std::string> constants_;
 };
 
-struct diagram {
-    std::string name;
-    std::vector<class_> classes;
-    std::vector<enum_> enums;
-    std::map<std::string, type_alias> type_aliases;
+class diagram {
+public:
+    std::string name() const;
+
+    void set_name(const std::string& name);
+
+    const std::vector<class_> classes() const;
+
+    const std::vector<enum_> enums() const;
 
     bool has_class(const class_ &c) const;
 
@@ -234,6 +238,12 @@ struct diagram {
     void add_enum(enum_ &&e);
 
     std::string to_alias(const std::string &full_name) const;
+
+private:
+    std::string name_;
+    std::vector<class_> classes_;
+    std::vector<enum_> enums_;
+    std::map<std::string, type_alias> type_aliases_;
 };
 }
 }