Fixed clang-tidy warnings

This commit is contained in:
Bartek Kryza
2024-01-02 23:17:32 +01:00
parent eec73a79e8
commit da7870f50f
43 changed files with 188 additions and 226 deletions

View File

@@ -1454,7 +1454,7 @@ translation_unit_visitor::create_class_model(clang::CXXRecordDecl *cls)
// Here we have 2 options, either:
// - the parent is a regular C++ class/struct
// - the parent is a class template declaration/specialization
std::optional<common::model::diagram_element::id_t> id_opt;
std::optional<common::id_t> id_opt;
const auto *parent_record_decl =
clang::dyn_cast<clang::RecordDecl>(parent);
@@ -1626,15 +1626,15 @@ bool translation_unit_visitor::process_template_parameters(
}
void translation_unit_visitor::set_unique_id(
int64_t local_id, common::model::diagram_element::id_t global_id)
int64_t local_id, common::id_t global_id)
{
LOG_TRACE("Setting local element mapping {} --> {}", local_id, global_id);
local_ast_id_map_[local_id] = global_id;
}
std::optional<common::model::diagram_element::id_t>
translation_unit_visitor::get_unique_id(int64_t local_id) const
std::optional<common::id_t> translation_unit_visitor::get_unique_id(
int64_t local_id) const
{
if (local_ast_id_map_.find(local_id) == local_ast_id_map_.end())
return {};
@@ -2228,7 +2228,7 @@ translation_unit_visitor::build_template_instantiation(
std::string best_match_full_name{};
auto full_template_name = template_instantiation.full_name(false);
int best_match{};
common::model::diagram_element::id_t best_match_id{0};
common::id_t best_match_id{0};
for (const auto &[id, c] : diagram().participants()) {
const auto *participant_as_class =
@@ -2378,7 +2378,7 @@ void translation_unit_visitor::pop_message_to_diagram(
void translation_unit_visitor::finalize()
{
std::set<common::model::diagram_element::id_t> active_participants_unique;
std::set<common::id_t> active_participants_unique;
// Change all active participants AST local ids to diagram global ids
for (auto id : diagram().active_participants()) {

View File

@@ -204,8 +204,7 @@ public:
* @return Optional reference to participant diagram element
*/
template <typename T = model::participant>
common::optional_ref<T> get_participant(
const common::model::diagram_element::id_t id)
common::optional_ref<T> get_participant(const common::id_t id)
{
if (diagram().participants().find(id) == diagram().participants().end())
return {};
@@ -222,8 +221,7 @@ public:
* @return Optional reference to participant diagram element
*/
template <typename T = model::participant>
common::optional_ref<T> get_participant(
common::model::diagram_element::id_t id) const
common::optional_ref<T> get_participant(common::id_t id) const
{
if (diagram().participants().find(id) == diagram().participants().end())
return {};
@@ -241,8 +239,7 @@ public:
* @param local_id Local AST element id
* @param global_id Globa diagram element id
*/
void set_unique_id(
int64_t local_id, common::model::diagram_element::id_t global_id);
void set_unique_id(int64_t local_id, common::id_t global_id);
/**
* @brief Retrieve the global `clang-uml` entity id based on the Clang
@@ -250,8 +247,7 @@ public:
* @param local_id AST local element id
* @return Global diagram element id
*/
std::optional<common::model::diagram_element::id_t> get_unique_id(
int64_t local_id) const;
std::optional<common::id_t> get_unique_id(int64_t local_id) const;
/**
* @brief Finalize diagram model for this translation unit
@@ -531,7 +527,7 @@ private:
std::map<clang::CXXConstructExpr *, model::message>
construct_expr_message_map_;
std::map<common::model::diagram_element::id_t,
std::map<common::id_t,
std::unique_ptr<clanguml::sequence_diagram::model::class_>>
forward_declarations_;
@@ -539,7 +535,7 @@ private:
* @todo Refactor to @ref ast_id_mapper
*/
std::map</* local id from ->getID() */ int64_t,
/* global ID based on full name */ common::model::diagram_element::id_t>
/* global ID based on full name */ common::id_t>
local_ast_id_map_;
std::map<int64_t /* local anonymous struct id */,