From 5994a6198ac35ea149a7211213dc296ee7406f44 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 25 May 2016 20:48:35 +0300
Subject: Move imageset load function from resourcemanager into separate file.

---
 src/gui/theme.cpp              | 3 ++-
 src/gui/widgets/browserbox.cpp | 4 ++--
 src/gui/widgets/emotepage.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 638b57c28..d17f1ae85 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -38,6 +38,7 @@
 #include "resources/dye/dyepalette.h"
 
 #include "resources/loaders/imageloader.h"
+#include "resources/loaders/imagesetloader.h"
 #include "resources/loaders/subimageloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
@@ -650,7 +651,7 @@ Image *Theme::getImageFromTheme(const std::string &path)
 ImageSet *Theme::getImageSetFromTheme(const std::string &path,
                                       const int w, const int h)
 {
-    return resourceManager->getImageSet(resolveThemePath(path), w, h);
+    return Loader::getImageSet(resolveThemePath(path), w, h);
 }
 
 static int readColorType(const std::string &type)
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index ba0698b5f..97ad5ce85 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -47,7 +47,7 @@
 
 #include "resources/loaders/imageloader.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imagesetloader.h"
 
 #include "utils/stringutils.h"
 #include "utils/timer.h"
@@ -129,7 +129,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget,
         mSkin = theme->load(skin, "browserbox.xml");
     if (mInstances == 0)
     {
-        mEmotes = resourceManager->getImageSet(
+        mEmotes = Loader::getImageSet(
             "graphics/sprites/chatemotes.png", 17, 18);
     }
     mInstances ++;
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 0d186e82d..5d5a7b434 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -26,7 +26,7 @@
 
 #include "resources/imageset.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imagesetloader.h"
 
 #include "utils/delete2.h"
 
@@ -42,7 +42,7 @@ EmotePage::EmotePage(const Widget2 *const widget) :
     Widget(widget),
     MouseListener(),
     WidgetListener(),
-    mEmotes(resourceManager->getImageSet(
+    mEmotes(Loader::getImageSet(
         "graphics/sprites/chatemotes.png", emoteWidth, emoteHeight)),
     mVertexes(new ImageCollection),
     mSelectedIndex(-1)
-- 
cgit v1.2.3-60-g2f50