Changeset 11065 for code/branches/cpp11_v3/src/orxonox/worldentities

Timestamp:

Jan 17, 2016, 1:59:00 PM (9 years ago)

Author:

landauf

Message:

added c++11 features to code that was added in presentationHS15

Location:

code/branches/cpp11_v3/src/orxonox/worldentities

Files:

• Actionpoint.h (modified) (1 diff)
• ExplosionPart.cc (modified) (1 diff)
• ExplosionPart.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/worldentities/Actionpoint.h

@@ -92 +92 @@
         public:
             Actionpoint(Context* context);
-            virtual ~Actionpoint() {}
+            virtual ~Actionpoint() = default;
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             /** @brief Decides what AI will do. @param val action to execute */

code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.cc

@@ -47 +47 @@
         this->effect2_ = "";
         this->model_= new Model(this->getContext());
-        this->effect1Particle_= NULL;
-        this->effect2Particle_= NULL;
+        this->effect1Particle_= nullptr;
+        this->effect2Particle_= nullptr;
         this->explosionEntity_ = new MovableEntity(this->getContext());
         this->posOffset_ = Vector3::ZERO;

code/branches/cpp11_v3/src/orxonox/worldentities/ExplosionPart.h

@@ -51 +51 @@
             ExplosionPart(Context* context);
             ~ExplosionPart();
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+
             void Explode();
             void stop();