From cb74864d0d7fff8089582d109c7cf85701c41b15 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Wed, 5 Apr 2023 20:31:00 +0200 Subject: [PATCH] Removed dead code --- src/class_diagram/model/class.cc | 13 +------------ src/class_diagram/model/class.h | 15 --------------- src/class_diagram/model/class_member.cc | 7 ------- src/class_diagram/model/class_member.h | 3 --- src/common/model/element.cc | 5 ----- src/common/model/element.h | 2 -- src/common/model/source_file.h | 8 -------- src/common/model/template_trait.cc | 2 +- src/common/model/template_trait.h | 2 +- .../visitor/translation_unit_visitor.cc | 2 +- 10 files changed, 4 insertions(+), 55 deletions(-) diff --git a/src/class_diagram/model/class.cc b/src/class_diagram/model/class.cc index 754741e3..b97e702d 100644 --- a/src/class_diagram/model/class.cc +++ b/src/class_diagram/model/class.cc @@ -37,16 +37,6 @@ bool class_::is_template() const { return is_template_; } void class_::is_template(bool is_template) { is_template_ = is_template; } -bool class_::is_template_instantiation() const -{ - return is_template_instantiation_; -} - -void class_::is_template_instantiation(bool is_template_instantiation) -{ - is_template_instantiation_ = is_template_instantiation; -} - void class_::add_member(class_member &&member) { members_.emplace_back(std::move(member)); @@ -133,7 +123,6 @@ int class_::calculate_template_specialization_match( return res; } - return template_trait::calculate_template_specialization_match( - other, full_name); + return template_trait::calculate_template_specialization_match(other); } } // namespace clanguml::class_diagram::model diff --git a/src/class_diagram/model/class.h b/src/class_diagram/model/class.h index 97b55e19..e9498a94 100644 --- a/src/class_diagram/model/class.h +++ b/src/class_diagram/model/class.h @@ -51,12 +51,6 @@ public: bool is_template() const; void is_template(bool is_template); - bool is_template_instantiation() const; - void is_template_instantiation(bool is_template_instantiation); - - bool is_alias() const { return is_alias_; } - void is_alias(bool alias) { is_alias_ = alias; } - bool is_union() const { return is_union_; } void is_union(bool u) { is_union_ = u; } @@ -68,9 +62,6 @@ public: const std::vector &methods() const; const std::vector &parents() const; - void set_base_template(const std::string &full_name); - std::string base_template() const; - friend bool operator==(const class_ &l, const class_ &r); std::string full_name(bool relative = true) const override; @@ -79,18 +70,12 @@ public: bool is_abstract() const; - void find_relationships( - std::vector> - &nested_relationships); - int calculate_template_specialization_match( const class_ &other, const std::string &full_name) const; private: bool is_struct_{false}; bool is_template_{false}; - bool is_template_instantiation_{false}; - bool is_alias_{false}; bool is_union_{false}; std::vector members_; std::vector methods_; diff --git a/src/class_diagram/model/class_member.cc b/src/class_diagram/model/class_member.cc index 4bf7a4c6..10b384c8 100644 --- a/src/class_diagram/model/class_member.cc +++ b/src/class_diagram/model/class_member.cc @@ -26,13 +26,6 @@ class_member::class_member(common::model::access_t access, { } -bool class_member::is_relationship() const { return is_relationship_; } - -void class_member::is_relationship(bool is_relationship) -{ - is_relationship_ = is_relationship; -} - bool class_member::is_static() const { return is_static_; } void class_member::is_static(bool is_static) { is_static_ = is_static; } diff --git a/src/class_diagram/model/class_member.h b/src/class_diagram/model/class_member.h index 4a0a80cb..74cf1227 100644 --- a/src/class_diagram/model/class_member.h +++ b/src/class_diagram/model/class_member.h @@ -30,9 +30,6 @@ public: ~class_member() override = default; - bool is_relationship() const; - void is_relationship(bool is_relationship); - bool is_static() const; void is_static(bool is_static); diff --git a/src/common/model/element.cc b/src/common/model/element.cc index 57a0994c..456c2437 100644 --- a/src/common/model/element.cc +++ b/src/common/model/element.cc @@ -30,11 +30,6 @@ element::element(namespace_ using_namespace) { } -void element::set_using_namespaces(const namespace_ &un) -{ - using_namespace_ = un; -} - const namespace_ &element::using_namespace() const { return using_namespace_; } inja::json element::context() const diff --git a/src/common/model/element.h b/src/common/model/element.h index dad91ec1..9d95f979 100644 --- a/src/common/model/element.h +++ b/src/common/model/element.h @@ -62,8 +62,6 @@ public: virtual std::string full_name_no_ns() const { return name(); } - void set_using_namespaces(const namespace_ &un); - const namespace_ &using_namespace() const; friend bool operator==(const element &l, const element &r); diff --git a/src/common/model/source_file.h b/src/common/model/source_file.h index 8c860504..4b802d05 100644 --- a/src/common/model/source_file.h +++ b/src/common/model/source_file.h @@ -96,14 +96,6 @@ public: auto full_path() const { return path() | name(); } - void add_file(std::unique_ptr &&f) - { - LOG_DBG("Adding source file: {}, {}", f->name(), f->full_name(true)); - - const auto path = f->path(); - add_element(path, std::move(f)); - } - std::filesystem::path fs_path(const std::filesystem::path &base = {}) const { std::filesystem::path res; diff --git a/src/common/model/template_trait.cc b/src/common/model/template_trait.cc index 626ff5f2..63f8931d 100644 --- a/src/common/model/template_trait.cc +++ b/src/common/model/template_trait.cc @@ -64,7 +64,7 @@ const std::vector &template_trait::templates() const } int template_trait::calculate_template_specialization_match( - const template_trait &other, const std::string & /*full_name*/) const + const template_trait &other) const { int res{0}; diff --git a/src/common/model/template_trait.h b/src/common/model/template_trait.h index 9adc5315..e0904e0d 100644 --- a/src/common/model/template_trait.h +++ b/src/common/model/template_trait.h @@ -39,7 +39,7 @@ public: const std::vector &templates() const; int calculate_template_specialization_match( - const template_trait &other, const std::string &full_name) const; + const template_trait &other) const; bool is_implicit() const; diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc index c2b9f11a..f8ea54f5 100644 --- a/src/sequence_diagram/visitor/translation_unit_visitor.cc +++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc @@ -2010,7 +2010,7 @@ translation_unit_visitor::build_template_instantiation( auto c_full_name = participant_as_class->full_name(false); auto match = participant_as_class->calculate_template_specialization_match( - template_instantiation, template_instantiation.name_and_ns()); + template_instantiation); if (match > best_match) { best_match = match;