Apply C++11 fixits

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using

1 files changed, 9 insertions, 9 deletions

diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index 1d8ff094..c22b2e1f 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -369,19 +369,19 @@ void BeingComponent::createAttribute(AttributeInfo *attributeInfo)
 
 const Attribute *BeingComponent::getAttribute(AttributeInfo *attribute) const
 {
-    AttributeMap::const_iterator ret = mAttributes.find(attribute);
+    auto ret = mAttributes.find(attribute);
     if (ret == mAttributes.end())
     {
         LOG_DEBUG("BeingComponent::getAttribute: Attribute "
                   << attribute->id << " not found! Returning 0.");
-        return 0;
+        return nullptr;
     }
     return &ret->second;
 }
 
 double BeingComponent::getAttributeBase(AttributeInfo *attribute) const
 {
-    AttributeMap::const_iterator ret = mAttributes.find(attribute);
+    auto ret = mAttributes.find(attribute);
     if (ret == mAttributes.end())
     {
         LOG_DEBUG("BeingComponent::getAttributeBase: Attribute "
@@ -394,7 +394,7 @@ double BeingComponent::getAttributeBase(AttributeInfo *attribute) const
 
 double BeingComponent::getModifiedAttribute(AttributeInfo *attribute) const
 {
-    AttributeMap::const_iterator ret = mAttributes.find(attribute);
+    auto ret = mAttributes.find(attribute);
     if (ret == mAttributes.end())
     {
         LOG_DEBUG("BeingComponent::getModifiedAttribute: Attribute "
@@ -504,14 +504,14 @@ bool BeingComponent::hasStatusEffect(int id) const
 
 unsigned BeingComponent::getStatusEffectTime(int id) const
 {
-    StatusEffects::const_iterator it = mStatus.find(id);
+    auto it = mStatus.find(id);
     if (it != mStatus.end()) return it->second.time;
     else return 0;
 }
 
 void BeingComponent::setStatusEffectTime(int id, int time)
 {
-    StatusEffects::iterator it = mStatus.find(id);
+    auto it = mStatus.find(id);
     if (it != mStatus.end()) it->second.time = time;
 }
 
@@ -543,7 +543,7 @@ void BeingComponent::update(Entity &entity)
     }
 
     // Update lifetime of effects.
-    for (AttributeMap::iterator it = mAttributes.begin();
+    for (auto it = mAttributes.begin();
          it != mAttributes.end();
          ++it)
     {
@@ -552,7 +552,7 @@ void BeingComponent::update(Entity &entity)
     }
 
     // Update and run status effects
-    StatusEffects::iterator it = mStatus.begin();
+    auto it = mStatus.begin();
     while (it != mStatus.end())
     {
         it->second.time--;
@@ -561,7 +561,7 @@ void BeingComponent::update(Entity &entity)
 
         if (it->second.time <= 0 || mAction == DEAD)
         {
-            StatusEffects::iterator removeIt = it;
+            auto removeIt = it;
             ++it; // bring this iterator to the safety of the next element
             mStatus.erase(removeIt);
         }