summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-07 15:41:00 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-07 15:41:00 +0300
commitf69f346518f473f4f8fb13966e5831d105d1239c (patch)
tree4c5f44aaedbeb07af2197720c43ed86d68d0605d /src/resources/loaders
parent0ea2569615fb54cfd3d0606fb9cb86aee9efea4c (diff)
downloadmanaplus-f69f346518f473f4f8fb13966e5831d105d1239c.tar.gz
manaplus-f69f346518f473f4f8fb13966e5831d105d1239c.tar.bz2
manaplus-f69f346518f473f4f8fb13966e5831d105d1239c.tar.xz
manaplus-f69f346518f473f4f8fb13966e5831d105d1239c.zip
Move image class into image directory.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/imageloader.cpp3
-rw-r--r--src/resources/loaders/imagesetloader.cpp3
-rw-r--r--src/resources/loaders/rescaledloader.cpp2
-rw-r--r--src/resources/loaders/subimageloader.cpp2
-rw-r--r--src/resources/loaders/subimagesetloader.cpp5
5 files changed, 9 insertions, 6 deletions
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index d3ab9facc..f2d0d045d 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -22,9 +22,10 @@
#include "logger.h"
-#include "resources/image.h"
#include "resources/imagehelper.h"
+#include "resources/image/image.h"
+
#include "resources/loaders/imageloader.h"
#include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index ad3868cc3..86b0263cb 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -22,9 +22,10 @@
#include "logger.h"
-#include "resources/image.h"
#include "resources/imageset.h"
+#include "resources/image/image.h"
+
#include "resources/loaders/imageloader.h"
#include "resources/loaders/imagesetloader.h"
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 95ef6dff7..8909209a4 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -22,7 +22,7 @@
#include "logger.h"
-#include "resources/image.h"
+#include "resources/image/image.h"
#include "resources/loaders/rescaledloader.h"
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 1331da245..9b0459e88 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -22,7 +22,7 @@
#include "logger.h"
-#include "resources/image.h"
+#include "resources/image/image.h"
#include "resources/loaders/subimageloader.h"
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index a8db6771a..1b271b33f 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -20,13 +20,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "resources/image.h"
#include "resources/imageset.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/image/image.h"
#include "resources/loaders/subimagesetloader.h"
+#include "resources/resourcemanager/resourcemanager.h"
+
#include "utils/stringutils.h"
#include "debug.h"