diff options
Diffstat (limited to 'src/resources')
21 files changed, 47 insertions, 36 deletions
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 3decec879..6c8e22893 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -27,7 +27,8 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp index 8f0bfba0b..bc67ad747 100644 --- a/src/resources/animation/simpleanimation.cpp +++ b/src/resources/animation/simpleanimation.cpp @@ -27,12 +27,13 @@ #include "render/graphics.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/delete2.h" #include "debug.h" diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 03d0b40fd..7a375b243 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -35,7 +35,6 @@ #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/atlas/atlasitem.h" @@ -44,6 +43,8 @@ #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" AtlasManager::AtlasManager() diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 48561bbbc..5f2e24160 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -22,12 +22,12 @@ #include "resources/atlas/atlasresource.h" -#include "resources/resourcemanager.h" - #include "resources/atlas/atlasitem.h" #include "resources/atlas/atlasmanager.h" #include "resources/atlas/textureatlas.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" AtlasResource::~AtlasResource() diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index cda902697..9bf8bbeb0 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -25,13 +25,14 @@ #include "logger.h" #include "graphicsmanager.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/db/palettedb.h" #include "resources/dye/dyepalette.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/physfstools.h" #include "utils/xml.h" diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c4bbf0a3c..26322aed9 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -22,17 +22,18 @@ #include "resources/image.h" -#include "resources/resourcemanager.h" - #include "logger.h" #ifdef USE_OPENGL #include "resources/openglimagehelper.h" #endif // USE_OPENGL + #include "resources/memorymanager.h" #include "resources/sdlimagehelper.h" #include "resources/subimage.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #ifdef USE_SDL2 diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp index f6d0af1d9..d62d9aaf1 100644 --- a/src/resources/item/item.cpp +++ b/src/resources/item/item.cpp @@ -29,7 +29,8 @@ #include "gui/theme.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "net/serverfeatures.h" diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index ee4e0dc59..7fde6a005 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -46,13 +46,14 @@ #include "particle/particle.h" #include "resources/ambientlayer.h" -#include "resources/resourcemanager.h" #include "resources/subimage.h" #include "resources/map/location.h" #include "resources/map/mapobjectlist.h" #include "resources/map/tileanimation.h" +#include "resources/resourcemanager/resourcemanager.h" + #ifdef USE_OPENGL #include "render/renderers.h" #endif diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 2968123a9..58a105ab9 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -28,7 +28,8 @@ #include "gui/fonts/font.h" #include "resources/image.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "render/graphics.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index b5cad0661..979153c87 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -38,8 +38,6 @@ #include "resources/beingcommon.h" #include "resources/image.h" -#include "resources/resourcemanager.h" - #include "resources/animation/animation.h" #ifdef USE_OPENGL @@ -48,6 +46,8 @@ #include "resources/map/tileanimation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/base64.h" #include "utils/delete2.h" #include "utils/physfstools.h" diff --git a/src/resources/memorymanager.cpp b/src/resources/memorymanager.cpp index 11fd40f4e..33d6f442e 100644 --- a/src/resources/memorymanager.cpp +++ b/src/resources/memorymanager.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 959298290..391e0ce1b 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -24,7 +24,7 @@ #include "logger.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 8057acfba..c59b09618 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index eeda43b33..2c2caabce 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_RESOURCEMANAGER_H -#define RESOURCES_RESOURCEMANAGER_H +#ifndef RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H +#define RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H #include "resources/memorycounter.h" @@ -274,4 +274,4 @@ class ResourceManager final : public MemoryCounter extern ResourceManager *resourceManager; -#endif // RESOURCES_RESOURCEMANAGER_H +#endif // RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 9cca68e21..9bd66c3e4 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -24,16 +24,16 @@ #include "resources/sdl2imagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" -#include "resources/dye/dyepalette.h" - #include "logger.h" #include "main.h" #include "resources/image.h" +#include "resources/dye/dye.h" +#include "resources/dye/dyepalette.h" + +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp index 5b9ffce14..375f08cc5 100644 --- a/src/resources/sdl2softwareimagehelper.cpp +++ b/src/resources/sdl2softwareimagehelper.cpp @@ -24,15 +24,15 @@ #include "resources/sdl2softwareimagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" - #include "logger.h" #include "main.h" +#include "resources/dye/dye.h" + #include "resources/image.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 87fe72a7b..6ada9c394 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -29,10 +29,11 @@ #include "resources/action.h" #include "resources/delayedmanager.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/animationdelayload.h" #include "utils/delete2.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index f9b6e65a9..1a77ea38f 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -30,11 +30,12 @@ #include "gui/theme.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/mrand.h" #include "utils/physfstools.h" diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp index ab0362337..fa33ff5f5 100644 --- a/src/resources/sprite/animationdelayload.cpp +++ b/src/resources/sprite/animationdelayload.cpp @@ -22,7 +22,7 @@ #include "const/resources/spriteaction.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "resources/sprite/animatedsprite.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 01651bd80..25c5952e3 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -34,12 +34,13 @@ #include "resources/action.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/spritereference.h" #include "debug.h" diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp index 69e011219..effba4abd 100644 --- a/src/resources/surfaceimagehelper.cpp +++ b/src/resources/surfaceimagehelper.cpp @@ -24,15 +24,15 @@ #include "resources/surfaceimagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" - #include "logger.h" #include "main.h" #include "resources/image.h" +#include "resources/dye/dye.h" + +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> |