Don't include <xbt/functional.hpp> when it's not needed.

[simgrid.git] / src / instr / instr_paje_types.hpp

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index 7d9fa60..f4dae73 100644 (file)
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -21,25 +21,29 @@ class Type {
   std::string name_;
   std::string color_;
   Type* father_;
-
-public:
-  static xbt::signal<void(Type&, e_event_type event_type)> on_creation;
   std::map<std::string, std::unique_ptr<Type>> children_;
   Container* issuer_ = nullptr;
 
+protected:
+  Container* get_issuer() const { return issuer_; }
+
+public:
+  static xbt::signal<void(Type const&, e_event_type event_type)> on_creation;
+
   Type(e_event_type event_type, const std::string& name, const std::string& alias, const std::string& color,
        Type* father);
   virtual ~Type() = default;
 
-  long long int get_id() { return id_; }
+  long long int get_id() const { return id_; }
   const std::string& get_name() const { return name_; }
-  const char* get_cname() { return name_.c_str(); }
+  const char* get_cname() const { return name_.c_str(); }
   const std::string& get_color() const { return color_; }
   Type* get_father() const { return father_; }
-  bool is_colored() { return not color_.empty(); }
+  const std::map<std::string, std::unique_ptr<Type>>& get_children() const { return children_; }
+  bool is_colored() const { return not color_.empty(); }
 
   Type* by_name(const std::string& name);
-  LinkType* by_name_or_create(const std::string& name, Type* source, Type* dest);
+  LinkType* by_name_or_create(const std::string& name, const Type* source, const Type* dest);
   VariableType* by_name_or_create(const std::string& name, const std::string& color);
 
   template <class T> T* by_name_or_create(const std::string& name)
@@ -81,7 +85,7 @@ public:
       : Type(event_type, name, alias, "", father){};
   ValueType(e_event_type event_type, const std::string& name, Type* father)
       : Type(event_type, name, name, "", father){};
-  virtual ~ValueType() = default;
+  ~ValueType() override = default;
   void add_entity_value(const std::string& name, const std::string& color);
   void add_entity_value(const std::string& name);
   EntityValue* get_entity_value(const std::string& name);
@@ -89,8 +93,8 @@ public:
 
 class LinkType : public ValueType {
 public:
-  static xbt::signal<void(LinkType&, Type&, Type&)> on_creation;
-  LinkType(const std::string& name, Type* source, Type* dest, const std::string& alias, Type* father)
+  static xbt::signal<void(LinkType const&, Type const&, Type const&)> on_creation;
+  LinkType(const std::string& name, const Type* source, const Type* dest, const std::string& alias, Type* father)
       : ValueType(PAJE_DefineLinkType, name, alias, father)
   {
     on_creation(*this, *source, *dest);