utils/mpq* -> mpq/*

CMakeLists.txt

@@ -469,6 +469,9 @@ set(libdevilutionx_SRCS
   Source/engine/render/dun_render.cpp
   Source/engine/render/text_render.cpp
   Source/engine/surface.cpp
+  Source/mpq/mpq_reader.cpp
+  Source/mpq/mpq_sdl_rwops.cpp
+  Source/mpq/mpq_writer.cpp
   Source/qol/autopickup.cpp
   Source/qol/common.cpp
   Source/qol/monhealthbar.cpp
@@ -479,9 +482,6 @@ set(libdevilutionx_SRCS
   Source/utils/file_util.cpp
   Source/utils/language.cpp
   Source/utils/logged_fstream.cpp
-  Source/utils/mpq.cpp
-  Source/utils/mpq_sdl_rwops.cpp
-  Source/utils/mpq_writer.cpp
   Source/utils/paths.cpp
   Source/utils/sdl_bilinear_scale.cpp
   Source/utils/sdl_rwops_file_wrapper.cpp
@@ -1198,7 +1198,7 @@ if(NINTENDO_3DS)
   add_custom_target(romfs_files
     COMMAND ${CMAKE_COMMAND} -E copy ${APP_ROMFS_FILES} ${APP_ROMFS}
     DEPENDS ${APP_ROMFS_FILES})
-    
+
   add_dependencies(romfs_files romfs_directory devilutionx_mpq)
 
   include(Tools3DS)

Source/engine/game_assets.cpp

@@ -5,9 +5,9 @@
 #include <cstring>
 
 #include "init.h"
+#include "mpq/mpq_sdl_rwops.hpp"
 #include "utils/file_util.h"
 #include "utils/log.hpp"
-#include "utils/mpq_sdl_rwops.hpp"
 #include "utils/paths.h"
 
 namespace devilution {

Source/init.cpp

@@ -17,9 +17,9 @@
 #include "options.h"
 #include "pfile.h"
 #include "engine/game_assets.hpp"
+#include "mpq/mpq_reader.hpp"
 #include "utils/language.h"
 #include "utils/log.hpp"
-#include "utils/mpq.hpp"
 #include "utils/paths.h"
 #include "utils/ui_fwd.h"
 

Source/init.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "miniwin/miniwin.h"
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 namespace devilution {
 

Source/loadsave.cpp

@@ -25,9 +25,9 @@
 #include "missiles.h"
 #include "pfile.h"
 #include "stores.h"
+#include "mpq/mpq_writer.hpp"
 #include "utils/endian.hpp"
 #include "utils/language.h"
-#include "utils/mpq_writer.hpp"
 
 namespace devilution {
 

Source/mpq/mpq_reader.cpp

@@ -1,4 +1,4 @@
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 #include <libmpq/mpq.h>
 

Source/mpq/mpq_sdl_rwops.cpp

@@ -1,4 +1,4 @@
-#include "utils/mpq_sdl_rwops.hpp"
+#include "mpq/mpq_sdl_rwops.hpp"
 
 #include <cstring>
 #include <memory>

Source/mpq/mpq_sdl_rwops.hpp

@@ -4,7 +4,7 @@
 
 #include <SDL.h>
 
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 namespace devilution {
 

Source/mpq/mpq_writer.cpp

@@ -1,9 +1,4 @@
-/**
- * @file mpqapi.cpp
- *
- * Implementation of functions for creating and editing MPQ files.
- */
-#include "utils/mpq_writer.hpp"
+#include "mpq/mpq_writer.hpp"
 
 #include <cstddef>
 #include <cstdint>

Source/mpq/mpq_writer.hpp

@@ -1,5 +1,5 @@
 /**
- * @file utils/mpq_writer.hpp
+ * @file mpq/mpq_writer.hpp
  *
  * Interface of functions for creating and editing MPQ files.
  */

Source/pfile.cpp

@@ -12,11 +12,11 @@
 #include "init.h"
 #include "loadsave.h"
 #include "menu.h"
+#include "mpq/mpq_reader.hpp"
 #include "pack.h"
 #include "utils/endian.hpp"
 #include "utils/file_util.h"
 #include "utils/language.h"
-#include "utils/mpq.hpp"
 #include "utils/paths.h"
 
 namespace devilution {

Source/pfile.h

@@ -5,9 +5,9 @@
  */
 #pragma once
 
+#include "mpq/mpq_writer.hpp"
 #include "player.h"
 #include "DiabloUI/diabloui.h"
-#include "utils/mpq_writer.hpp"
 
 namespace devilution {