Rename components/to_utf8 directory and files to follow naming conventions

2025-08-03 07:16:31 -04:00 · 2025-02-22 22:35:33 +03:00 · 2025-02-22 22:35:33 +03:00 · ac9505b536
commit ac9505b536
parent 89426af94a
36 changed files with 47 additions and 51 deletions
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@ -12,7 +12,3 @@ components/crashcatcher/windows_crashcatcher.hpp
 components/crashcatcher/windows_crashmonitor.cpp
 components/crashcatcher/windows_crashmonitor.hpp
 components/crashcatcher/windows_crashshm.hpp
-components/to_utf8/gen_iconv.cpp
-components/to_utf8/tables_gen.hpp
-components/to_utf8/to_utf8.cpp
-components/to_utf8/to_utf8.hpp
--- a/apps/bulletobjecttool/main.cpp
+++ b/apps/bulletobjecttool/main.cpp
@ -20,7 +20,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
--- a/apps/components_tests/esmloader/load.cpp
+++ b/apps/components_tests/esmloader/load.cpp
@ -10,7 +10,7 @@
 #include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include <gtest/gtest.h>

--- a/apps/components_tests/toutf8/toutf8.cpp
+++ b/apps/components_tests/toutf8/toutf8.cpp
@ -1,5 +1,5 @@
 #include <components/misc/strings/conversion.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include <gtest/gtest.h>

--- a/apps/esmtool/tes4.cpp
+++ b/apps/esmtool/tes4.cpp
@ -15,7 +15,7 @@
 #include <components/esm4/readerutils.hpp>
 #include <components/esm4/records.hpp>
 #include <components/esm4/typetraits.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace EsmTool
 {
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@ -25,7 +25,7 @@

 #include <components/misc/constants.hpp>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "importercontext.hpp"

--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@ -8,7 +8,7 @@
 #include <string>
 #include <vector>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 class MwIniImporter
 {
--- a/apps/navmeshtool/main.cpp
+++ b/apps/navmeshtool/main.cpp
@ -25,7 +25,7 @@
 #include <components/resource/niffilemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/settings/values.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 #include <components/version/version.hpp>
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@ -34,7 +34,7 @@
 #include <components/misc/rng.hpp>
 #include <components/nifosg/nifloader.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "view/doc/viewmanager.hpp"

--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@ -12,7 +12,7 @@
 #include <apps/opencs/model/world/universalid.hpp>

 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "../world/data.hpp"
 #include "../world/idcompletionmanager.hpp"
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@ -9,7 +9,7 @@
 #include <vector>

 #include <components/files/multidircollection.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "loader.hpp"

--- a/apps/opencs/model/doc/saving.hpp
+++ b/apps/opencs/model/doc/saving.hpp
@ -3,7 +3,7 @@

 #include <QObject>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "operation.hpp"
 #include "savingstate.hpp"
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@ -9,7 +9,7 @@

 #include <components/esm3/esmwriter.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace CSMDoc
 {
--- a/apps/opencs/model/tools/mergeoperation.hpp
+++ b/apps/opencs/model/tools/mergeoperation.hpp
@ -3,7 +3,7 @@

 #include <memory>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "../doc/operation.hpp"

--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@ -9,7 +9,7 @@
 #include <apps/opencs/model/world/idcollection.hpp>
 #include <apps/opencs/model/world/record.hpp>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "../doc/stage.hpp"

--- a/apps/opencs/model/tools/tools.hpp
+++ b/apps/opencs/model/tools/tools.hpp
@ -6,7 +6,7 @@

 #include <apps/opencs/model/world/universalid.hpp>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include <QObject>

--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@ -38,7 +38,7 @@
 #include <components/esm3/selectiongroup.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/misc/algorithm.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "cell.hpp"
 #include "idcollection.hpp"
--- a/apps/openmw/mwgui/journalbooks.hpp
+++ b/apps/openmw/mwgui/journalbooks.hpp
@ -4,7 +4,7 @@
 #include "bookpage.hpp"
 #include "journalviewmodel.hpp"

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace MWGui
 {
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@ -3,7 +3,7 @@

 #include "windowbase.hpp"

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include <memory>

--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@ -22,7 +22,7 @@
 #include <components/sdlutil/sdlcursormanager.hpp>
 #include <components/sdlutil/sdlvideowrapper.hpp>
 #include <components/settings/settings.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "charactercreation.hpp"
 #include "draganddrop.hpp"
--- a/apps/wizard/inisettings.hpp
+++ b/apps/wizard/inisettings.hpp
@ -4,7 +4,7 @@
 #include <QHash>
 #include <QVariant>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace Wizard
 {
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -155,9 +155,9 @@ add_component_dir (nifbullet
    bulletnifloader
    )

-add_component_dir (to_utf8
-    tables_gen
-    to_utf8
+add_component_dir (toutf8
+    tablesgen
+    toutf8
    )

 add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain
--- a/components/esm3/esmreader.hpp
+++ b/components/esm3/esmreader.hpp
@ -10,7 +10,7 @@
 #include <type_traits>
 #include <vector>

-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "components/esm/decompose.hpp"
 #include "components/esm/esmcommon.hpp"
--- a/components/esm3/esmwriter.cpp
+++ b/components/esm3/esmwriter.cpp
@ -7,7 +7,7 @@
 #include <components/debug/debuglog.hpp>
 #include <components/esm3/cellid.hpp>
 #include <components/misc/notnullptr.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 #include "formatversion.hpp"

--- a/components/esm4/reader.cpp
+++ b/components/esm4/reader.cpp
@ -40,7 +40,7 @@
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>
 #include <components/vfs/manager.hpp>

 #include "grouptype.hpp"
--- a/components/fontloader/fontloader.hpp
+++ b/components/fontloader/fontloader.hpp
@ -5,7 +5,7 @@
 #include <MyGUI_XmlDocument.h>

 #include <components/myguiplatform/myguidatamanager.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace VFS
 {
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@ -2,9 +2,9 @@

 #include <span>

-#include "niffile.hpp"
+#include <components/toutf8/toutf8.hpp>

-#include "../to_utf8/to_utf8.hpp"
+#include "niffile.hpp"

 namespace
 {
--- a/components/to_utf8/.gitignore
+++ b/components/to_utf8/.gitignore
@ -1 +0,0 @@
-gen_iconv
--- a/components/to_utf8/Makefile
+++ b/components/to_utf8/Makefile
@ -1,8 +0,0 @@
-tables_gen.hpp: gen_iconv
-	./gen_iconv > tables_gen.hpp
-
-gen_iconv: gen_iconv.cpp
-	g++ -Wall $^ -o $@
-
-clean:
-	rm -f ./gen_iconv
--- a/components/toutf8/.gitignore
+++ b/components/toutf8/.gitignore
@ -0,0 +1 @@
+geniconv
--- a/components/toutf8/Makefile
+++ b/components/toutf8/Makefile
@ -0,0 +1,8 @@
+tablesgen.hpp: geniconv
+	./geniconv > tablesgen.hpp
+
+geniconv: geniconv.cpp
+	g++ -Wall $^ -o $@
+
+clean:
+	rm -f ./geniconv
--- a/components/to_utf8/gen_iconv.cpp
+++ b/components/to_utf8/gen_iconv.cpp
@ -1,4 +1,4 @@
-// This program generates the file tables_gen.hpp
+// This program generates the file tablesgen.hpp

 #include <iostream>

@ -88,7 +88,7 @@ int write_table(const std::string& charset, const std::string& tableName)
 int main()
 {
    // Write header guard
-    std::cout << "#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H\n#define COMPONENTS_TOUTF8_TABLE_GEN_H\n\n";
+    std::cout << "#ifndef OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP\n#define OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP\n\n";

    // Write namespace
    std::cout << "namespace ToUTF8\n{\n\n";
--- a/components/to_utf8/tables_gen.hpp
+++ b/components/to_utf8/tables_gen.hpp
@ -1,5 +1,5 @@
-#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H
-#define COMPONENTS_TOUTF8_TABLE_GEN_H
+#ifndef OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP
+#define OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP

 namespace ToUTF8
 {
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@ -1,4 +1,4 @@
-#include "to_utf8.hpp"
+#include "toutf8.hpp"

 #include <algorithm>
 #include <cassert>
@ -41,7 +41,7 @@
 */

 // Generated tables
-#include "tables_gen.hpp"
+#include "tablesgen.hpp"

 using namespace ToUTF8;

--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@ -1,5 +1,5 @@
-#ifndef COMPONENTS_TOUTF8_H
-#define COMPONENTS_TOUTF8_H
+#ifndef OPENMW_COMPONENTS_TOUTF8_TOUTF8_HPP
+#define OPENMW_COMPONENTS_TOUTF8_TOUTF8_HPP

 #include <cstring>
 #include <string>
--- a/components/translation/translation.hpp
+++ b/components/translation/translation.hpp
@ -2,7 +2,7 @@
 #define COMPONENTS_TRANSLATION_DATA_H

 #include <components/files/collections.hpp>
-#include <components/to_utf8/to_utf8.hpp>
+#include <components/toutf8/toutf8.hpp>

 namespace Translation
 {