Changeset 2506 for code/branches/presentation/src/orxonox

Timestamp:

Dec 17, 2008, 6:18:41 PM (16 years ago)

Author:

rgrieder

Message:

Changed all C-Style casts with C++ casts that I was able to find with a regex.

Location:

code/branches/presentation/src/orxonox

Files:

• objects/controllers/ArtificialController.cc (modified) (1 diff)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)
• tools/Timer.h (modified) (2 diffs)

code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.cc

@@ -88 +88 @@
         {
 //            if (it->getTeamNr() != this->getTeamNr())
-            if ((ControllableEntity*)(*it) != this->getControllableEntity())
+            if (static_cast<ControllableEntity*>(*it) != this->getControllableEntity())
             {
                 float speed = this->getControllableEntity()->getVelocity().length();

code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -87 +87 @@
 
             inline const WorldEntity* getWorldEntity() const
-                { return (WorldEntity*)this; }
+                { return const_cast<Pawn*>(this); }
 
             inline void setSpawnParticleSource(const std::string& source)

code/branches/presentation/src/orxonox/tools/Timer.h

@@ -160 +160 @@
                 this->bLoop_ = bLoop;
                 executor->setObject(object);
-                this->executor_ = (Executor*)executor;
+                this->executor_ = static_cast<Executor*>(executor);
                 this->bActive_ = true;
 
@@ -198 +198 @@
                 this->setInterval(interval);
                 this->bLoop_ = bLoop;
-                this->executor_ = (Executor*)executor;
+                this->executor_ = static_cast<Executor*>(executor);
                 this->bActive_ = true;