From 6c6384e5fdc21cd515ba34515a62cb2da120c857 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Fri, 23 Jun 2023 20:46:43 +0200 Subject: [PATCH] Fixed clang-tidy warnings --- src/class_diagram/model/class.cc | 2 +- src/class_diagram/model/class_element.h | 2 +- src/class_diagram/model/concept.cc | 4 ++-- src/class_diagram/model/concept.h | 2 +- src/class_diagram/model/method_parameter.h | 2 +- src/common/model/diagram_element.h | 2 +- src/common/model/diagram_filter.cc | 4 ++-- src/common/model/relationship.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/class_diagram/model/class.cc b/src/class_diagram/model/class.cc index f97726ce..dfad2f57 100644 --- a/src/class_diagram/model/class.cc +++ b/src/class_diagram/model/class.cc @@ -138,7 +138,7 @@ bool class_::template_specialization_found() const std::optional class_::doxygen_link() const { - auto type = is_struct() ? "struct" : "class"; + const auto *type = is_struct() ? "struct" : "class"; auto name = name_and_ns(); util::replace_all(name, "_", "__"); diff --git a/src/class_diagram/model/class_element.h b/src/class_diagram/model/class_element.h index b64b9068..0025a3d1 100644 --- a/src/class_diagram/model/class_element.h +++ b/src/class_diagram/model/class_element.h @@ -32,7 +32,7 @@ public: class_element( common::model::access_t scope, std::string name, std::string type); - virtual ~class_element() = default; + ~class_element() override = default; common::model::access_t access() const; std::string name() const; diff --git a/src/class_diagram/model/concept.cc b/src/class_diagram/model/concept.cc index 73a69bf0..a0d4e38b 100644 --- a/src/class_diagram/model/concept.cc +++ b/src/class_diagram/model/concept.cc @@ -70,9 +70,9 @@ std::string concept_::full_name(bool relative) const return res; } -void concept_::add_parameter(method_parameter mp) +void concept_::add_parameter(const method_parameter &mp) { - requires_parameters_.emplace_back(std::move(mp)); + requires_parameters_.emplace_back(mp); } const std::vector &concept_::requires_parameters() const diff --git a/src/class_diagram/model/concept.h b/src/class_diagram/model/concept.h index 06188279..0ee435c4 100644 --- a/src/class_diagram/model/concept.h +++ b/src/class_diagram/model/concept.h @@ -53,7 +53,7 @@ public: std::string full_name_no_ns() const override; - void add_parameter(method_parameter mp); + void add_parameter(const method_parameter &mp); const std::vector &requires_parameters() const; diff --git a/src/class_diagram/model/method_parameter.h b/src/class_diagram/model/method_parameter.h index a47ef5f8..7e3ca935 100644 --- a/src/class_diagram/model/method_parameter.h +++ b/src/class_diagram/model/method_parameter.h @@ -31,7 +31,7 @@ public: method_parameter( std::string type, std::string name, std::string default_value = {}); - virtual ~method_parameter() = default; + ~method_parameter() override = default; void set_type(const std::string &type); std::string type() const; diff --git a/src/common/model/diagram_element.h b/src/common/model/diagram_element.h index 4c9ab3f4..c8c7b89e 100644 --- a/src/common/model/diagram_element.h +++ b/src/common/model/diagram_element.h @@ -43,7 +43,7 @@ public: diagram_element(); - virtual ~diagram_element() = default; + ~diagram_element() override = default; /** * @brief Returns diagram element id. diff --git a/src/common/model/diagram_filter.cc b/src/common/model/diagram_filter.cc index 2dd4beb4..7ac1937b 100644 --- a/src/common/model/diagram_filter.cc +++ b/src/common/model/diagram_filter.cc @@ -251,8 +251,8 @@ tvl::value_t namespace_filter::match(const diagram &d, const element &e) const if (is_inclusive) return e_ns.starts_with(nsit_ns) || nsit_ns.starts_with(e_ns) || e_ns == nsit_ns; - else - return e_ns.starts_with(nsit_ns) || e_ns == nsit_ns; + + return e_ns.starts_with(nsit_ns) || e_ns == nsit_ns; } return std::get(nsit.value()) %= diff --git a/src/common/model/relationship.h b/src/common/model/relationship.h index a29ded72..7052f397 100644 --- a/src/common/model/relationship.h +++ b/src/common/model/relationship.h @@ -52,7 +52,7 @@ public: std::string multiplicity_source = "", std::string multiplicity_destination = ""); - virtual ~relationship() = default; + ~relationship() override = default; /** * Set the type of relatinoship.