diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-05 20:51:14 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-05 20:51:14 +0100 |
commit | 0778a9446dc3475b887d20515165a4dc63ed0cd0 (patch) | |
tree | bbd6dc700feb72c5f5f35a204bed083080afa35a /src/core/managed | |
parent | 15dd9d1aa1e0cfe8b31364fb42985ee8d5c5fc9d (diff) |
Replaced the term "aggregation" with "composition"
Diffstat (limited to 'src/core/managed')
-rw-r--r-- | src/core/managed/Managed.cpp | 4 | ||||
-rw-r--r-- | src/core/managed/Managed.hpp | 2 | ||||
-rw-r--r-- | src/core/managed/Manager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/managed/Managed.cpp b/src/core/managed/Managed.cpp index cede819..1342fec 100644 --- a/src/core/managed/Managed.cpp +++ b/src/core/managed/Managed.cpp @@ -81,8 +81,8 @@ const RttiBase &Managed::type() const { return typeOf(*this); } bool Managed::isa(const RttiBase &t) const { return type().isa(t); } -bool Managed::aggregatedOf(const RttiBase &t) const +bool Managed::composedOf(const RttiBase &t) const { - return type().aggregatedOf(t); + return type().composedOf(t); } } diff --git a/src/core/managed/Managed.hpp b/src/core/managed/Managed.hpp index fecbfdd..f7eaa48 100644 --- a/src/core/managed/Managed.hpp +++ b/src/core/managed/Managed.hpp @@ -215,7 +215,7 @@ public: * @param true if the RttiBase registered for this particular Managed class * may contain instance of the given type. */ - bool aggregatedOf(const RttiBase &t) const; + bool composedOf(const RttiBase &t) const; }; /** diff --git a/src/core/managed/Manager.cpp b/src/core/managed/Manager.cpp index 4eaa71f..5428ea1 100644 --- a/src/core/managed/Manager.cpp +++ b/src/core/managed/Manager.cpp @@ -674,7 +674,7 @@ void Manager::exportGraphviz(const char *filename) } } } - if (et == EdgeType::NORMAL && type.aggregatedOf(typeTar)) { + if (et == EdgeType::NORMAL && type.composedOf(typeTar)) { et = EdgeType::AGGREGATE; } |