From d8a961244d99a87c1a01613a971173cc135c246a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 16 Dec 2014 01:14:37 +0200 Subject: [PATCH] ZVISION: Move all the file-related classes together --- engines/zvision/{utility => file}/lzss_read_stream.cpp | 2 +- engines/zvision/{utility => file}/lzss_read_stream.h | 0 engines/zvision/{core => file}/search_manager.cpp | 4 ++-- engines/zvision/{core => file}/search_manager.h | 0 engines/zvision/{utility => file}/zfs_archive.cpp | 2 +- engines/zvision/{utility => file}/zfs_archive.h | 0 engines/zvision/graphics/render_manager.cpp | 2 +- engines/zvision/graphics/subtitles.cpp | 2 +- engines/zvision/module.mk | 6 +++--- engines/zvision/text/string_manager.cpp | 2 +- engines/zvision/zvision.cpp | 4 ++-- engines/zvision/zvision.h | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename engines/zvision/{utility => file}/lzss_read_stream.cpp (98%) rename engines/zvision/{utility => file}/lzss_read_stream.h (100%) rename engines/zvision/{core => file}/search_manager.cpp (98%) rename engines/zvision/{core => file}/search_manager.h (100%) rename engines/zvision/{utility => file}/zfs_archive.cpp (99%) rename engines/zvision/{utility => file}/zfs_archive.h (100%) diff --git a/engines/zvision/utility/lzss_read_stream.cpp b/engines/zvision/file/lzss_read_stream.cpp similarity index 98% rename from engines/zvision/utility/lzss_read_stream.cpp rename to engines/zvision/file/lzss_read_stream.cpp index bbe6e35f76e..6f27eaa7651 100644 --- a/engines/zvision/utility/lzss_read_stream.cpp +++ b/engines/zvision/file/lzss_read_stream.cpp @@ -22,7 +22,7 @@ #include "common/scummsys.h" -#include "zvision/utility/lzss_read_stream.h" +#include "zvision/file/lzss_read_stream.h" namespace ZVision { diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/file/lzss_read_stream.h similarity index 100% rename from engines/zvision/utility/lzss_read_stream.h rename to engines/zvision/file/lzss_read_stream.h diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/file/search_manager.cpp similarity index 98% rename from engines/zvision/core/search_manager.cpp rename to engines/zvision/file/search_manager.cpp index 1523319c94f..752b52b01f6 100644 --- a/engines/zvision/core/search_manager.cpp +++ b/engines/zvision/file/search_manager.cpp @@ -24,8 +24,8 @@ #include "common/fs.h" #include "common/stream.h" -#include "zvision/core/search_manager.h" -#include "zvision/utility/zfs_archive.h" +#include "zvision/file/search_manager.h" +#include "zvision/file/zfs_archive.h" namespace ZVision { diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/file/search_manager.h similarity index 100% rename from engines/zvision/core/search_manager.h rename to engines/zvision/file/search_manager.h diff --git a/engines/zvision/utility/zfs_archive.cpp b/engines/zvision/file/zfs_archive.cpp similarity index 99% rename from engines/zvision/utility/zfs_archive.cpp rename to engines/zvision/file/zfs_archive.cpp index 13b0168e1ce..9b55a366eda 100644 --- a/engines/zvision/utility/zfs_archive.cpp +++ b/engines/zvision/file/zfs_archive.cpp @@ -25,7 +25,7 @@ #include "common/debug.h" #include "common/file.h" -#include "zvision/utility/zfs_archive.h" +#include "zvision/file/zfs_archive.h" namespace ZVision { diff --git a/engines/zvision/utility/zfs_archive.h b/engines/zvision/file/zfs_archive.h similarity index 100% rename from engines/zvision/utility/zfs_archive.h rename to engines/zvision/file/zfs_archive.h diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index 97d47e39207..e2ad13a3302 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/engines/zvision/graphics/render_manager.cpp @@ -27,7 +27,7 @@ #include "zvision/scripting/script_manager.h" #include "zvision/text/text.h" -#include "zvision/utility/lzss_read_stream.h" +#include "zvision/file/lzss_read_stream.h" #include "common/file.h" #include "common/system.h" diff --git a/engines/zvision/graphics/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp index 784721562aa..d2c56f09917 100644 --- a/engines/zvision/graphics/subtitles.cpp +++ b/engines/zvision/graphics/subtitles.cpp @@ -22,7 +22,7 @@ #include "zvision/graphics/render_manager.h" #include "zvision/graphics/subtitles.h" -#include "zvision/core/search_manager.h" +#include "zvision/file/search_manager.h" #include "zvision/text/text.h" namespace ZVision { diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk index c9a1cb71873..1d89e22584f 100644 --- a/engines/zvision/module.mk +++ b/engines/zvision/module.mk @@ -5,8 +5,10 @@ MODULE_OBJS := \ core/events.o \ core/menu.o \ core/save_manager.o \ - core/search_manager.o \ detection.o \ + file/lzss_read_stream.o \ + file/search_manager.o \ + file/zfs_archive.o \ graphics/cursors/cursor_manager.o \ graphics/cursors/cursor.o \ graphics/effects/fog.o \ @@ -43,9 +45,7 @@ MODULE_OBJS := \ text/string_manager.o \ text/text.o \ utility/clock.o \ - utility/lzss_read_stream.o \ utility/utility.o \ - utility/zfs_archive.o \ video/rlf_decoder.o \ video/video.o \ video/zork_avi_decoder.o \ diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp index 1a04c67988a..d275bc87698 100644 --- a/engines/zvision/text/string_manager.cpp +++ b/engines/zvision/text/string_manager.cpp @@ -28,7 +28,7 @@ #include "graphics/colormasks.h" #include "zvision/zvision.h" -#include "zvision/core/search_manager.h" +#include "zvision/file/search_manager.h" #include "zvision/text/string_manager.h" #include "zvision/graphics/truetype_font.h" diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 45dc124b58a..f9d6bb3e852 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -31,11 +31,11 @@ #include "zvision/text/string_manager.h" #include "zvision/detection.h" #include "zvision/core/menu.h" -#include "zvision/core/search_manager.h" +#include "zvision/file/search_manager.h" #include "zvision/text/text.h" #include "zvision/graphics/truetype_font.h" #include "zvision/sound/midi.h" -#include "zvision/utility/zfs_archive.h" +#include "zvision/file/zfs_archive.h" #include "common/config-manager.h" #include "common/str.h" diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index 82030e6944e..55dddd4f21b 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -26,7 +26,7 @@ #include "zvision/detection.h" #include "zvision/utility/clock.h" -#include "zvision/core/search_manager.h" +#include "zvision/file/search_manager.h" #include "common/random.h" #include "common/events.h"