X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e3b2f1d55a07271c05db2ed5b3fec27561097f9..510c97d4c651c63ef9851a7e1d9c328f62b5b00b:/src/instr/instr_paje_types.hpp

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index 21a440a45e..0c9c66834c 100644
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -7,6 +7,7 @@
 #define INSTR_PAJE_TYPES_HPP
 
 #include "src/instr/instr_private.hpp"
+#include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -23,26 +24,26 @@ class Type {
   Type* father_;
 
 public:
-  std::map<std::string, Type*> children_;
+  std::map<std::string, std::unique_ptr<Type>> children_;
   Container* issuer_ = nullptr;
   std::stringstream stream_;
 
-  Type(std::string name, std::string alias, std::string color, Type* father);
-  virtual ~Type();
+  Type(const std::string& name, const std::string& alias, const std::string& color, Type* father);
+  virtual ~Type() = default;
 
-  std::string get_name() { return name_; }
+  const std::string& get_name() const { return name_; }
   const char* get_cname() { return name_.c_str(); }
   long long int get_id() { return id_; }
   bool is_colored() { return not color_.empty(); }
 
   Type* by_name(const std::string& name);
   LinkType* by_name_or_create(const std::string& name, Type* source, Type* dest);
-  VariableType* by_name_or_create(const std::string& name, std::string color);
+  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)
   {
     auto cont = children_.find(name);
-    return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second);
+    return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second.get());
   }
 
   void set_calling_container(Container* container) { issuer_ = container; }
@@ -60,8 +61,7 @@ public:
 class VariableType : public Type {
   std::vector<VariableEvent*> events_;
 public:
-  VariableType(const std::string& name, std::string color, Type* father);
-  ~VariableType();
+  VariableType(const std::string& name, const std::string& color, Type* father);
   void instr_event(double now, double delta, const char* resource, double value);
   void set_event(double timestamp, double value);
   void add_event(double timestamp, double value);
@@ -70,33 +70,32 @@ public:
 
 class ValueType : public Type {
 public:
-  std::map<std::string, EntityValue*> values_;
-  ValueType(std::string name, std::string alias, Type* father) : Type(std::move(name), std::move(alias), "", father){};
+  std::map<std::string, EntityValue> values_;
+  ValueType(const std::string& name, const std::string& alias, Type* father) : Type(name, alias, "", father){};
   ValueType(const std::string& name, Type* father) : Type(name, name, "", father){};
-  virtual ~ValueType();
-  void add_entity_value(const std::string& name, std::string color);
+  virtual ~ValueType() = 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);
 };
 
 class LinkType : public ValueType {
 public:
-  LinkType(std::string name, std::string alias, Type* father);
-  void start_event(Container* startContainer, std::string value, std::string key);
-  void start_event(Container* startContainer, std::string value, std::string key, int size);
-  void end_event(Container* endContainer, std::string value, std::string key);
+  LinkType(const std::string& name, const std::string& alias, Type* father);
+  void start_event(Container* startContainer, const std::string& value, const std::string& key);
+  void start_event(Container* startContainer, const std::string& value, const std::string& key, int size);
+  void end_event(Container* endContainer, const std::string& value, const std::string& key);
 };
 
 class EventType : public ValueType {
 public:
-  EventType(std::string name, Type* father);
+  EventType(const std::string& name, Type* father);
 };
 
 class StateType : public ValueType {
   std::vector<StateEvent*> events_;
 public:
-  StateType(std::string name, Type* father);
-  ~StateType();
+  StateType(const std::string& name, Type* father);
   void set_event(const std::string& value_name);
   void push_event(const std::string& value_name);
   void push_event(const std::string& value_name, TIData* extra);