From 1b1a7cea1c6b81438bacc86b93cb80a78430790f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 May 2016 19:32:59 +0300 Subject: Change namespace in resources loaders from other to Loader. --- src/gui/widgets/browserbox.cpp | 2 +- src/gui/widgets/icon.cpp | 2 +- src/gui/widgets/skilldata.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index bb79ccb38..ba0698b5f 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -630,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 = ImageLoader::getImage(str); + Image *const img = Loader::getImage(str); if (img) { img->incRef(); diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 304533c3a..76d5d90b0 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -38,7 +38,7 @@ Icon::Icon(const Widget2 *const widget, const std::string &file, const AutoRelease autoRelease) : Widget(widget), - mImage(ImageLoader::getImage(file)), + mImage(Loader::getImage(file)), mAutoRelease(autoRelease) { if (mImage) diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp index f412cb7a0..507942e1b 100644 --- a/src/gui/widgets/skilldata.cpp +++ b/src/gui/widgets/skilldata.cpp @@ -61,7 +61,7 @@ SkillData::~SkillData() void SkillData::setIcon(const std::string &iconPath) { if (!iconPath.empty()) - icon = ImageLoader::getImage(iconPath); + icon = Loader::getImage(iconPath); if (!icon) { -- cgit v1.2.3-60-g2f50