Changeset 11062 for code/branches/cpp11_v3/src

Timestamp:

Jan 13, 2016, 11:13:30 PM (8 years ago)

Author:

landauf

Message:

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

Location:

code/branches/cpp11_v3/src

Files:

• libraries/core/GUIManager.cc (modified) (1 diff)
• libraries/core/module/Plugin.cc (modified) (2 diffs)
• modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)
• modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
• modules/weapons/munitions/GravityBombMunition.h (modified) (1 diff)
• modules/weapons/munitions/IceMunition.h (modified) (1 diff)
• modules/weapons/munitions/LaserMunition.h (modified) (1 diff)
• modules/weapons/munitions/LightningMunition.h (modified) (1 diff)
• modules/weapons/munitions/MineMunition.h (modified) (1 diff)
• modules/weapons/munitions/RocketMunition.h (modified) (1 diff)
• modules/weapons/munitions/SplitMunition.h (modified) (1 diff)
• orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)
• orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (7 diffs)
• orxonox/weaponsystem/Munition.h (modified) (4 diffs)
• orxonox/weaponsystem/Weapon.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponPack.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSystem.cc (modified) (3 diffs)
• orxonox/worldentities/TeamSpawnPoint.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)

code/branches/cpp11_v3/src/libraries/core/GUIManager.cc

@@ -267 +267 @@
             ArgumentCompletionList names;
             const std::vector<std::string> guis = GUIManager::getInstance().getLoadedGUIs();
-            for (size_t i = 0; i < guis.size(); ++i)
-                names.push_back(ArgumentCompletionListElement(guis[i], getLowercase(guis[i])));
+            for (const std::string gui : guis)
+                names.push_back(ArgumentCompletionListElement(gui, getLowercase(gui)));
             return names;
         }

code/branches/cpp11_v3/src/libraries/core/module/Plugin.cc

@@ -79 +79 @@
     {
         // only load module if it isn't already loaded. otherwise merely activate it.
-        if (this->moduleInstance_ == NULL)
+        if (this->moduleInstance_ == nullptr)
             this->loadModule();
         else
@@ -112 +112 @@
         Core::getInstance().unloadModule(this->moduleInstance_);
         delete this->moduleInstance_;
-        this->moduleInstance_ = NULL;
+        this->moduleInstance_ = nullptr;
     }
     void Plugin::deactivateModule()

code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h

@@ -112 +112 @@
                 { this->owner_ = owner; }
         protected:
-            virtual void positionChanged();
-            virtual void sizeChanged();
+            virtual void positionChanged() override;
+            virtual void sizeChanged() override;
         private:
             void positionText();

code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h

@@ -52 +52 @@
         public:
             FusionMunition(Context* context);
-            virtual ~FusionMunition() {}
+            virtual ~FusionMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h

@@ -27 +27 @@
         public:
             GravityBombMunition(Context* context);
-            virtual ~GravityBombMunition() {}
+            virtual ~GravityBombMunition() = default;
     };
 

code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h

@@ -52 +52 @@
         public:
             IceMunition(Context* context);
-            virtual ~IceMunition() {}
+            virtual ~IceMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h

@@ -52 +52 @@
         public:
             LaserMunition(Context* context);
-            virtual ~LaserMunition() {}
+            virtual ~LaserMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h

@@ -52 +52 @@
         public:
             LightningMunition(Context* context);
-            virtual ~LightningMunition() {}
+            virtual ~LightningMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h

@@ -52 +52 @@
         public:
             MineMunition(Context* context);
-            virtual ~MineMunition() {}
+            virtual ~MineMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h

@@ -52 +52 @@
         public:
             RocketMunition(Context* context);
-            virtual ~RocketMunition() {}
+            virtual ~RocketMunition() = default;
     };
 }

code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h

@@ -52 +52 @@
         public:
             SplitMunition(Context* context);
-            virtual ~SplitMunition() {}
+            virtual ~SplitMunition() = default;
     };
 }

code/branches/cpp11_v3/src/orxonox/gametypes/Dynamicmatch.cc

@@ -88 +88 @@
     Dynamicmatch::~Dynamicmatch()
     {
-        for (std::set<Timer*>::iterator it = this->piggyTimers_.begin(); it != this->piggyTimers_.end(); ++it)
-            delete (*it);
+        for (Timer* timer : this->piggyTimers_)
+            delete timer;
     }
 

code/branches/cpp11_v3/src/orxonox/overlays/OverlayGroup.cc

@@ -51 +51 @@
         {
             ArgumentCompletionList names;
-            for (ObjectList<OverlayGroup>::iterator it = ObjectList<OverlayGroup>().begin(); it; ++it)
-                names.push_back(ArgumentCompletionListElement(it->getName(), getLowercase(it->getName())));
+            for (OverlayGroup* overlayGroup : ObjectList<OverlayGroup>())
+                names.push_back(ArgumentCompletionListElement(overlayGroup->getName(), getLowercase(overlayGroup->getName())));
             return names;
         }

code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.cc

@@ -52 +52 @@
         this->reloadTime_ = 0.5f;
 
-        this->lastFilledWeaponMode_ = NULL;
+        this->lastFilledWeaponMode_ = nullptr;
     }
 
@@ -200 +200 @@
                     magazine->munition_ = 0;
 
-                    if (this->reload(NULL))
+                    if (this->reload(nullptr))
                         // Successfully reloaded, continue recursively
                         return this->takeMunition(amount, 0);
@@ -271 +271 @@
             if (it->first == lastFilledWeaponMode_)
             {
-                lastFilledWeaponMode_ = NULL;
+                lastFilledWeaponMode_ = nullptr;
             }            
             delete it->second;
@@ -315 +315 @@
         {
             // Stacking munition means, if a magazine gets full, the munition adds to a new magazine
-            Magazine* magazine = this->getMagazine(NULL);
+            Magazine* magazine = this->getMagazine(nullptr);
             if (magazine)
             {
@@ -347 +347 @@
             // If the pointer to the weapon mode whose magazine got munition added to is NULL, then set the iterator to the beginning of the map
             // Otherwise set it to the next weapon mode
-            if (lastFilledWeaponMode_ == NULL)
+            if (lastFilledWeaponMode_ == nullptr)
             {
                 it = this->assignedMagazines_.begin();
@@ -441 +441 @@
         for (unsigned int i = 0; i < addedMagazines; ++i)
         {
-            for (std::map<WeaponMode*, Magazine*>::iterator it = this->assignedMagazines_.begin(); it != this->assignedMagazines_.end(); ++it)
-            {
-                if (needReload(it->first))
-                {
-                    reload(it->first);
+            for (const auto& mapEntry : this->assignedMagazines_)
+            {
+                if (needReload(mapEntry.first))
+                {
+                    reload(mapEntry.first);
                     break;
                 }
@@ -523 +523 @@
             if (it->first == lastFilledWeaponMode_)
             {
-                lastFilledWeaponMode_ = NULL;
+                lastFilledWeaponMode_ = nullptr;
             }
             delete it->second;

code/branches/cpp11_v3/src/orxonox/weaponsystem/Munition.h

@@ -39 +39 @@
 namespace orxonox
 {
-    namespace MunitionDeployment
+    enum class MunitionDeployment
     {
-        enum Value
-        {
-            Separate, // Every comsuming weapon mode has its own magazine. It is possible that one weapon mode is out of ammo while another still has some.
-            Share, // All comsuming weapon modes take their munition from the same magazine. If this magazine is empty a new one is loaded.
-            Stack // There is only one magazine where all the munition is stored. Use this deployment mode for heavy weapons loke rockets, bombs, ...
-        };
-    }
+        Separate, // Every comsuming weapon mode has its own magazine. It is possible that one weapon mode is out of ammo while another still has some.
+        Share, // All comsuming weapon modes take their munition from the same magazine. If this magazine is empty a new one is loaded.
+        Stack // There is only one magazine where all the munition is stored. Use this deployment mode for heavy weapons loke rockets, bombs, ...
+    };
 
     class _OrxonoxExport Munition : public BaseObject
@@ -69 +66 @@
             virtual ~Munition();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             unsigned int getNumMunition(WeaponMode* user) const;
@@ -80 +77 @@
             inline unsigned int getMaxMunitionPerMagazine() const
                 { return this->maxMunitionPerMagazine_; }
-            inline MunitionDeployment::Value getMunitionDeployment() const
+            inline MunitionDeployment getMunitionDeployment() const
                 { return deployment_; }
 
@@ -115 +112 @@
             std::map<WeaponMode*, Magazine*> assignedMagazines_; // Maps weapon modes to magazines that are currently used.
 
-            MunitionDeployment::Value deployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes.
+            MunitionDeployment deployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes.
 
             bool bAllowMunitionRefilling_;

code/branches/cpp11_v3/src/orxonox/weaponsystem/Weapon.cc

@@ -158 +158 @@
     void Weapon::updateMunition()
     {
-        for (std::multimap<unsigned int, WeaponMode*>::iterator it = this->weaponmodes_.begin(); it != this->weaponmodes_.end(); ++it)
-            it->second->updateMunition();
+        for (const auto& mapEnty : this->weaponmodes_)
+            mapEnty.second->updateMunition();
     }
 }

code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponPack.cc

@@ -159 +159 @@
     void WeaponPack::updateMunition()
     {
-        for (std::vector<Weapon *>::const_iterator it = this->weapons_.begin(); it != this->weapons_.end(); ++it)
-            (*it)->updateMunition();
+        for (Weapon* weapon : this->weapons_)
+            weapon->updateMunition();
     }
 }

code/branches/cpp11_v3/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -312 +312 @@
         else
         {
-            return NULL;
+            return nullptr;
         }
     }
@@ -318 +318 @@
     void WeaponSystem::addMunition(Munition* munition)
     {
-        if (munition == NULL)
+        if (munition == nullptr)
         {
             return;
@@ -338 +338 @@
     void WeaponSystem::updateMunition()
     {
-        for (std::vector<WeaponPack*>::iterator it = this->weaponPacks_.begin(); it != this->weaponPacks_.end(); ++it)
-        {
-            (*it)->updateMunition();
+        for (WeaponPack* weaponPack : this->weaponPacks_)
+        {
+            weaponPack->updateMunition();
         }
     }

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

@@ -49 +49 @@
             unsigned int getTeamNumber() const
                 { return this->teamNumber_; }
-            virtual Pawn* spawn();
+            virtual Pawn* spawn() override;
 
         private:

code/branches/cpp11_v3/src/orxonox/worldentities/pawns/Pawn.cc

@@ -86 +86 @@
         this->aimPosition_ = Vector3::ZERO;
 
-        //this->explosionPartList_ = NULL;
+        //this->explosionPartList_ = nullptr;
 
         if (GameMode::isMaster())
@@ -523 +523 @@
     Munition* Pawn::getMunitionXML() const
     {
-        return NULL;
+        return nullptr;
     }
 
@@ -533 +533 @@
         }
 
-        return NULL;
+        return nullptr;
     }