From 0254feefe381227709f5a0ace05fb1f704d3e3fe Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 22 Feb 2025 20:32:49 +0300
Subject: [PATCH] Rename bsa_file.cpp/hpp to follow naming conventions

---
 CI/file_name_exceptions.txt                  | 2 --
 components/CMakeLists.txt                    | 2 +-
 components/bsa/ba2dx10file.hpp               | 2 +-
 components/bsa/ba2gnrlfile.hpp               | 2 +-
 components/bsa/{bsa_file.cpp => bsafile.cpp} | 4 ++--
 components/bsa/{bsa_file.hpp => bsafile.hpp} | 2 +-
 components/bsa/compressedbsafile.hpp         | 4 ++--
 components/vfs/bsaarchive.hpp                | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)
 rename components/bsa/{bsa_file.cpp => bsafile.cpp} (99%)
 rename components/bsa/{bsa_file.hpp => bsafile.hpp} (98%)

diff --git a/CI/file_name_exceptions.txt b/CI/file_name_exceptions.txt
index 14d106169b..f1dcf0f38f 100644
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@@ -28,8 +28,6 @@ apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
 apps/openmw_tests/mwscript/test_scripts.cpp
 apps/openmw_tests/mwscript/test_utils.hpp
 apps/openmw_tests/mwworld/test_store.cpp
-components/bsa/bsa_file.cpp
-components/bsa/bsa_file.hpp
 components/crashcatcher/windows_crashcatcher.cpp
 components/crashcatcher/windows_crashcatcher.hpp
 components/crashcatcher/windows_crashmonitor.cpp
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index b6734e6fc6..83270f3c6f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -111,7 +111,7 @@ add_component_dir (bgsm
     )
 
 add_component_dir (bsa
-    bsa_file compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
+    bsafile compressedbsafile ba2gnrlfile ba2dx10file ba2file memorystream
     )
 
 add_component_dir (bullethelpers
diff --git a/components/bsa/ba2dx10file.hpp b/components/bsa/ba2dx10file.hpp
index 59db10745b..5d4249365b 100644
--- a/components/bsa/ba2dx10file.hpp
+++ b/components/bsa/ba2dx10file.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include <components/bsa/bsa_file.hpp>
+#include "bsafile.hpp"
 
 namespace Bsa
 {
diff --git a/components/bsa/ba2gnrlfile.hpp b/components/bsa/ba2gnrlfile.hpp
index 6a212c5e81..5f1f21dec9 100644
--- a/components/bsa/ba2gnrlfile.hpp
+++ b/components/bsa/ba2gnrlfile.hpp
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include <components/bsa/bsa_file.hpp>
+#include "bsafile.hpp"
 
 namespace Bsa
 {
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsafile.cpp
similarity index 99%
rename from components/bsa/bsa_file.cpp
rename to components/bsa/bsafile.cpp
index 46639a729e..03ee185e9e 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsafile.cpp
@@ -4,7 +4,7 @@
   Email: < korslund@gmail.com >
   WWW: https://openmw.org/
 
-  This file (bsa_file.cpp) is part of the OpenMW package.
+  This file (bsafile.cpp) is part of the OpenMW package.
 
   OpenMW is distributed as free software: you can redistribute it
   and/or modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 
  */
 
-#include "bsa_file.hpp"
+#include "bsafile.hpp"
 
 #include <components/esm/fourcc.hpp>
 #include <components/files/constrainedfilestream.hpp>
diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsafile.hpp
similarity index 98%
rename from components/bsa/bsa_file.hpp
rename to components/bsa/bsafile.hpp
index 03a0703885..9e79df85a1 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsafile.hpp
@@ -4,7 +4,7 @@
   Email: < korslund@gmail.com >
   WWW: https://openmw.org/
 
-  This file (bsa_file.h) is part of the OpenMW package.
+  This file (bsafile.hpp) is part of the OpenMW package.
 
   OpenMW is distributed as free software: you can redistribute it
   and/or modify it under the terms of the GNU General Public License
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index 8fa5c9a62a..1179dcc00b 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -26,11 +26,11 @@
 #ifndef BSA_COMPRESSED_BSA_FILE_H
 #define BSA_COMPRESSED_BSA_FILE_H
 
+#include <filesystem>
 #include <limits>
 #include <map>
 
-#include <components/bsa/bsa_file.hpp>
-#include <filesystem>
+#include "bsafile.hpp"
 
 namespace Bsa
 {
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 664466fa40..2e6fac6558 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -7,7 +7,7 @@
 
 #include <components/bsa/ba2dx10file.hpp>
 #include <components/bsa/ba2gnrlfile.hpp>
-#include <components/bsa/bsa_file.hpp>
+#include <components/bsa/bsafile.hpp>
 #include <components/bsa/compressedbsafile.hpp>
 
 #include <algorithm>