Move image class into image directory.

28 files changed, 47 insertions, 30 deletions

diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index ffd1db347..7bc0c5357 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -70,9 +70,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/files.h"
 #include "utils/paths.h"
diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp
index 63c70acdb..06e649bf4 100644
--- a/src/gui/fonts/textchunk.cpp
+++ b/src/gui/fonts/textchunk.cpp
@@ -27,9 +27,10 @@
 
 #include "gui/fonts/font.h"
 
-#include "resources/image.h"
 #include "resources/surfaceimagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a4a6a145d..a4b704079 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -76,7 +76,7 @@
 #ifndef DYECMD
 #include "dragdrop.h"
 #else
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif
 #include "settings.h"
 
diff --git a/src/gui/models/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index 161ab6cd9..85544ca6d 100644
--- a/src/gui/models/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -21,10 +21,10 @@
 #ifndef GUI_MODELS_EXTENDEDLISTMODEL_H
 #define GUI_MODELS_EXTENDEDLISTMODEL_H
 
-#include "resources/image.h"
-
 #include "gui/models/listmodel.h"
 
+#include "resources/image/image.h"
+
 class ExtendedListModel notfinal : public ListModel
 {
     public:
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 25ba7dafe..f96a73493 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -37,9 +37,10 @@
 
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
+#include "resources/image/image.h"
+
 #include "resources/item/item.h"
 
 #include "resources/loaders/imageloader.h"
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index ad11640af..971b41295 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -28,9 +28,10 @@
 
 #include "enums/resources/imageposition.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index f3100a9cb..8381601fb 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -32,11 +32,12 @@
 #include "gui/skin.h"
 #include "gui/themeinfo.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 #include "resources/loaders/subimageloader.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index bd71e1ff9..9919a10d3 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -43,7 +43,7 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/map/map.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 007f2ce2c..5edc9384e 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -39,14 +39,14 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
 
 #include "resources/db/itemdb.h"
 
-#include "resources/loaders/imageloader.h"
+#include "resources/image/image.h"
 
+#include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 3fe272a2e..9ed506b9a 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -67,10 +67,11 @@
 
 #include "settings.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "gui/gui.h"
 #include "gui/skin.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index b0679e1d8..fce3560a6 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -74,9 +74,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int CheckBox::instances = 0;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6c939db5c..d1a7822a1 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -31,10 +31,11 @@
 
 #include "render/opengl/opengldebug.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/wallpaper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/rescaledloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 0b004cdad..2fbb1e6bc 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -37,10 +37,11 @@
 #include "input/inputactionoperators.h"
 
 #include "resources/emotesprite.h"
-#include "resources/image.h"
 
 #include "resources/db/emotedb.h"
 
+#include "resources/image/image.h"
+
 #include "resources/sprite/animatedsprite.h"
 
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 3b9bdeaf8..e9f745255 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -26,7 +26,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/gui/widgets/linepart.cpp b/src/gui/widgets/linepart.cpp
index 51cd7f878..0b778cbbb 100644
--- a/src/gui/widgets/linepart.cpp
+++ b/src/gui/widgets/linepart.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/widgets/linepart.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 75d1dc872..560102f5b 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -31,7 +31,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 6cd6b75e0..b3d43a09f 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -74,9 +74,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int RadioButton::instances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index db3de4874..065a72df8 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -77,9 +77,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 int ScrollArea::instances = 0;
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index fe720e387..5d083a30f 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -37,7 +37,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/item/shopitem.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index c39cec66e..1d787e096 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/delete2.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "render/graphics.h"
 
diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp
index 507942e1b..3b8328474 100644
--- a/src/gui/widgets/skilldata.cpp
+++ b/src/gui/widgets/skilldata.cpp
@@ -26,7 +26,7 @@
 
 #include "gui/theme.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 9b21c0bab..5d8e47d2c 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -71,9 +71,10 @@
 
 #include "utils/delete2.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "render/graphics.h"
 
 #include "render/vertexes/imagecollection.h"
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index a7568a4ca..2555ca52b 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -75,9 +75,10 @@
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 9d89dfe45..f4c6f11b6 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -92,9 +92,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagerect.h"
 
+#include "resources/image/image.h"
+
 #undef DELETE  // Win32 compatibility hack
 
 #include "debug.h"
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index a1f4c4661..036f17688 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -70,7 +70,7 @@
 #ifndef DYECMD
 #include "dragdrop.h"
 #else
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif
 #include "soundmanager.h"
 
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 7acbad13d..d0d215522 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -34,9 +34,10 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
+#include "resources/image/image.h"
+
 #include "debug.h"
 
 EmoteWindow *emoteWindow = nullptr;
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index eb075a624..76d029ec1 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -38,9 +38,10 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
-#include "resources/image.h"
 #include "resources/iteminfo.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "resources/db/itemdb.h"
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 1677169e0..3450436ef 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -38,9 +38,10 @@
 
 #include "gui/windows/setupwindow.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/map/map.h"
 #include "resources/map/metatile.h"