From 1b1a7cea1c6b81438bacc86b93cb80a78430790f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 25 May 2016 19:32:59 +0300
Subject: Change namespace in resources loaders from other to Loader.

---
 src/gui/models/langlistmodel.h     | 2 +-
 src/gui/popups/itempopup.cpp       | 2 +-
 src/gui/theme.cpp                  | 2 +-
 src/gui/widgets/browserbox.cpp     | 2 +-
 src/gui/widgets/icon.cpp           | 2 +-
 src/gui/widgets/skilldata.cpp      | 2 +-
 src/gui/windows/mailviewwindow.cpp | 2 +-
 src/gui/windows/minimap.cpp        | 2 +-
 src/gui/windows/npcdialog.cpp      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h
index e38c84a74..1c7ee99dd 100644
--- a/src/gui/models/langlistmodel.h
+++ b/src/gui/models/langlistmodel.h
@@ -95,7 +95,7 @@ class LangListModel final : public ExtendedListModel
                 const std::string icon = LANG_NAME[f].icon;
                 if (!icon.empty())
                 {
-                    mIcons[f] = ImageLoader::getImage("graphics/flags/"
+                    mIcons[f] = Loader::getImage("graphics/flags/"
                         + icon);
                 }
                 else
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 9ea7b2d9a..25ba7dafe 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -179,7 +179,7 @@ void ItemPopup::setItem(const ItemInfo &item,
 
     if (showImage)
     {
-        Image *const image = ImageLoader::getImage(combineDye2(
+        Image *const image = Loader::getImage(combineDye2(
             paths.getStringValue("itemIcons").append(item.getDisplay().image),
             item.getDyeIconColorsString(color)));
 
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 796c27216..638b57c28 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -644,7 +644,7 @@ std::string Theme::resolveThemePath(const std::string &path)
 
 Image *Theme::getImageFromTheme(const std::string &path)
 {
-    return ImageLoader::getImage(resolveThemePath(path));
+    return Loader::getImage(resolveThemePath(path));
 }
 
 ImageSet *Theme::getImageSetFromTheme(const std::string &path,
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)
     {
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index 586703937..eb075a624 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -110,7 +110,7 @@ MailViewWindow::MailViewWindow(const MailMessage *const message) :
     {
         const ItemInfo &item = ItemDB::get(message->itemId);
         // +++ need use message->cards and ItemColorManager for colors
-        Image *const image = ImageLoader::getImage(combineDye2(
+        Image *const image = Loader::getImage(combineDye2(
             paths.getStringValue("itemIcons").append(
             item.getDisplay().image),
             item.getDyeIconColorsString(ItemColor_one)));
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 746b452fe..1677169e0 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -187,7 +187,7 @@ void Minimap::setMap(const Map *const map)
             }
 
             if (!minimapName.empty())
-                mMapImage = ImageLoader::getImage(minimapName);
+                mMapImage = Loader::getImage(minimapName);
             else
                 mMapImage = nullptr;
             mCustomMapImage = false;
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 92a57da43..b4323feb6 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -730,7 +730,7 @@ void NpcDialog::parseListItems(const std::string &itemString)
         else
         {
             mItems.push_back(tmp.substr(pos + 1));
-            Image *const img = ImageLoader::getImage(std::string(
+            Image *const img = Loader::getImage(std::string(
                 path).append(tmp.substr(0, pos)).append(".png"));
             mImages.push_back(img);
         }
-- 
cgit v1.2.3-60-g2f50