From fd3223578c0a0789627a92cc63235c24e75f87c3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 8 Apr 2017 20:30:40 +0300
Subject: Remove most setters and getters from Resource class.

---
 src/resources/loaders/rescaledloader.cpp    | 4 ++--
 src/resources/loaders/subimageloader.cpp    | 4 ++--
 src/resources/loaders/subimagesetloader.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/resources/loaders')

diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index e4a9112f1..8f77103ff 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -53,7 +53,7 @@ namespace
             if (!rescaled)
             {
                 reportAlways("Rescale image failed: %s",
-                    rl->image->getIdPath().c_str());
+                    rl->image->mIdPath.c_str());
                 return nullptr;
             }
             return rescaled;
@@ -68,7 +68,7 @@ Image *Loader::getRescaled(const Image *const image,
     if (!image)
         return nullptr;
 
-    const std::string idPath = image->getIdPath() + strprintf(
+    const std::string idPath = image->mIdPath + strprintf(
         "_rescaled%dx%d", width, height);
     const RescaledLoader rl = { image, width, height };
     Image *const img = static_cast<Image *const>(
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 804e957a5..c63bf74d6 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -57,7 +57,7 @@ namespace
             if (!res)
             {
                 reportAlways("SubImage loading error: %s",
-                    rl->parent->getSource().c_str());
+                    rl->parent->mSource.c_str());
             }
             return res;
         }
@@ -75,7 +75,7 @@ Image *Loader::getSubImage(Image *const parent,
 
     const SubImageLoader rl = { parent, x, y, width, height};
 
-    const std::string str = std::string(parent->getIdPath()).append(
+    const std::string str = std::string(parent->mIdPath).append(
         ",[").append(
         toString(x)).append(
         ",").append(
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index 6ca43cb32..f721b1c2b 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -67,7 +67,7 @@ ImageSet *Loader::getSubImageSet(Image *const parent,
 
     const SubImageSetLoader rl = { parent, width, height };
     std::string str = std::string(
-        parent->getIdPath()).append(
+        parent->mIdPath).append(
         ", set[").append(toString(
         width)).append(
         "x").append(toString(
-- 
cgit v1.2.3-60-g2f50