fixed a constness problem

apps/openmw/mwgui/birth.cpp

@@ -119,8 +119,8 @@ void BirthDialog::updateBirths()
 {
     birthList->removeAllItems();
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
-    
+    const ESMS::ESMStore &store = mWindowManager.getStore();
+
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator it = store.birthSigns.list.begin();
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator end = store.birthSigns.list.end();
     int index = 0;
@@ -149,7 +149,7 @@ void BirthDialog::updateSpells()
     const int lineHeight = 18;
     MyGUI::IntCoord coord(0, 0, spellArea->getWidth(), 18);
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
     const ESM::BirthSign *birth = store.birthSigns.find(currentBirthId);
 
     std::string texturePath = std::string("textures\\") + birth->texture;

apps/openmw/mwgui/class.cpp

@@ -50,7 +50,7 @@ void GenerateClassResultDialog::setClassId(const std::string &classId)
 {
     currentClassId = classId;
     classImage->setImageTexture(std::string("textures\\levelup\\") + currentClassId + ".dds");
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
     className->setCaption(store.classes.find(currentClassId)->name);
 }
 
@@ -196,8 +196,8 @@ void PickClassDialog::updateClasses()
 {
     classList->removeAllItems();
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
-    
+    const ESMS::ESMStore &store = mWindowManager.getStore();
+
     ESMS::RecListT<ESM::Class>::MapType::const_iterator it = store.classes.list.begin();
     ESMS::RecListT<ESM::Class>::MapType::const_iterator end = store.classes.list.end();
     int index = 0;
@@ -220,7 +220,7 @@ void PickClassDialog::updateStats()
 {
     if (currentClassId.empty())
         return;
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
     const ESM::Class *klass = store.classes.search(currentClassId);
     if (!klass)
         return;
@@ -767,7 +767,7 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
     {
         char theIndex = '0'+i;
         getWidget(combatSkill[i],  std::string("CombatSkill").append(1, theIndex));
-        getWidget(magicSkill[i],   std::string("MagicSkill").append(1, theIndex)); 
+        getWidget(magicSkill[i],   std::string("MagicSkill").append(1, theIndex));
         getWidget(stealthSkill[i], std::string("StealthSkill").append(1, theIndex));
     }
 
@@ -782,8 +782,8 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
             {combatSkill[6], ESM::Skill::Axe},
             {combatSkill[7], ESM::Skill::Spear},
             {combatSkill[8], ESM::Skill::Athletics}
-        },   
-        {    
+        },
+        {
             {magicSkill[0], ESM::Skill::Enchant},
             {magicSkill[1], ESM::Skill::Destruction},
             {magicSkill[2], ESM::Skill::Alteration},
@@ -793,8 +793,8 @@ SelectSkillDialog::SelectSkillDialog(WindowManager& parWindowManager)
             {magicSkill[6], ESM::Skill::Restoration},
             {magicSkill[7], ESM::Skill::Alchemy},
             {magicSkill[8], ESM::Skill::Unarmored}
-        },   
-        {    
+        },
+        {
             {stealthSkill[0], ESM::Skill::Security},
             {stealthSkill[1], ESM::Skill::Sneak},
             {stealthSkill[2], ESM::Skill::Acrobatics},

apps/openmw/mwgui/race.cpp

@@ -212,8 +212,8 @@ void RaceDialog::updateRaces()
 {
     raceList->removeAllItems();
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
-    
+    const ESMS::ESMStore &store = mWindowManager.getStore();
+
     ESMS::RecListT<ESM::Race>::MapType::const_iterator it = store.races.list.begin();
     ESMS::RecListT<ESM::Race>::MapType::const_iterator end = store.races.list.end();
     int index = 0;
@@ -246,7 +246,7 @@ void RaceDialog::updateSkills()
     const int lineHeight = 18;
     MyGUI::IntCoord coord1(0, 0, skillList->getWidth(), 18);
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
     const ESM::Race *race = store.races.find(currentRaceId);
     int count = sizeof(race->data.bonus)/sizeof(race->data.bonus[0]); // TODO: Find a portable macro for this ARRAYSIZE?
     for (int i = 0; i < count; ++i)
@@ -282,7 +282,7 @@ void RaceDialog::updateSpellPowers()
     const int lineHeight = 18;
     MyGUI::IntCoord coord(0, 0, spellPowerList->getWidth(), 18);
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
     const ESM::Race *race = store.races.find(currentRaceId);
 
     std::vector<std::string>::const_iterator it = race->powers.list.begin();

apps/openmw/mwgui/stats_window.cpp

@@ -323,7 +323,7 @@ void StatsWindow::updateSkillArea()
     if (!miscSkills.empty())
         addSkills(miscSkills, "sSkillClassMisc", "Misc Skills", coord1, coord2);
 
-    ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = mWindowManager.getStore();
 
     if (!factions.empty())
     {

apps/openmw/mwgui/widgets.cpp

@@ -278,7 +278,7 @@ void MWSpell::setSpellId(const std::string &spellId)
 
 void MWSpell::createEffectWidgets(std::vector<MyGUI::WidgetPtr> &effects, MyGUI::WidgetPtr creator, MyGUI::IntCoord &coord)
 {
-    ESMS::ESMStore &store = mWindowManager->getStore();
+    const ESMS::ESMStore &store = mWindowManager->getStore();
     const ESM::Spell *spell = store.spells.search(id);
     MYGUI_ASSERT(spell, "spell with id '" << id << "' not found");
 
@@ -298,7 +298,7 @@ void MWSpell::updateWidgets()
 {
     if (spellNameWidget && mWindowManager)
     {
-        ESMS::ESMStore &store = mWindowManager->getStore();
+        const ESMS::ESMStore &store = mWindowManager->getStore();
         const ESM::Spell *spell = store.spells.search(id);
         if (spell)
             spellNameWidget->setCaption(spell->name);
@@ -363,7 +363,7 @@ void MWSpellEffect::updateWidgets()
     if (!mWindowManager)
         return;
 
-    ESMS::ESMStore &store = mWindowManager->getStore();
+    const ESMS::ESMStore &store = mWindowManager->getStore();
     const ESM::MagicEffect *magicEffect = store.magicEffects.search(effect.effectID);
     if (textWidget)
     {

apps/openmw/mwgui/window_manager.cpp

@@ -940,7 +940,7 @@ void WindowManager::onReviewActivateDialog(int parDialog)
     };
 }
 
-ESMS::ESMStore& WindowManager::getStore()
+const ESMS::ESMStore& WindowManager::getStore() const
 {
     return environment.mWorld->getStore();
 }

apps/openmw/mwgui/window_manager.hpp

@@ -257,7 +257,7 @@ namespace MWGui
      */
     const std::string &getGameSettingString(const std::string &id, const std::string &default_);
 
-    ESMS::ESMStore& getStore();
+    const ESMS::ESMStore& getStore() const;
 
   private:
 

apps/openmw/mwworld/world.cpp

@@ -460,7 +460,7 @@ namespace MWWorld
         return *mPlayer;
     }
 
-    ESMS::ESMStore& World::getStore()
+    const ESMS::ESMStore& World::getStore() const
     {
         return mStore;
     }

apps/openmw/mwworld/world.hpp

@@ -115,7 +115,7 @@ namespace MWWorld
 
             MWWorld::Player& getPlayer();
 
-            ESMS::ESMStore& getStore();
+            const ESMS::ESMStore& getStore() const;
 
             const ScriptList& getLocalScripts() const;
             ///< Names and local variable state of all local scripts in active cells.