more string lowercase

apps/mwiniimporter/importer.cpp

@@ -7,6 +7,8 @@
 #include <vector>
 #include <algorithm>
 #include <sstream>
+#include <components/misc/stringops.hpp>
+
 
 MwIniImporter::MwIniImporter()
     : mVerbose(false)
@@ -793,7 +795,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, multistrmap &ini) {
 
         for(std::vector<std::string>::iterator entry = it->second.begin(); entry!=it->second.end(); ++entry) {
             std::string filetype(entry->substr(entry->length()-4, 3));
-            std::transform(filetype.begin(), filetype.end(), filetype.begin(), ::tolower);
+            Misc::StringUtils::toLower(filetype);
 
             if(filetype.compare("esm") == 0) {
                 esmFiles.push_back(*entry);

apps/opencs/model/world/idcollection.hpp

@@ -12,6 +12,7 @@
 #include <QVariant>
 
 #include "columnbase.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace CSMWorld
 {
@@ -152,10 +153,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     void IdCollection<ESXRecordT>::add (const ESXRecordT& record)
     {
-        std::string id;
+        std::string id = Misc::StringUtils::lowerCase(record.mId);
-
-        std::transform (record.mId.begin(), record.mId.end(), std::back_inserter (id),
-            (int(*)(int)) std::tolower);
 
         std::map<std::string, int>::iterator iter = mIndex.find (id);
 
@@ -281,10 +279,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     int IdCollection<ESXRecordT>::searchId (const std::string& id) const
     {
-        std::string id2;
+        std::string id2 = Misc::StringUtils::lowerCase(id);
-
-        std::transform (id.begin(), id.end(), std::back_inserter (id2),
-            (int(*)(int)) std::tolower);
 
         std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
 

apps/openmw/mwclass/container.cpp

@@ -97,11 +97,11 @@ namespace MWClass
 
         // make key id lowercase
         std::string keyId = ptr.getCellRef().mKey;
-        std::transform(keyId.begin(), keyId.end(), keyId.begin(), ::tolower);
+        Misc::StringUtils::toLower(keyId);
         for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
             std::string refId = it->getCellRef().mRefID;
-            std::transform(refId.begin(), refId.end(), refId.begin(), ::tolower);
+            Misc::StringUtils::toLower(refId);
             if (refId == keyId)
             {
                 hasKey = true;

apps/openmw/mwclass/door.cpp

@@ -84,11 +84,11 @@ namespace MWClass
 
         // make key id lowercase
         std::string keyId = ptr.getCellRef().mKey;
-        std::transform(keyId.begin(), keyId.end(), keyId.begin(), ::tolower);
+        Misc::StringUtils::toLower(keyId);
         for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
             std::string refId = it->getCellRef().mRefID;
-            std::transform(refId.begin(), refId.end(), refId.begin(), ::tolower);
+            Misc::StringUtils::toLower(refId);
             if (refId == keyId)
             {
                 hasKey = true;

apps/openmw/mwclass/npc.cpp

@@ -65,7 +65,7 @@ namespace MWClass
             if (!ref->mBase->mFaction.empty())
             {
                 std::string faction = ref->mBase->mFaction;
-                boost::algorithm::to_lower(faction);
+                Misc::StringUtils::toLower(faction);
                 if(ref->mBase->mNpdt52.mGold != -10)
                 {
                     data->mNpcStats.getFactionRanks()[faction] = (int)ref->mBase->mNpdt52.mRank;

apps/openmw/mwdialogue/filter.cpp

@@ -17,24 +17,11 @@
 
 #include "selectwrapper.hpp"
 
-namespace
-{
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-}
-
 bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 {
     // actor id
     if (!info.mActor.empty())
-        if (toLower (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
+        if ( Misc::StringUtils::lowerCase (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
             return false;
 
     bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
@@ -47,7 +34,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 
         MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
 
-        if (toLower (info.mRace)!=toLower (cellRef->mBase->mRace))
+        if (Misc::StringUtils::lowerCase (info.mRace)!= Misc::StringUtils::lowerCase (cellRef->mBase->mRace))
             return false;
     }
 
@@ -59,7 +46,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 
         MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
 
-        if (toLower (info.mClass)!=toLower (cellRef->mBase->mClass))
+        if ( Misc::StringUtils::lowerCase (info.mClass)!= Misc::StringUtils::lowerCase (cellRef->mBase->mClass))
             return false;
     }
 
@@ -70,7 +57,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
             return false;
 
         MWMechanics::NpcStats& stats = MWWorld::Class::get (mActor).getNpcStats (mActor);
-        std::map<std::string, int>::iterator iter = stats.getFactionRanks().find (toLower (info.mNpcFaction));
+        std::map<std::string, int>::iterator iter = stats.getFactionRanks().find ( Misc::StringUtils::lowerCase (info.mNpcFaction));
 
         if (iter==stats.getFactionRanks().end())
             return false;
@@ -99,7 +86,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     if (!info.mPcFaction.empty())
     {
         MWMechanics::NpcStats& stats = MWWorld::Class::get (player).getNpcStats (player);
-        std::map<std::string,int>::iterator iter = stats.getFactionRanks().find (toLower (info.mPcFaction));
+        std::map<std::string,int>::iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (info.mPcFaction));
 
         if(iter==stats.getFactionRanks().end())
             return false;
@@ -111,7 +98,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
 
     // check cell
     if (!info.mCell.empty())
-        if (toLower (player.getCell()->mCell->mName) != toLower (info.mCell))
+        if (Misc::StringUtils::lowerCase (player.getCell()->mCell->mName) != Misc::StringUtils::lowerCase (info.mCell))
             return false;
 
     return true;
@@ -242,7 +229,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
             std::string name = select.getName();
 
             for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
-                if (toLower(iter->getCellRef().mRefID) == name)
+                if (Misc::StringUtils::lowerCase(iter->getCellRef().mRefID) == name)
                     sum += iter->getRefData().getCount();
 
             return sum;
@@ -408,23 +395,23 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Id:
 
-            return select.getName()==toLower (MWWorld::Class::get (mActor).getId (mActor));
+            return select.getName()==Misc::StringUtils::lowerCase (MWWorld::Class::get (mActor).getId (mActor));
 
         case SelectWrapper::Function_Faction:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mFaction)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mFaction)==select.getName();
 
         case SelectWrapper::Function_Class:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mClass)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mClass)==select.getName();
 
         case SelectWrapper::Function_Race:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mRace)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mRace)==select.getName();
 
         case SelectWrapper::Function_Cell:
 
-            return toLower (mActor.getCell()->mCell->mName)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.getCell()->mCell->mName)==select.getName();
 
         case SelectWrapper::Function_SameGender:
 
@@ -433,8 +420,8 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_SameRace:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mRace)!=
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mRace)!=
-                toLower (player.get<ESM::NPC>()->mBase->mRace);
+                Misc::StringUtils::lowerCase (player.get<ESM::NPC>()->mBase->mRace);
 
         case SelectWrapper::Function_SameFaction:
 

apps/openmw/mwdialogue/selectwrapper.cpp

@@ -8,18 +8,10 @@
 #include <sstream>
 #include <iterator>
 
+#include <components/misc/stringops.hpp>
+
 namespace
 {
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
     template<typename T1, typename T2>
     bool selectCompareImp (char comp, T1 value1, T2 value2)
     {
@@ -307,5 +299,5 @@ bool MWDialogue::SelectWrapper::selectCompare (bool value) const
 
 std::string MWDialogue::SelectWrapper::getName() const
 {
-    return toLower (mSelect.mSelectRule.substr (5));
+    return Misc::StringUtils::lowerCase (mSelect.mSelectRule.substr (5));
 }

apps/openmw/mwgui/dialogue.cpp

@@ -37,10 +37,7 @@ namespace {
 
 std::string lower_string(const std::string& str)
 {
-        std::string lowerCase;
+        std::string lowerCase = Misc::StringUtils::lowerCase (str);
-
-        std::transform (str.begin(), str.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
 
         return lowerCase;
 }

apps/openmw/mwgui/loadingscreen.cpp

@@ -6,6 +6,7 @@
 #include <OgreCompositorChain.h>
 #include <OgreMaterial.h>
 
+
 #include <boost/algorithm/string.hpp>
 
 #include <openengine/ogre/fader.hpp>
@@ -16,6 +17,9 @@
 
 #include "../mwbase/windowmanager.hpp"
 
+#include <components/esm/records.hpp>
+
+
 namespace MWGui
 {
 
@@ -223,7 +227,7 @@ namespace MWGui
                 if (it->size() < 6)
                     continue;
                 std::string start = it->substr(0, 6);
-                boost::to_lower(start);
+                Misc::StringUtils::toLower(start);
 
                 if (start == "splash")
                     mResources->push_back (*it);

apps/openmw/mwmechanics/activespells.cpp

@@ -263,11 +263,11 @@ namespace MWMechanics
 
     bool ActiveSpells::isSpellActive(std::string id) const
     {
-        boost::algorithm::to_lower(id);
+        Misc::StringUtils::toLower(id);
         for (TContainer::iterator iter = mSpells.begin(); iter != mSpells.end(); ++iter)
         {
             std::string left = iter->first;
-            boost::algorithm::to_lower(left);
+            Misc::StringUtils::toLower(left);
 
             if (iter->first == id)
                 return true;

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -377,16 +377,6 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
     int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
     {
         MWMechanics::NpcStats npcSkill = MWWorld::Class::get(ptr).getNpcStats(ptr);
@@ -398,7 +388,7 @@ namespace MWMechanics
         MWMechanics::CreatureStats playerStats = MWWorld::Class::get(playerPtr).getCreatureStats(playerPtr);
         MWMechanics::NpcStats playerNpcStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
 
-        if (toLower(npc->mBase->mRace) == toLower(player->mBase->mRace)) x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispRaceMod")->getFloat();
+        if (Misc::StringUtils::lowerCase(npc->mBase->mRace) == Misc::StringUtils::lowerCase(player->mBase->mRace)) x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispRaceMod")->getFloat();
 
         x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispPersonalityMult")->getFloat()
             * (playerStats.getAttribute(ESM::Attribute::Personality).getModified() - MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispPersonalityBase")->getFloat());
@@ -408,21 +398,21 @@ namespace MWMechanics
         std::string npcFaction = "";
         if(!npcSkill.getFactionRanks().empty()) npcFaction = npcSkill.getFactionRanks().begin()->first;
 
-        if (playerNpcStats.getFactionRanks().find(toLower(npcFaction)) != playerNpcStats.getFactionRanks().end())
+        if (playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(npcFaction)) != playerNpcStats.getFactionRanks().end())
         {
-            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.begin();
+            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.begin();
-                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.end(); it++)
+                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.end(); it++)
             {
-                if(toLower(it->mFaction) == toLower(npcFaction)) reaction = it->mReaction;
+                if(Misc::StringUtils::lowerCase(it->mFaction) == Misc::StringUtils::lowerCase(npcFaction)) reaction = it->mReaction;
             }
-            rank = playerNpcStats.getFactionRanks().find(toLower(npcFaction))->second;
+            rank = playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(npcFaction))->second;
         }
         else if (npcFaction != "")
         {
-            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.begin();
+            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.begin();
-                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.end();it++)
+                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.end();it++)
             {
-                if(playerNpcStats.getFactionRanks().find(toLower(it->mFaction)) != playerNpcStats.getFactionRanks().end() )
+                if(playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(it->mFaction)) != playerNpcStats.getFactionRanks().end() )
                 {
                     if(it->mReaction<reaction) reaction = it->mReaction;
                 }

apps/openmw/mwmechanics/mechanicsmanagerimp.hpp

@@ -90,6 +90,7 @@ namespace MWMechanics
             
             virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
                 float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange);
+            void toLower(std::string npcFaction);
             ///< Perform a persuasion action on NPC
     };
 }

apps/openmw/mwrender/npcanimation.cpp

@@ -80,7 +80,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, MWWor
     mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find(mNpc->mHair)->mModel;
 
     mBodyPrefix = "b_n_" + mNpc->mRace;
-    std::transform(mBodyPrefix.begin(), mBodyPrefix.end(), mBodyPrefix.begin(), ::tolower);
+    Misc::StringUtils::toLower(mBodyPrefix);
 
     mInsert = node;
     assert(mInsert);

apps/openmw/mwscript/guiextensions.cpp

@@ -102,7 +102,7 @@ namespace MWScript
             virtual void execute (Interpreter::Runtime& runtime)
             {
                 std::string cell = (runtime.getStringLiteral (runtime[0].mInteger));
-                boost::algorithm::to_lower(cell);
+                Misc::StringUtils::toLower(cell);
                 runtime.pop();
 
                 // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's House as well."
@@ -115,7 +115,7 @@ namespace MWScript
                 for (; it != cells.extEnd(); ++it)
                 {
                     std::string name = it->mName;
-                    boost::algorithm::to_lower(name);
+                    Misc::StringUtils::toLower(name);
                     if (name.find(cell) != std::string::npos)
                         MWBase::Environment::get().getWindowManager()->addVisitedLocation (
                             it->mName,

apps/openmw/mwscript/statsextensions.cpp

@@ -512,7 +512,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -541,7 +541,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -574,7 +574,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -612,7 +612,7 @@ namespace MWScript
                             factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     if(factionID!="")
                     {
@@ -714,7 +714,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     runtime.push (
@@ -750,7 +750,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId, value);
@@ -785,7 +785,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId,
@@ -830,11 +830,11 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     std::string race = runtime.getStringLiteral(runtime[0].mInteger);
-                    boost::algorithm::to_lower(race);
+                    Misc::StringUtils::toLower(race);
                     runtime.pop();
 
                     std::string npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
-                    boost::algorithm::to_lower(npcRace);
+                    Misc::StringUtils::toLower(npcRace);
 
                     runtime.push (npcRace == race);
             }
@@ -878,7 +878,7 @@ namespace MWScript
                             factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     if(factionID!="")
                     {
@@ -929,7 +929,7 @@ namespace MWScript
                     if(factionID!="")
                     {
                         std::set<std::string>& expelled = MWWorld::Class::get(player).getNpcStats(player).getExpelled ();
-                        boost::algorithm::to_lower(factionID);
+                        Misc::StringUtils::toLower(factionID);
                         expelled.insert(factionID);
                     }
                 }
@@ -965,7 +965,7 @@ namespace MWScript
                     if(factionID!="")
                     {
                         std::set<std::string>& expelled = MWWorld::Class::get(player).getNpcStats(player).getExpelled ();
-                        boost::algorithm::to_lower(factionID);
+                        Misc::StringUtils::toLower(factionID);
                         expelled.erase (factionID);
                     }
                 }

apps/openmw/mwworld/cells.cpp

@@ -153,10 +153,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, Ptr::CellStore& ce
 
     if (cell.mState==Ptr::CellStore::State_Preloaded)
     {
-        std::string lowerCase;
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
 
         if (std::binary_search (cell.mIds.begin(), cell.mIds.end(), lowerCase))
         {

apps/openmw/mwworld/cellstore.cpp

@@ -56,10 +56,7 @@ namespace MWWorld
         // Get each reference in turn
         while (mCell->getNextRef (esm, ref))
         {
-            std::string lowerCase;
+            std::string lowerCase = Misc::StringUtils::lowerCase (ref.mRefID);
-
-            std::transform (ref.mRefID.begin(), ref.mRefID.end(), std::back_inserter (lowerCase),
-                (int(*)(int)) std::tolower);
 
             mIds.push_back (lowerCase);
         }
@@ -82,10 +79,7 @@ namespace MWWorld
       // Get each reference in turn
       while(mCell->getNextRef(esm, ref))
         {
-            std::string lowerCase;
+            std::string lowerCase = Misc::StringUtils::lowerCase(ref.mRefID);
-
-            std::transform (ref.mRefID.begin(), ref.mRefID.end(), std::back_inserter (lowerCase),
-                (int(*)(int)) std::tolower);
 
             int rec = store.find(ref.mRefID);
 

apps/openmw/mwworld/containerstore.cpp

@@ -37,7 +37,7 @@ namespace
 
     bool compare_string_ci(std::string str1, std::string str2)
     {
-        boost::algorithm::to_lower(str1);
+        Misc::StringUtils::toLower(str1);
         return str1 == str2;
     }
 }

apps/openmw/mwworld/weather.cpp

@@ -497,7 +497,7 @@ void WeatherManager::update(float duration)
     if (exterior)
     {
         std::string regionstr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell()->mCell->mRegion;
-        boost::algorithm::to_lower(regionstr);
+        Misc::StringUtils::toLower(regionstr);
 
         if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
         {

components/compiler/exprparser.cpp

@@ -14,6 +14,7 @@
 #include "stringparser.hpp"
 #include "extensions.hpp"
 #include "context.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -199,8 +200,8 @@ namespace Compiler
     {
         mMemberOp = false;
 
-        std::string name2 = toLower (name);
+        std::string name2 = Misc::StringUtils::lowerCase (name);
-        std::string id = toLower (mExplicit);
+        std::string id = Misc::StringUtils::lowerCase (mExplicit);
 
         char type = getContext().getMemberType (name2, id);
 
@@ -285,7 +286,7 @@ namespace Compiler
         {
             start();
 
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 

components/compiler/lineparser.cpp

@@ -8,6 +8,7 @@
 #include "locals.hpp"
 #include "generator.hpp"
 #include "extensions.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -91,13 +92,13 @@ namespace Compiler
                 return false;
             }
 
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 
             if (type!=' ')
             {
-                getErrorHandler().error ("can't re-declare local variable", loc);
+                getErrorHandler().error ("catoLowern't re-declare local variable", loc);
                 SkipParser skip (getErrorHandler(), getContext());
                 scanner.scan (skip);
                 return false;
@@ -112,7 +113,7 @@ namespace Compiler
 
         if (mState==SetState)
         {
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
             mName = name2;
 
             // local variable?
@@ -138,7 +139,7 @@ namespace Compiler
 
         if (mState==SetMemberVarState)
         {
-            mMemberName = toLower (name);
+            mMemberName = Misc::StringUtils::lowerCase (name);
             char type = getContext().getMemberType (mMemberName, mName);
 
             if (type!=' ')
@@ -205,13 +206,13 @@ namespace Compiler
         if (mState==BeginState && getContext().isId (name))
         {
             mState = PotentialExplicitState;
-            mExplicit = toLower (name);
+            mExplicit = Misc::StringUtils::lowerCase (name);
             return true;
         }
 
         if (mState==BeginState && mAllowExpression)
         {
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 

components/compiler/parser.cpp

@@ -9,6 +9,8 @@
 #include "exception.hpp"
 #include "scanner.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Compiler
 {
     // Report the error and throw an exception.
@@ -57,10 +59,7 @@ namespace Compiler
 
     std::string Parser::toLower (const std::string& name)
     {
-        std::string lowerCase;
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
 
         return lowerCase;
     }

components/compiler/scanner.cpp

@@ -11,6 +11,8 @@
 #include "parser.hpp"
 #include "extensions.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Compiler
 {
     bool Scanner::get (char& c)
@@ -268,11 +270,7 @@ namespace Compiler
 
         int i = 0;
 
-        std::string lowerCase;
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
-        lowerCase.reserve (name.size());
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
 
         for (; keywords[i]; ++i)
             if (lowerCase==keywords[i])

components/compiler/stringparser.cpp

@@ -6,6 +6,7 @@
 
 #include "scanner.hpp"
 #include "generator.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -22,7 +23,7 @@ namespace Compiler
         {
             start();
             if (mSmashCase)
-                Generator::pushString (mCode, mLiterals, toLower (name));
+                Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
             else
                 Generator::pushString (mCode, mLiterals, name);
 

components/files/filelibrary.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 
 #include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
 
 namespace Files
 {
@@ -45,14 +45,14 @@ namespace Files
             if( !acceptableExtensions.empty() )
             {
                 fileExtension = boost::filesystem::path (listIter->extension()).string();
-                boost::algorithm::to_lower(fileExtension);
+                Misc::StringUtils::toLower(fileExtension);
                 if(!containsVectorString(acceptableExtensions, fileExtension))
                     continue;
             }
 
             type = boost::filesystem::path (listIter->parent_path().leaf()).string();
             if (!strict)
-                boost::algorithm::to_lower(type);
+                Misc::StringUtils::toLower(type);
 
             mMap[type].push_back(*listIter);
             // std::cout << "Added path: " << listIter->string() << " in section "<< type <<std::endl;
@@ -63,7 +63,7 @@ namespace Files
     bool FileLibrary::containsSection(std::string sectionName, bool strict)
     {
         if (!strict)
-            boost::algorithm::to_lower(sectionName);
+            Misc::StringUtils::toLower(sectionName);
         StringPathContMap::const_iterator mapIter = mMap.find(sectionName);
         if (mapIter == mMap.end())
             return false;
@@ -75,7 +75,7 @@ namespace Files
     const PathContainer* FileLibrary::section(std::string sectionName, bool strict)
     {
         if (!strict)
-            boost::algorithm::to_lower(sectionName);
+            Misc::StringUtils::toLower(sectionName);
         StringPathContMap::const_iterator mapIter = mMap.find(sectionName);
         if (mapIter == mMap.end())
         {

components/files/fileops.cpp

@@ -4,6 +4,7 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
 
 namespace Files
 {
@@ -87,7 +88,7 @@ bool isFile(const char *name)
 
         if (!strict)
         {
-            boost::algorithm::to_lower(toFindStr);
+            Misc::StringUtils::toLower(toFindStr);
         }
 
         for (Files::PathContainer::const_iterator it = list.begin(); it != list.end(); ++it)
@@ -99,7 +100,7 @@ bool isFile(const char *name)
 
             if (!strict)
             {
-                boost::algorithm::to_lower(fullPath);
+                Misc::StringUtils::toLower(fullPath);
             }
             if(endingMatches(fullPath, toFindStr))
             {

components/nifogre/ogre_nif_loader.cpp

@@ -44,6 +44,7 @@
 #include <extern/shiny/Main/Factory.hpp>
 
 #include <components/nif/node.hpp>
+#include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
@@ -1003,7 +1004,7 @@ public:
             if(mSkelName.length() > 0 && mName != mSkelName)
                 fullname += "@skel="+mSkelName;
 
-            std::transform(fullname.begin(), fullname.end(), fullname.begin(), ::tolower);
+            Misc::StringUtils::toLower(fullname);
             Ogre::MeshPtr mesh = meshMgr.getByName(fullname);
             if(mesh.isNull())
             {
@@ -1045,8 +1046,8 @@ static MeshPairMap sMeshPairMap;
 
 MeshPairList NIFLoader::load(std::string name, std::string skelName, const std::string &group)
 {
-    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+    Misc::StringUtils::toLower(name);
-    std::transform(skelName.begin(), skelName.end(), skelName.begin(), ::tolower);
+     Misc::StringUtils::toLower(skelName);
 
     MeshPairMap::const_iterator meshiter = sMeshPairMap.find(name+"@skel="+skelName);
     if(meshiter != sMeshPairMap.end())
@@ -1159,7 +1160,7 @@ EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bo
         Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].first);
         if(ent->hasSkeleton())
         {
-            std::transform(meshes[i].second.begin(), meshes[i].second.end(), meshes[i].second.begin(), ::tolower);
+             Misc::StringUtils::toLower(meshes[i].second);
 
             if(meshes[i].second.length() < filter.length() ||
                meshes[i].second.compare(0, filter.length(), filter) != 0)

components/nifoverrides/nifoverrides.cpp

@@ -2,7 +2,8 @@
 
 #include <OgreStringConverter.h>
 
-#include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
+
 
 using namespace NifOverrides;
 
@@ -19,7 +20,7 @@ TransparencyResult Overrides::getTransparencyOverride(const std::string& texture
     result.first = false;
 
     std::string tex = texture;
-    boost::to_lower(tex);
+    Misc::StringUtils::toLower(tex);
 
     Ogre::ConfigFile::SectionIterator seci = mTransparencyOverrides.getSectionIterator();
     while (seci.hasMoreElements())