From 6f3d7374985d3a915b1d52d3e97a54419d4016f7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 10 Nov 2013 23:21:26 +0100
Subject: [PATCH] Missing const, thanks to jeaye

---
 apps/openmw/mwgui/spellicons.cpp          | 2 +-
 apps/openmw/mwmechanics/creaturestats.cpp | 4 ++--
 apps/openmw/mwmechanics/creaturestats.hpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index dfbcfc2fff..aa2474fa52 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -120,7 +120,7 @@ namespace MWGui
                     MWBase::Environment::get().getWorld ()->getStore ().get<ESM::MagicEffect>().find(effectIt->mEffectID);
 
                 MagicEffectInfo effectInfo;
-                if (it->second.mName != "")
+                if (!it->second.mName.empty())
                     effectInfo.mSource = it->second.mName;
                 else
                     effectInfo.mSource = getSpellDisplayName(it->first);
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index c0450c3443..345b5a1563 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -343,9 +343,9 @@ namespace MWMechanics
         return mLastHitObject;
     }
 
-    bool CreatureStats::canUsePower(const std::string &power)
+    bool CreatureStats::canUsePower(const std::string &power) const
     {
-        std::map<std::string, MWWorld::TimeStamp>::iterator it = mUsedPowers.find(power);
+        std::map<std::string, MWWorld::TimeStamp>::const_iterator it = mUsedPowers.find(power);
         if (it == mUsedPowers.end() || it->second + 24 <= MWBase::Environment::get().getWorld()->getTimeStamp())
             return true;
         else
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 989f1d48c5..126b0685f5 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -49,7 +49,7 @@ namespace MWMechanics
     public:
         CreatureStats();
 
-        bool canUsePower (const std::string& power);
+        bool canUsePower (const std::string& power) const;
         void usePower (const std::string& power);
 
         const Stat<int> & getAttribute(int index) const;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 1cda204e59..5747c636f4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2030,7 +2030,7 @@ namespace MWWorld
         stats.setAttackingOrSpell(false);
 
         std::string selectedSpell = stats.getSpells().getSelectedSpell();
-        std::string sourceName = "";
+        std::string sourceName;
         if (!selectedSpell.empty())
         {
             const ESM::Spell* spell = getStore().get<ESM::Spell>().search(selectedSpell);