From d0500e8124aacbe640fdea6364f3c2c0c85d0df3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 14 Jan 2014 09:47:31 +0100
Subject: [PATCH] Some unneeded includes cleanup

---
 apps/openmw/mwclass/npc.cpp                       | 2 --
 apps/openmw/mwgui/birth.cpp                       | 7 +++----
 apps/openmw/mwgui/class.cpp                       | 8 +++-----
 apps/openmw/mwgui/race.cpp                        | 7 +++----
 apps/openmw/mwmechanics/enchanting.cpp            | 3 +--
 apps/openmw/mwscript/guiextensions.cpp            | 2 --
 apps/openmw/mwscript/statsextensions.cpp          | 2 --
 apps/openmw/mwscript/transformationextensions.cpp | 5 +----
 apps/openmw/mwworld/weather.cpp                   | 1 -
 components/bsa/bsa_archive.cpp                    | 2 ++
 components/bsa/bsa_archive.hpp                    | 2 --
 components/nifogre/material.cpp                   | 2 --
 12 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 7ba5f340c..ef5665397 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -3,8 +3,6 @@
 
 #include <memory>
 
-#include <boost/algorithm/string.hpp>
-
 #include <OgreSceneNode.h>
 
 #include <components/esm/loadmgef.hpp>
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index 965606709..9c8e07f3e 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -1,6 +1,5 @@
 #include "birth.hpp"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -77,7 +76,7 @@ namespace MWGui
         size_t count = mBirthList->getItemCount();
         for (size_t i = 0; i < count; ++i)
         {
-            if (boost::iequals(*mBirthList->getItemDataAt<std::string>(i), birthId))
+            if (Misc::StringUtils::ciEqual(*mBirthList->getItemDataAt<std::string>(i), birthId))
             {
                 mBirthList->setIndexSelected(i);
                 MyGUI::Button* okButton;
@@ -112,7 +111,7 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         const std::string *birthId = mBirthList->getItemDataAt<std::string>(_index);
-        if (boost::iequals(mCurrentBirthId, *birthId))
+        if (Misc::StringUtils::ciEqual(mCurrentBirthId, *birthId))
             return;
 
         mCurrentBirthId = *birthId;
@@ -148,7 +147,7 @@ namespace MWGui
                 mBirthList->setIndexSelected(index);
                 mCurrentBirthId = it2->first;
             }
-            else if (boost::iequals(it2->first, mCurrentBirthId))
+            else if (Misc::StringUtils::ciEqual(it2->first, mCurrentBirthId))
             {
                 mBirthList->setIndexSelected(index);
             }
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 7965669f1..1e1aebd95 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -1,7 +1,5 @@
 #include "class.hpp"
 
-#include <boost/algorithm/string.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
@@ -128,7 +126,7 @@ namespace MWGui
         size_t count = mClassList->getItemCount();
         for (size_t i = 0; i < count; ++i)
         {
-            if (boost::iequals(*mClassList->getItemDataAt<std::string>(i), classId))
+            if (Misc::StringUtils::ciEqual(*mClassList->getItemDataAt<std::string>(i), classId))
             {
                 mClassList->setIndexSelected(i);
                 MyGUI::Button* okButton;
@@ -163,7 +161,7 @@ namespace MWGui
         getWidget(okButton, "OKButton");
 
         const std::string *classId = mClassList->getItemDataAt<std::string>(_index);
-        if (boost::iequals(mCurrentClassId, *classId))
+        if (Misc::StringUtils::ciEqual(mCurrentClassId, *classId))
             return;
 
         mCurrentClassId = *classId;
@@ -193,7 +191,7 @@ namespace MWGui
                 mCurrentClassId = id;
                 mClassList->setIndexSelected(index);
             }
-            else if (boost::iequals(id, mCurrentClassId))
+            else if (Misc::StringUtils::ciEqual(id, mCurrentClassId))
             {
                 mClassList->setIndexSelected(index);
             }
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 2c73226e3..299b34b51 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -1,6 +1,5 @@
 #include "race.hpp"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
@@ -140,7 +139,7 @@ namespace MWGui
         size_t count = mRaceList->getItemCount();
         for (size_t i = 0; i < count; ++i)
         {
-            if (boost::iequals(*mRaceList->getItemDataAt<std::string>(i), raceId))
+            if (Misc::StringUtils::ciEqual(*mRaceList->getItemDataAt<std::string>(i), raceId))
             {
                 mRaceList->setIndexSelected(i);
                 MyGUI::Button* okButton;
@@ -230,7 +229,7 @@ namespace MWGui
         MyGUI::Button* okButton;
         getWidget(okButton, "OKButton");
         const std::string *raceId = mRaceList->getItemDataAt<std::string>(_index);
-        if (boost::iequals(mCurrentRaceId, *raceId))
+        if (Misc::StringUtils::ciEqual(mCurrentRaceId, *raceId))
             return;
 
         mCurrentRaceId = *raceId;
@@ -320,7 +319,7 @@ namespace MWGui
                 continue;
 
             mRaceList->addItem(it->mName, it->mId);
-            if (boost::iequals(it->mId, mCurrentRaceId))
+            if (Misc::StringUtils::ciEqual(it->mId, mCurrentRaceId))
                 mRaceList->setIndexSelected(index);
             ++index;
         }
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 9ccc69f90..6c765aa41 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -6,7 +6,6 @@
 
 #include "creaturestats.hpp"
 #include "npcstats.hpp"
-#include <boost/algorithm/string.hpp>
 
 namespace MWMechanics
 {
@@ -60,7 +59,7 @@ namespace MWMechanics
         store.remove(mSoulGemPtr, 1, player);
 
         //Exception for Azura Star, new one will be added after enchanting
-        if(boost::iequals(mSoulGemPtr.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
+        if(Misc::StringUtils::ciEqual(mSoulGemPtr.get<ESM::Miscellaneous>()->mBase->mId, "Misc_SoulGem_Azura"))
             store.add("Misc_SoulGem_Azura", 1, player);
 
         if(mSelfEnchanting)
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index b5e2bd293..ab8901881 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -1,8 +1,6 @@
 
 #include "guiextensions.hpp"
 
-#include <boost/algorithm/string.hpp>
-
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index d6c2cb894..095fad7ab 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -3,8 +3,6 @@
 
 #include <cmath>
 
-#include <boost/algorithm/string.hpp>
-
 #include <components/esm/loadnpc.hpp>
 
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 81aff9958..43a0fedce 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -1,9 +1,5 @@
-#include <boost/algorithm/string.hpp>
-
-#include <OgreMath.h>
 #include <OgreSceneNode.h>
 
-#include "../mwworld/esmstore.hpp"
 #include <components/esm/loadcell.hpp>
 
 #include <components/compiler/extensions.hpp>
@@ -18,6 +14,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index c34beb3f2..b00ad15ca 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1,6 +1,5 @@
 #include "weather.hpp"
 
-#include <boost/algorithm/string.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 8f07b9e50..eb741fb10 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -23,6 +23,8 @@
 
 #include "bsa_archive.hpp"
 
+#include <boost/filesystem.hpp>
+
 #include <OgreFileSystem.h>
 #include <OgreArchive.h>
 #include <OgreArchiveFactory.h>
diff --git a/components/bsa/bsa_archive.hpp b/components/bsa/bsa_archive.hpp
index 18f7377ff..7f9ebaae1 100644
--- a/components/bsa/bsa_archive.hpp
+++ b/components/bsa/bsa_archive.hpp
@@ -22,8 +22,6 @@
  */
 
 #include <string>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
 #include <algorithm>
 
 #ifndef BSA_BSA_ARCHIVE_H
diff --git a/components/nifogre/material.cpp b/components/nifogre/material.cpp
index e2cc3712b..4dae1a93d 100644
--- a/components/nifogre/material.cpp
+++ b/components/nifogre/material.cpp
@@ -10,8 +10,6 @@
 #include <OgreMaterialManager.h>
 #include <OgreMaterial.h>
 
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/functional/hash.hpp>