From 6afd522146046bda91155c07b08e162331ce7d8a Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Thu, 17 Feb 2022 21:15:53 +0100
Subject: [PATCH] Moved package element to common namespace

---
 src/{package_diagram => common}/model/package.cc           | 4 ++--
 src/{package_diagram => common}/model/package.h            | 2 +-
 .../generators/plantuml/package_diagram_generator.h        | 4 ++--
 src/package_diagram/model/diagram.h                        | 5 +++--
 src/package_diagram/visitor/translation_unit_context.cc    | 4 ++--
 src/package_diagram/visitor/translation_unit_context.h     | 7 ++++---
 src/package_diagram/visitor/translation_unit_visitor.cc    | 2 +-
 src/package_diagram/visitor/translation_unit_visitor.h     | 2 +-
 8 files changed, 16 insertions(+), 14 deletions(-)
 rename src/{package_diagram => common}/model/package.cc (94%)
 rename src/{package_diagram => common}/model/package.h (97%)

diff --git a/src/package_diagram/model/package.cc b/src/common/model/package.cc
similarity index 94%
rename from src/package_diagram/model/package.cc
rename to src/common/model/package.cc
index 719689ae..c000f843 100644
--- a/src/package_diagram/model/package.cc
+++ b/src/common/model/package.cc
@@ -1,5 +1,5 @@
 /**
- * src/package_diagram/model/class.h
+ * src/common/model/class.h
  *
  * Copyright (c) 2021-2022 Bartek Kryza <bkryza@gmail.com>
  *
@@ -22,7 +22,7 @@
 
 #include <sstream>
 
-namespace clanguml::package_diagram::model {
+namespace clanguml::common::model {
 package::package(const std::vector<std::string> &using_namespaces)
     : element{using_namespaces}
 {
diff --git a/src/package_diagram/model/package.h b/src/common/model/package.h
similarity index 97%
rename from src/package_diagram/model/package.h
rename to src/common/model/package.h
index dc96518d..fbab1b2c 100644
--- a/src/package_diagram/model/package.h
+++ b/src/common/model/package.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-namespace clanguml::package_diagram::model {
+namespace clanguml::common::model {
 
 class package : public common::model::element,
                 public common::model::stylable_element,
diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.h b/src/package_diagram/generators/plantuml/package_diagram_generator.h
index a29e0743..600417e2 100644
--- a/src/package_diagram/generators/plantuml/package_diagram_generator.h
+++ b/src/package_diagram/generators/plantuml/package_diagram_generator.h
@@ -18,11 +18,11 @@
 #pragma once
 
 #include "common/generators/plantuml/generator.h"
+#include "common/model/package.h"
 #include "common/model/relationship.h"
 #include "config/config.h"
 #include "cx/compilation_database.h"
 #include "package_diagram/model/diagram.h"
-#include "package_diagram/model/package.h"
 #include "package_diagram/visitor/translation_unit_visitor.h"
 #include "util/util.h"
 
@@ -48,7 +48,7 @@ using common_generator =
 
 using clanguml::common::model::relationship_t;
 using clanguml::common::model::scope_t;
-using clanguml::package_diagram::model::package;
+using clanguml::common::model::package;
 using namespace clanguml::util;
 
 class generator : public common_generator<diagram_config, diagram_model> {
diff --git a/src/package_diagram/model/diagram.h b/src/package_diagram/model/diagram.h
index fd6778ce..3f3319eb 100644
--- a/src/package_diagram/model/diagram.h
+++ b/src/package_diagram/model/diagram.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include "common/model/diagram.h"
-#include "package.h"
+#include "common/model/package.h"
 
 #include <type_safe/optional_ref.hpp>
 
@@ -28,7 +28,8 @@
 namespace clanguml::package_diagram::model {
 
 class diagram : public clanguml::common::model::diagram,
-                public clanguml::common::model::nested_trait<package> {
+                public clanguml::common::model::nested_trait<
+                    clanguml::common::model::package> {
 public:
     diagram() = default;
 
diff --git a/src/package_diagram/visitor/translation_unit_context.cc b/src/package_diagram/visitor/translation_unit_context.cc
index c95355c2..6cbd7de6 100644
--- a/src/package_diagram/visitor/translation_unit_context.cc
+++ b/src/package_diagram/visitor/translation_unit_context.cc
@@ -180,12 +180,12 @@ clanguml::package_diagram::model::diagram &translation_unit_context::diagram()
 }
 
 void translation_unit_context::set_current_package(
-    type_safe::optional_ref<model::package> p)
+    type_safe::optional_ref<common::model::package> p)
 {
     current_package_ = p;
 }
 
-type_safe::optional_ref<model::package>
+type_safe::optional_ref<common::model::package>
 translation_unit_context::get_current_package() const
 {
     return current_package_;
diff --git a/src/package_diagram/visitor/translation_unit_context.h b/src/package_diagram/visitor/translation_unit_context.h
index 10c71a4f..65522418 100644
--- a/src/package_diagram/visitor/translation_unit_context.h
+++ b/src/package_diagram/visitor/translation_unit_context.h
@@ -17,6 +17,7 @@
  */
 #pragma once
 
+#include "common/model/package.h"
 #include "config/config.h"
 #include "package_diagram/model/diagram.h"
 
@@ -75,9 +76,9 @@ public:
 
     clanguml::package_diagram::model::diagram &diagram();
 
-    void set_current_package(type_safe::optional_ref<model::package> p);
+    void set_current_package(type_safe::optional_ref<common::model::package> p);
 
-    type_safe::optional_ref<model::package> get_current_package() const;
+    type_safe::optional_ref<common::model::package> get_current_package() const;
 
 private:
     // Current visitor namespace
@@ -104,7 +105,7 @@ private:
     std::map<std::string, type_safe::object_ref<const cppast::cpp_type>>
         alias_template_index_;
 
-    type_safe::optional_ref<model::package> current_package_;
+    type_safe::optional_ref<common::model::package> current_package_;
 };
 
 }
diff --git a/src/package_diagram/visitor/translation_unit_visitor.cc b/src/package_diagram/visitor/translation_unit_visitor.cc
index 7906df1b..2e1b2bf9 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.cc
+++ b/src/package_diagram/visitor/translation_unit_visitor.cc
@@ -41,7 +41,7 @@ using clanguml::common::model::relationship;
 using clanguml::common::model::relationship_t;
 using clanguml::common::model::scope_t;
 using clanguml::package_diagram::model::diagram;
-using clanguml::package_diagram::model::package;
+using clanguml::common::model::package;
 
 namespace detail {
 scope_t cpp_access_specifier_to_scope(
diff --git a/src/package_diagram/visitor/translation_unit_visitor.h b/src/package_diagram/visitor/translation_unit_visitor.h
index ca237e9c..f290072c 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.h
+++ b/src/package_diagram/visitor/translation_unit_visitor.h
@@ -35,10 +35,10 @@
 #include <type_safe/reference.hpp>
 
 #include <common/model/enums.h>
+#include <common/model/package.h>
 #include <functional>
 #include <map>
 #include <memory>
-#include <package_diagram/model/package.h>
 #include <string>
 
 namespace clanguml::package_diagram::visitor {