summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/browserbox.cpp4
-rw-r--r--src/gui/widgets/icon.cpp4
-rw-r--r--src/gui/widgets/skilldata.cpp4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 91727babe..bb79ccb38 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -45,6 +45,8 @@
#include "resources/db/itemdb.h"
+#include "resources/loaders/imageloader.h"
+
#include "resources/resourcemanager/resourcemanager.h"
#include "utils/stringutils.h"
@@ -628,7 +630,7 @@ int BrowserBox::calcHeight()
const size_t sz = str.size();
if (sz > 2 && str.substr(sz - 1) == "~")
str = str.substr(0, sz - 1);
- Image *const img = resourceManager->getImage(str);
+ Image *const img = ImageLoader::getImage(str);
if (img)
{
img->incRef();
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index dee4ebebd..304533c3a 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -28,6 +28,8 @@
#include "resources/image.h"
+#include "resources/loaders/imageloader.h"
+
#include "resources/resourcemanager/resourcemanager.h"
#include "debug.h"
@@ -36,7 +38,7 @@ Icon::Icon(const Widget2 *const widget,
const std::string &file,
const AutoRelease autoRelease) :
Widget(widget),
- mImage(resourceManager->getImage(file)),
+ mImage(ImageLoader::getImage(file)),
mAutoRelease(autoRelease)
{
if (mImage)
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index 0360cd4bb..f412cb7a0 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -28,7 +28,7 @@
#include "resources/image.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imageloader.h"
#include "debug.h"
@@ -61,7 +61,7 @@ SkillData::~SkillData()
void SkillData::setIcon(const std::string &iconPath)
{
if (!iconPath.empty())
- icon = resourceManager->getImage(iconPath);
+ icon = ImageLoader::getImage(iconPath);
if (!icon)
{