[Orxonox-commit 4938] r9607 - in code/branches/core6: src/libraries/core src/libraries/core/class src/libraries/tools test/core/object

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-30 21:38:52 +0100 (Sat, 30 Mar 2013)
New Revision: 9607

Modified:
   code/branches/core6/src/libraries/core/BaseObject.h
   code/branches/core6/src/libraries/core/class/OrxonoxClass.h
   code/branches/core6/src/libraries/tools/Timer.h
   code/branches/core6/test/core/object/IteratorTest.cc
Log:
no need to inherit virtually from OrxonoxClass anymore

Modified: code/branches/core6/src/libraries/core/BaseObject.h
===================================================================
--- code/branches/core6/src/libraries/core/BaseObject.h	2013-03-30 18:26:54 UTC (rev 9606)
+++ code/branches/core6/src/libraries/core/BaseObject.h	2013-03-30 20:38:52 UTC (rev 9607)
@@ -59,7 +59,7 @@
     class Level;
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
-    class _CoreExport BaseObject : virtual public OrxonoxClass
+    class _CoreExport BaseObject : public OrxonoxClass
     {
         template <class T> friend class XMLPortClassParamContainer;
 

Modified: code/branches/core6/src/libraries/core/class/OrxonoxClass.h
===================================================================
--- code/branches/core6/src/libraries/core/class/OrxonoxClass.h	2013-03-30 18:26:54 UTC (rev 9606)
+++ code/branches/core6/src/libraries/core/class/OrxonoxClass.h	2013-03-30 20:38:52 UTC (rev 9607)
@@ -49,8 +49,6 @@
 {
     /**
         @brief This is the class from which all objects of the game-logic (not the engine) are derived from.
-
-        The BaseObject and other classes are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     */
     class _CoreExport OrxonoxClass : virtual public Configurable, virtual public Destroyable
     {

Modified: code/branches/core6/src/libraries/tools/Timer.h
===================================================================
--- code/branches/core6/src/libraries/tools/Timer.h	2013-03-30 18:26:54 UTC (rev 9606)
+++ code/branches/core6/src/libraries/tools/Timer.h	2013-03-30 20:38:52 UTC (rev 9607)
@@ -101,7 +101,7 @@
         slower/faster if the game-speed is modified. See RealTimer for a timer class which doesn't depend
         on the game time.
     */
-    class _ToolsExport Timer : virtual public OrxonoxClass
+    class _ToolsExport Timer : public OrxonoxClass
     {
         public:
             Timer();

Modified: code/branches/core6/test/core/object/IteratorTest.cc
===================================================================
--- code/branches/core6/test/core/object/IteratorTest.cc	2013-03-30 18:26:54 UTC (rev 9606)
+++ code/branches/core6/test/core/object/IteratorTest.cc	2013-03-30 20:38:52 UTC (rev 9607)
@@ -10,7 +10,7 @@
 {
     namespace
     {
-        class TestInterface : public OrxonoxInterface
+        class TestInterface : virtual public OrxonoxInterface
         {
             public:
             TestInterface() { RegisterRootObject(TestInterface); }