From 8e0a9882890f264803337873bc8f40d9ffe77cd0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Jun 2015 01:32:02 +0200
Subject: [PATCH] Icon fix

---
 apps/openmw/mwgui/birth.cpp               | 1 -
 apps/openmw/mwgui/formatting.cpp          | 1 -
 apps/openmw/mwgui/hud.cpp                 | 1 -
 apps/openmw/mwgui/itemwidget.cpp          | 2 --
 apps/openmw/mwgui/quickkeysmenu.cpp       | 1 -
 apps/openmw/mwgui/spellcreationdialog.cpp | 1 -
 apps/openmw/mwgui/spellicons.cpp          | 1 -
 apps/openmw/mwgui/tooltips.cpp            | 3 +--
 apps/openmw/mwgui/widgets.cpp             | 2 --
 9 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index dd20999e0..1122a4069 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -5,7 +5,6 @@
 #include <MyGUI_Gui.h>
 
 #include <components/esm/records.hpp>
-#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 461d8e32e..6adef5eeb 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -14,7 +14,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <components/interpreter/defines.hpp>
-#include <components/misc/resourcehelpers.hpp>
 #include <components/misc/stringops.hpp>
 
 #include "../mwscript/interpretercontext.hpp"
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 43df37b6d..0fab66a25 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -9,7 +9,6 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ScrollView.h>
 
-#include <components/misc/resourcehelpers.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp
index 645a72277..75436e797 100644
--- a/apps/openmw/mwgui/itemwidget.cpp
+++ b/apps/openmw/mwgui/itemwidget.cpp
@@ -4,8 +4,6 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_TextBox.h>
 
-#include <components/misc/resourcehelpers.hpp>
-
 // correctIconPath
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index cd6e2405c..b673e5bd0 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -6,7 +6,6 @@
 #include <MyGUI_ImageBox.h>
 
 #include <components/esm/quickkeys.hpp>
-#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 86c502580..08b205ec7 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -3,7 +3,6 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_Gui.h>
 
-#include <components/misc/resourcehelpers.hpp>
 #include <components/esm/records.hpp>
 #include <components/widgets/list.hpp>
 
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index c26316626..db0453623 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -6,7 +6,6 @@
 #include <MyGUI_ImageBox.h>
 
 #include <components/esm/loadmgef.hpp>
-#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 5dd201068..526cbaabe 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -7,7 +7,6 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_ImageBox.h>
 
-#include <components/misc/resourcehelpers.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"
@@ -782,7 +781,7 @@ namespace MWGui
         std::string icon = effect->mIcon;
         int slashPos = icon.rfind('\\');
         icon.insert(slashPos+1, "b_");
-        //icon = Misc::ResourceHelpers::correctIconPath(icon);
+        icon = MWBase::Environment::get().getWindowManager()->correctIconPath(icon);
 
         widget->setUserString("ToolTipType", "Layout");
         widget->setUserString("ToolTipLayout", "MagicEffectToolTip");
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 996cc528d..1fa5d9cbf 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -7,8 +7,6 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ControllerManager.h>
 
-#include <components/misc/resourcehelpers.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"