From fc60e6391b53c7e272bbbfe81e34f64ceb92fe06 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 21 Feb 2017 17:08:42 +0300 Subject: Move virt fs related files into fs directory. --- src/resources/atlas/atlasmanager.cpp | 5 +++-- src/resources/beingcommon.h | 3 ++- src/resources/db/badgesdb.cpp | 3 ++- src/resources/db/itemdb.cpp | 3 ++- src/resources/db/palettedb.cpp | 3 ++- src/resources/dye/dye_unittest.cc | 3 ++- src/resources/dye/dyepalette_unittest.cc | 3 ++- src/resources/loaders/imageloader.cpp | 5 +++-- src/resources/loaders/musicloader.cpp | 5 +++-- src/resources/loaders/soundloader.cpp | 5 +++-- src/resources/map/map.cpp | 19 ++++++++++--------- src/resources/map/maplayer_unittest.cc | 3 ++- src/resources/map/speciallayer_unittest.cc | 3 ++- src/resources/mapreader.cpp | 3 ++- .../resourcemanager/resourcemanager_unittest.cc | 3 ++- src/resources/sprite/animatedsprite_unittest.cc | 3 ++- src/resources/wallpaper.cpp | 6 +++--- 17 files changed, 47 insertions(+), 31 deletions(-) (limited to 'src/resources') diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index ef06c9527..f724618b5 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -28,9 +28,10 @@ #include "logger.h" #endif // DEBUG_IMAGES +#include "fs/virtfs.h" +#include "fs/virtfsrwops.h" + #include "utils/mathutils.h" -#include "utils/virtfs.h" -#include "utils/virtfsrwops.h" #include "utils/sdlcheckutils.h" #include "resources/openglimagehelper.h" diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h index 769ac238c..901b5e65e 100644 --- a/src/resources/beingcommon.h +++ b/src/resources/beingcommon.h @@ -21,7 +21,8 @@ #ifndef RESOURCES_BEINGCOMMON_H #define RESOURCES_BEINGCOMMON_H -#include "utils/virtfstools.h" +#include "fs/virtfstools.h" + #include "utils/xml.h" #include "localconsts.h" diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp index 031d78945..59080efe6 100644 --- a/src/resources/db/badgesdb.cpp +++ b/src/resources/db/badgesdb.cpp @@ -22,7 +22,8 @@ #include "configuration.h" -#include "utils/virtfstools.h" +#include "fs/virtfstools.h" + #include "utils/xmlutils.h" #include "debug.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 9ff9d78c6..06ce15542 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -28,6 +28,8 @@ #include "enums/resources/spritedirection.h" +#include "fs/virtfstools.h" + #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" @@ -43,7 +45,6 @@ #include "utils/delete2.h" #include "utils/dtor.h" #include "utils/stringmap.h" -#include "utils/virtfstools.h" #include "debug.h" diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 4c9c4cd76..a17403769 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -22,8 +22,9 @@ #include "configuration.h" +#include "fs/virtfstools.h" + #include "utils/checkutils.h" -#include "utils/virtfstools.h" #include "resources/dye/dyecolor.h" diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc index 5f38aa77a..d562118b3 100644 --- a/src/resources/dye/dye_unittest.cc +++ b/src/resources/dye/dye_unittest.cc @@ -26,6 +26,8 @@ #include "being/actorsprite.h" +#include "fs/virtfs.h" + #include "resources/sdlimagehelper.h" #ifdef USE_SDL2 #include "resources/surfaceimagehelper.h" @@ -42,7 +44,6 @@ #include "utils/delete2.h" #include "utils/env.h" -#include "utils/virtfs.h" #ifndef USE_SDL2 #include diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index 9431f0d72..285ac22a8 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -26,6 +26,8 @@ #include "being/actorsprite.h" +#include "fs/virtfs.h" + #include "gui/gui.h" #include "gui/theme.h" @@ -41,7 +43,6 @@ #include "utils/delete2.h" #include "utils/env.h" -#include "utils/virtfs.h" #ifndef USE_SDL2 #include diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index b4826238a..3a4909d94 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -22,6 +22,9 @@ #include "resources/imagehelper.h" +#include "fs/virtfs.h" +#include "fs/virtfsrwops.h" + #include "resources/image/image.h" #include "resources/loaders/imageloader.h" @@ -31,8 +34,6 @@ #include "resources/dye/dye.h" #include "utils/checkutils.h" -#include "utils/virtfs.h" -#include "utils/virtfsrwops.h" #include "debug.h" diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 62fde088b..ee464ae48 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -22,13 +22,14 @@ #include "resources/sdlmusic.h" +#include "fs/virtfs.h" +#include "fs/virtfsrwops.h" + #include "resources/loaders/musicloader.h" #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/virtfs.h" -#include "utils/virtfsrwops.h" #include "debug.h" diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 35a938f76..cbc0cbde9 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -22,13 +22,14 @@ #include "resources/soundeffect.h" +#include "fs/virtfs.h" +#include "fs/virtfsrwops.h" + #include "resources/loaders/soundloader.h" #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/virtfs.h" -#include "utils/virtfsrwops.h" #include "debug.h" diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index afc2bbffd..5af4e72f3 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -27,14 +27,6 @@ #include "notifymanager.h" #include "settings.h" -#include "resources/map/mapheights.h" -#include "resources/map/maplayer.h" -#include "resources/map/mapitem.h" -#include "resources/map/objectslayer.h" -#include "resources/map/speciallayer.h" -#include "resources/map/tileset.h" -#include "resources/map/walklayer.h" - #include "being/localplayer.h" #include "enums/resources/notifytypes.h" @@ -42,6 +34,8 @@ #include "enums/resources/map/blockmask.h" #include "enums/resources/map/mapitemtype.h" +#include "fs/virtfs.h" + #include "gui/userpalette.h" #include "particle/particle.h" @@ -53,8 +47,16 @@ #include "resources/loaders/imageloader.h" #include "resources/map/location.h" +#include "resources/map/mapheights.h" #include "resources/map/mapobjectlist.h" +#include "resources/map/maplayer.h" +#include "resources/map/mapitem.h" +#include "resources/map/objectslayer.h" +#include "resources/map/speciallayer.h" #include "resources/map/tileanimation.h" +#include "resources/map/tileset.h" +#include "resources/map/walklayer.h" + #ifdef USE_OPENGL #include "render/renderers.h" @@ -63,7 +65,6 @@ #include "utils/delete2.h" #include "utils/dtor.h" #include "utils/mkdir.h" -#include "utils/virtfs.h" #include "utils/timer.h" #include diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc index f2efd49a6..34a0f128b 100644 --- a/src/resources/map/maplayer_unittest.cc +++ b/src/resources/map/maplayer_unittest.cc @@ -26,10 +26,11 @@ #include "enums/resources/map/blockmask.h" #include "enums/resources/map/mapitemtype.h" +#include "fs/virtfs.h" + #include "gui/theme.h" #include "utils/delete2.h" -#include "utils/virtfs.h" #include "render/mockgraphics.h" diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc index 70f3d07e1..cf6c17120 100644 --- a/src/resources/map/speciallayer_unittest.cc +++ b/src/resources/map/speciallayer_unittest.cc @@ -28,8 +28,9 @@ #include "enums/resources/map/mapitemtype.h" +#include "fs/virtfs.h" + #include "utils/delete2.h" -#include "utils/virtfs.h" #include "resources/sdlimagehelper.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 35081c7ba..bf0b95f71 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -33,6 +33,8 @@ #include "enums/resources/map/collisiontype.h" #include "enums/resources/map/mapitemtype.h" +#include "fs/virtfs.h" + #include "resources/map/map.h" #include "resources/map/mapheights.h" #include "resources/map/maplayer.h" @@ -58,7 +60,6 @@ #include "utils/base64.h" #include "utils/checkutils.h" #include "utils/delete2.h" -#include "utils/virtfs.h" #include "utils/stringmap.h" #include "utils/translation/podict.h" diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index 56f055b86..6613a42c1 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -25,13 +25,14 @@ #include "being/actorsprite.h" +#include "fs/virtfs.h" + #include "resources/sdlimagehelper.h" #include "resources/resourcemanager/resourcemanager.h" #include "utils/env.h" #include "utils/delete2.h" -#include "utils/virtfs.h" #include diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index 8eeb2178d..8d31125f5 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -28,6 +28,8 @@ #include "being/actorsprite.h" +#include "fs/virtfs.h" + #include "gui/gui.h" #include "gui/theme.h" @@ -42,7 +44,6 @@ #include "utils/env.h" #include "utils/delete2.h" #include "utils/mrand.h" -#include "utils/virtfs.h" #ifndef USE_SDL2 #include diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 397f29af5..413f733be 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -24,10 +24,10 @@ #include "configuration.h" -#include "resources/wallpaperdata.h" +#include "fs/virtfs.h" +#include "fs/virtlist.h" -#include "utils/virtfs.h" -#include "utils/virtlist.h" +#include "resources/wallpaperdata.h" #include -- cgit v1.2.3-60-g2f50