From 7df5f30494b7da283164717dea9098c8d9dca77a Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sun, 11 Jan 2015 13:23:26 +0100 Subject: Renamed RttiBase to RttiType --- src/core/managed/Managed.cpp | 6 +++--- src/core/managed/Managed.hpp | 20 ++++++++++---------- src/core/managed/Manager.cpp | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/core/managed') diff --git a/src/core/managed/Managed.cpp b/src/core/managed/Managed.cpp index 1342fec..d9f3a86 100644 --- a/src/core/managed/Managed.cpp +++ b/src/core/managed/Managed.cpp @@ -77,11 +77,11 @@ bool Managed::unregisterEvent(EventType type, EventHandler handler, bool Managed::triggerEvent(Event &ev) { return mgr.triggerEvent(this, ev); } -const RttiBase &Managed::type() const { return typeOf(*this); } +const RttiType &Managed::type() const { return typeOf(*this); } -bool Managed::isa(const RttiBase &t) const { return type().isa(t); } +bool Managed::isa(const RttiType &t) const { return type().isa(t); } -bool Managed::composedOf(const RttiBase &t) const +bool Managed::composedOf(const RttiType &t) const { return type().composedOf(t); } diff --git a/src/core/managed/Managed.hpp b/src/core/managed/Managed.hpp index f7eaa48..8ad609f 100644 --- a/src/core/managed/Managed.hpp +++ b/src/core/managed/Managed.hpp @@ -41,7 +41,7 @@ class Rooted; template class Owned; -class RttiBase; +class RttiType; // TODO: Implement clone, getReferenced and getReferencing @@ -190,32 +190,32 @@ public: /* RTTI methods */ /** - * Returns the RttiBase instance registered for instances of the type of + * Returns the RttiType instance registered for instances of the type of * this Managed instance. * - * @return a reference to the registered RttiBase for this particular + * @return a reference to the registered RttiType for this particular * Managed class. */ - const RttiBase &type() const; + const RttiType &type() const; /** * Returns true if this Managed instance is of the type described by the - * given RttiBase instance. + * given RttiType instance. * - * @param true if the RttiBase registered for this particular Managed + * @param true if the RttiType registered for this particular Managed * class is of the given type or one of the registered parent types is of * the given type. */ - bool isa(const RttiBase &t) const; + bool isa(const RttiType &t) const; /** * Returns true if this Managed instance may contain instances of the type - * described by the given RttiBase instance. + * described by the given RttiType instance. * - * @param true if the RttiBase registered for this particular Managed class + * @param true if the RttiType registered for this particular Managed class * may contain instance of the given type. */ - bool composedOf(const RttiBase &t) const; + bool composedOf(const RttiType &t) const; }; /** diff --git a/src/core/managed/Manager.cpp b/src/core/managed/Manager.cpp index 3950ce2..c6b162b 100644 --- a/src/core/managed/Manager.cpp +++ b/src/core/managed/Manager.cpp @@ -593,7 +593,7 @@ void Manager::exportGraphviz(const char *filename) : std::vector{}; // Read type information and Node name (if available) - const RttiBase &type = objectPtr->type(); + const RttiType &type = objectPtr->type(); const std::string &typeName = type.name; std::string name = ""; if (type.isa(RttiTypes::Node)) { @@ -661,7 +661,7 @@ void Manager::exportGraphviz(const char *filename) while (edgeCount > 0) { // Get the type of the target element uintptr_t pTar = reinterpret_cast(e.first); - const RttiBase &typeTar = e.first->type(); + const RttiType &typeTar = e.first->type(); // Get some information about the edge std::string port = ""; -- cgit v1.2.3