Changeset 11018 for code/trunk

Timestamp:

Jan 2, 2016, 8:59:12 PM (9 years ago)

Author:

landauf

Message:

I think it's sufficient if Timer is a Listable. A timer is often used as a member object in other classes, so it's probably a bad idea to make it a Destroyable since it will neither be deleted with destroy() nor will it survive the lifespan of its parent even if a StrongPtr references it.

Location:

code/trunk/src

Files:

• libraries/tools/Timer.cc (modified) (4 diffs)
• libraries/tools/Timer.h (modified) (2 diffs)
• modules/pong/PongAI.cc (modified) (2 diffs)
• orxonox/worldentities/MovableEntity.cc (modified) (1 diff)

code/trunk/src/libraries/tools/Timer.cc

@@ -104 +104 @@
     {
         CommandExecutor::execute(command);
-        timer->destroy();
+        delete timer;
         delaytimers.right.erase(timer);
     }
@@ -114 +114 @@
     {
         for (boost::bimap<unsigned int, Timer*>::left_map::iterator it = delaytimers.left.begin(); it != delaytimers.left.end(); ++it)
-            it->second->destroy();
+            delete it->second;
 
         delaytimers.clear();
@@ -127 +127 @@
         if (it != delaytimers.left.end())
         {
-            it->second->destroy();
+            delete it->second;
             delaytimers.left.erase(it);
         }
@@ -210 +210 @@
 
         if (temp)
-            this->destroy();
+            delete this;
     }
 

code/trunk/src/libraries/tools/Timer.h

@@ -79 +79 @@
 #include "tools/ToolsPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"
 
@@ -102 +102 @@
         on the game time.
     */
-    class _ToolsExport Timer : public OrxonoxClass
+    class _ToolsExport Timer : public Listable
     {
         public:

code/trunk/src/modules/pong/PongAI.cc

@@ -78 +78 @@
     {
         for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
-            it->first->destroy();
+            delete it->first;
     }
 
@@ -380 +380 @@
 
         // Destroy the timer and remove it from the list
-        Timer* timer = this->reactionTimers_.front().first;
-        timer->destroy();
-
+        delete this->reactionTimers_.front().first;
         this->reactionTimers_.pop_front();
     }

code/trunk/src/orxonox/worldentities/MovableEntity.cc

@@ -61 +61 @@
         if (this->isInitialized())
             if (this->continuousResynchroTimer_)
-                this->continuousResynchroTimer_->destroy();
+                delete this->continuousResynchroTimer_;
     }