Fixed clang-tidy warnings

src/common/generators/mermaid/generator.cc

@@ -19,7 +19,7 @@
 
 namespace clanguml::common::generators::mermaid {
 
-std::string to_mermaid(relationship_t r, const std::string &style)
+std::string to_mermaid(relationship_t r, const std::string & /*style*/)
 {
     switch (r) {
     case relationship_t::kOwnership:

src/common/generators/mermaid/generator.h

@@ -42,7 +42,7 @@ std::string to_mermaid(relationship_t r, const std::string &style);
 std::string to_mermaid(access_t scope);
 std::string to_mermaid(message_t r);
 
-std::string indent(const unsigned level);
+std::string indent(unsigned level);
 
 std::string render_name(std::string name);
 
@@ -117,7 +117,7 @@ public:
      * @param element Element to which the note should be attached
      */
     virtual void generate_notes(
-        std::ostream &ostr, const model::element &element) const;
+        std::ostream &ostr, const model::diagram_element &element) const;
 
     /**
      * @brief Generate comment with diagram metadata
@@ -300,7 +300,7 @@ void generator<C, D>::generate_mermaid_directives(
 
 template <typename C, typename D>
 void generator<C, D>::generate_notes(
-    std::ostream &ostr, const model::element &e) const
+    std::ostream &ostr, const model::diagram_element &e) const
 {
     const auto &config = generators::generator<C, D>::config();
 

src/include_diagram/generators/mermaid/include_diagram_generator.cc

@@ -37,8 +37,6 @@ void generator::generate_relationships(
 
     LOG_DBG("Generating relationships for file {}", f.full_name(true));
 
-    namespace mermaid_common = clanguml::common::generators::mermaid;
-
     if (f.type() == common::model::source_file_t::kDirectory) {
         util::for_each(f, [this, &ostr](const auto &file) {
             generate_relationships(
@@ -96,7 +94,7 @@ void generator::generate(const source_file &f, std::ostream &ostr) const
 }
 
 void generator::generate_notes(
-    std::ostream &ostr, const common::model::source_file &element) const
+    std::ostream &ostr, const common::model::diagram_element &element) const
 {
     const auto &config =
         common_generator<diagram_config, diagram_model>::config();
@@ -133,4 +131,4 @@ void generator::generate_diagram(std::ostream &ostr) const
         generate_notes(ostr, dynamic_cast<source_file &>(*f));
     });
 }
-} // namespace clanguml::include_diagram::generators::plantuml
+} // namespace clanguml::include_diagram::generators::mermaid

src/include_diagram/generators/mermaid/include_diagram_generator.h

@@ -78,8 +78,8 @@ public:
      * @param ostr Output stream
      * @param element Element with a note
      */
-    void generate_notes(
+    void generate_notes(std::ostream &ostr,
-        std::ostream &ostr, const common::model::source_file &element) const;
+        const common::model::diagram_element &element) const override;
 
     /**
      * @brief Generate diagram element
@@ -90,7 +90,7 @@ public:
     void generate(const source_file &e, std::ostream &ostr) const;
 
 private:
-    mutable unsigned long note_id_{0UL};
+    mutable uint64_t note_id_{0UL};
 };
 
 } // namespace clanguml::include_diagram::generators::mermaid

src/package_diagram/generators/mermaid/package_diagram_generator.cc

@@ -124,7 +124,7 @@ void generator::generate_groups(std::ostream &ostr) const
 }
 
 void generator::generate_notes(
-    std::ostream &ostr, const common::model::element &element) const
+    std::ostream &ostr, const common::model::diagram_element &element) const
 {
     const auto &config =
         common_generator<diagram_config, diagram_model>::config();

src/package_diagram/generators/mermaid/package_diagram_generator.h

@@ -96,10 +96,10 @@ public:
      * @param element Element with a note
      */
     void generate_notes(std::ostream &ostr,
-        const common::model::element &element) const override;
+        const common::model::diagram_element &element) const override;
 
 private:
-    mutable unsigned long note_id_{0UL};
+    mutable uint64_t note_id_{0UL};
     mutable common::generators::nested_element_stack<common::model::package>
         together_group_stack_;
 };

src/sequence_diagram/generators/mermaid/sequence_diagram_generator.cc

@@ -27,7 +27,6 @@ using clanguml::sequence_diagram::model::message;
 using namespace clanguml::util;
 
 using clanguml::common::generators::mermaid::indent;
-using clanguml::common::generators::mermaid::render_name;
 
 std::string render_participant_name(std::string name)
 {
@@ -69,9 +68,7 @@ void generator::generate_call(const message &m, std::ostream &ostr) const
 
     if (to.value().type_name() == "method") {
         const auto &f = dynamic_cast<const model::method &>(to.value());
-        const std::string_view style = f.is_static() ? "" : "";
+        message = f.message_name(render_mode);
-        message =
-            fmt::format("{}{}{}", style, f.message_name(render_mode), style);
     }
     else if (config().combine_free_functions_into_file_participants()) {
         if (to.value().type_name() == "function") {