From 8b911ce3eb29002f7b4c3eaf921066cccad32a26 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 22 Feb 2025 21:00:40 +0300
Subject: [PATCH] Rename components/fx files to follow naming conventions

---
 CI/file_name_exceptions.txt                               | 2 --
 components/CMakeLists.txt                                 | 2 +-
 components/fx/lexer.cpp                                   | 1 -
 components/fx/lexer.hpp                                   | 2 +-
 components/fx/{lexer_types.hpp => lexertypes.hpp}         | 6 +++---
 components/fx/{parse_constants.hpp => parseconstants.hpp} | 4 ++--
 components/fx/technique.cpp                               | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename components/fx/{lexer_types.hpp => lexertypes.hpp} (98%)
 rename components/fx/{parse_constants.hpp => parseconstants.hpp} (98%)

diff --git a/CI/file_name_exceptions.txt b/CI/file_name_exceptions.txt
index f1dcf0f38f..0923a70567 100644
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@@ -33,8 +33,6 @@ components/crashcatcher/windows_crashcatcher.hpp
 components/crashcatcher/windows_crashmonitor.cpp
 components/crashcatcher/windows_crashmonitor.hpp
 components/crashcatcher/windows_crashshm.hpp
-components/fx/lexer_types.hpp
-components/fx/parse_constants.hpp
 components/platform/file.posix.cpp
 components/platform/file.stdio.cpp
 components/platform/file.win32.cpp
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 83270f3c6f..ccf3a329b3 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -173,7 +173,7 @@ add_component_dir(esm attr common defs esmcommon records util luascripts format
     exteriorcelllocation
     )
 
-add_component_dir(fx pass technique lexer lexer_types parse_constants widgets stateupdater)
+add_component_dir(fx pass technique lexer lexertypes parseconstants widgets stateupdater)
 
 add_component_dir(std140 ubo)
 
diff --git a/components/fx/lexer.cpp b/components/fx/lexer.cpp
index 6140c7375c..2fc25e44f1 100644
--- a/components/fx/lexer.cpp
+++ b/components/fx/lexer.cpp
@@ -6,7 +6,6 @@
 #include <string>
 #include <string_view>
 
-#include <components/fx/lexer_types.hpp>
 #include <components/misc/strings/format.hpp>
 
 namespace fx
diff --git a/components/fx/lexer.hpp b/components/fx/lexer.hpp
index fc7d4ec9d7..adc8974904 100644
--- a/components/fx/lexer.hpp
+++ b/components/fx/lexer.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <string_view>
 
-#include "lexer_types.hpp"
+#include "lexertypes.hpp"
 
 namespace fx
 {
diff --git a/components/fx/lexer_types.hpp b/components/fx/lexertypes.hpp
similarity index 98%
rename from components/fx/lexer_types.hpp
rename to components/fx/lexertypes.hpp
index 9fe13ac827..c0df1a9da8 100644
--- a/components/fx/lexer_types.hpp
+++ b/components/fx/lexertypes.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_FX_LEXER_TYPES_H
-#define OPENMW_COMPONENTS_FX_LEXER_TYPES_H
+#ifndef OPENMW_COMPONENTS_FX_LEXERTYPES_H
+#define OPENMW_COMPONENTS_FX_LEXERTYPES_H
 
 #include <string_view>
 #include <variant>
@@ -165,4 +165,4 @@ namespace fx
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/components/fx/parse_constants.hpp b/components/fx/parseconstants.hpp
similarity index 98%
rename from components/fx/parse_constants.hpp
rename to components/fx/parseconstants.hpp
index 2057476f3e..412a19980b 100644
--- a/components/fx/parse_constants.hpp
+++ b/components/fx/parseconstants.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
-#define OPENMW_COMPONENTS_FX_PARSE_CONSTANTS_H
+#ifndef OPENMW_COMPONENTS_FX_PARSECONSTANTS_H
+#define OPENMW_COMPONENTS_FX_PARSECONSTANTS_H
 
 #include <array>
 #include <string_view>
diff --git a/components/fx/technique.cpp b/components/fx/technique.cpp
index 5963e274ec..b0b7f282aa 100644
--- a/components/fx/technique.cpp
+++ b/components/fx/technique.cpp
@@ -17,7 +17,7 @@
 #include <components/stereo/multiview.hpp>
 #include <components/vfs/manager.hpp>
 
-#include "parse_constants.hpp"
+#include "parseconstants.hpp"
 
 namespace
 {