AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-08 03:41:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename components/to_utf8 directory and files to follow naming conventions

Browse Source
This commit is contained in:
Alexei Kotov 2025-02-22 22:35:33 +03:00
parent 89426af94a
commit ac9505b536
36 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CI/file_name_exceptions.txt
View File

@ -12,7 +12,3 @@ components/crashcatcher/windows_crashcatcher.hpp
components/crashcatcher/windows_crashmonitor.cpp components/crashcatcher/windows_crashmonitor.cpp
components/crashcatcher/windows_crashmonitor.hpp components/crashcatcher/windows_crashmonitor.hpp
components/crashcatcher/windows_crashshm.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

2
apps/bulletobjecttool/main.cpp
View File

@ -20,7 +20,7 @@
#include <components/resource/niffilemanager.hpp> #include <components/resource/niffilemanager.hpp>
#include <components/resource/scenemanager.hpp> #include <components/resource/scenemanager.hpp>
#include <components/settings/settings.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/version/version.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/registerarchives.hpp> #include <components/vfs/registerarchives.hpp>

2
apps/components_tests/esmloader/load.cpp
View File

@ -10,7 +10,7 @@
#include <components/esmloader/load.hpp> #include <components/esmloader/load.hpp>
#include <components/files/collections.hpp> #include <components/files/collections.hpp>
#include <components/files/multidircollection.hpp> #include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
apps/components_tests/toutf8/toutf8.cpp
View File

@ -1,5 +1,5 @@
#include <components/misc/strings/conversion.hpp> #include <components/misc/strings/conversion.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
apps/esmtool/tes4.cpp
View File

@ -15,7 +15,7 @@
#include <components/esm4/readerutils.hpp> #include <components/esm4/readerutils.hpp>
#include <components/esm4/records.hpp> #include <components/esm4/records.hpp>
#include <components/esm4/typetraits.hpp> #include <components/esm4/typetraits.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace EsmTool namespace EsmTool
{ {

2
apps/essimporter/importer.cpp
View File

@ -25,7 +25,7 @@
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "importercontext.hpp" #include "importercontext.hpp"

2
apps/mwiniimporter/importer.hpp
View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
class MwIniImporter class MwIniImporter
{ {

2
apps/navmeshtool/main.cpp
View File

@ -25,7 +25,7 @@
#include <components/resource/niffilemanager.hpp> #include <components/resource/niffilemanager.hpp>
#include <components/resource/scenemanager.hpp> #include <components/resource/scenemanager.hpp>
#include <components/settings/values.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/version/version.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/registerarchives.hpp> #include <components/vfs/registerarchives.hpp>

2
apps/opencs/editor.cpp
View File

@ -34,7 +34,7 @@
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <components/nifosg/nifloader.hpp> #include <components/nifosg/nifloader.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "view/doc/viewmanager.hpp" #include "view/doc/viewmanager.hpp"

2
apps/opencs/model/doc/document.hpp
View File

@ -12,7 +12,7 @@
#include <apps/opencs/model/world/universalid.hpp> #include <apps/opencs/model/world/universalid.hpp>
#include <components/files/multidircollection.hpp> #include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "../world/data.hpp" #include "../world/data.hpp"
#include "../world/idcompletionmanager.hpp" #include "../world/idcompletionmanager.hpp"

2
apps/opencs/model/doc/documentmanager.hpp
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#include <components/files/multidircollection.hpp> #include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "loader.hpp" #include "loader.hpp"

2
apps/opencs/model/doc/saving.hpp
View File

@ -3,7 +3,7 @@
#include <QObject> #include <QObject>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "operation.hpp" #include "operation.hpp"
#include "savingstate.hpp" #include "savingstate.hpp"

2
apps/opencs/model/doc/savingstate.hpp
View File

@ -9,7 +9,7 @@
#include <components/esm3/esmwriter.hpp> #include <components/esm3/esmwriter.hpp>
#include <components/misc/algorithm.hpp> #include <components/misc/algorithm.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace CSMDoc namespace CSMDoc
{ {

2
apps/opencs/model/tools/mergeoperation.hpp
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "../doc/operation.hpp" #include "../doc/operation.hpp"

2
apps/opencs/model/tools/mergestages.hpp
View File

@ -9,7 +9,7 @@
#include <apps/opencs/model/world/idcollection.hpp> #include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp> #include <apps/opencs/model/world/record.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "../doc/stage.hpp" #include "../doc/stage.hpp"

2
apps/opencs/model/tools/tools.hpp
View File

@ -6,7 +6,7 @@
#include <apps/opencs/model/world/universalid.hpp> #include <apps/opencs/model/world/universalid.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include <QObject> #include <QObject>

2
apps/opencs/model/world/data.hpp
View File

@ -38,7 +38,7 @@
#include <components/esm3/selectiongroup.hpp> #include <components/esm3/selectiongroup.hpp>
#include <components/files/multidircollection.hpp> #include <components/files/multidircollection.hpp>
#include <components/misc/algorithm.hpp> #include <components/misc/algorithm.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "cell.hpp" #include "cell.hpp"
#include "idcollection.hpp" #include "idcollection.hpp"

2
apps/openmw/mwgui/journalbooks.hpp
View File

@ -4,7 +4,7 @@
#include "bookpage.hpp" #include "bookpage.hpp"
#include "journalviewmodel.hpp" #include "journalviewmodel.hpp"
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace MWGui namespace MWGui
{ {

2
apps/openmw/mwgui/journalwindow.hpp
View File

@ -3,7 +3,7 @@
#include "windowbase.hpp" #include "windowbase.hpp"
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include <memory> #include <memory>

2
apps/openmw/mwgui/windowmanagerimp.hpp
View File

@ -22,7 +22,7 @@
#include <components/sdlutil/sdlcursormanager.hpp> #include <components/sdlutil/sdlcursormanager.hpp>
#include <components/sdlutil/sdlvideowrapper.hpp> #include <components/sdlutil/sdlvideowrapper.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "charactercreation.hpp" #include "charactercreation.hpp"
#include "draganddrop.hpp" #include "draganddrop.hpp"

2
apps/wizard/inisettings.hpp
View File

@ -4,7 +4,7 @@
#include <QHash> #include <QHash>
#include <QVariant> #include <QVariant>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace Wizard namespace Wizard
{ {

6
components/CMakeLists.txt
View File

@ -155,9 +155,9 @@ add_component_dir (nifbullet
bulletnifloader bulletnifloader
) )
add_component_dir (to_utf8 add_component_dir (toutf8
tables_gen tablesgen
to_utf8 toutf8
) )
add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain add_component_dir(esm attr common defs esmcommon records util luascripts format refid esmbridge esmterrain

2
components/esm3/esmreader.hpp
View File

@ -10,7 +10,7 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "components/esm/decompose.hpp" #include "components/esm/decompose.hpp"
#include "components/esm/esmcommon.hpp" #include "components/esm/esmcommon.hpp"

2
components/esm3/esmwriter.cpp
View File

@ -7,7 +7,7 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/esm3/cellid.hpp> #include <components/esm3/cellid.hpp>
#include <components/misc/notnullptr.hpp> #include <components/misc/notnullptr.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
#include "formatversion.hpp" #include "formatversion.hpp"

2
components/esm4/reader.cpp
View File

@ -40,7 +40,7 @@
#include <components/files/constrainedfilestream.hpp> #include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp> #include <components/files/conversion.hpp>
#include <components/misc/strings/lower.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 <components/vfs/manager.hpp>
#include "grouptype.hpp" #include "grouptype.hpp"

2
components/fontloader/fontloader.hpp
View File

@ -5,7 +5,7 @@
#include <MyGUI_XmlDocument.h> #include <MyGUI_XmlDocument.h>
#include <components/myguiplatform/myguidatamanager.hpp> #include <components/myguiplatform/myguidatamanager.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace VFS namespace VFS
{ {

4
components/nif/nifstream.cpp
View File

@ -2,9 +2,9 @@
#include <span> #include <span>
#include "niffile.hpp" #include <components/toutf8/toutf8.hpp>
#include "../to_utf8/to_utf8.hpp" #include "niffile.hpp"
namespace namespace
{ {

1
components/to_utf8/.gitignore vendored
View File

@ -1 +0,0 @@
gen_iconv

8
components/to_utf8/Makefile
View File

@ -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

1
components/toutf8/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
geniconv

8
components/toutf8/Makefile Normal file
View File

@ -0,0 +1,8 @@
tablesgen.hpp: geniconv
./geniconv > tablesgen.hpp
geniconv: geniconv.cpp
g++ -Wall $^ -o $@
clean:
rm -f ./geniconv

4
components/to_utf8/gen_iconv.cpp → components/toutf8/geniconv.cpp
View File

@ -1,4 +1,4 @@
// This program generates the file tables_gen.hpp // This program generates the file tablesgen.hpp
#include <iostream> #include <iostream>
@ -88,7 +88,7 @@ int write_table(const std::string& charset, const std::string& tableName)
int main() int main()
{ {
// Write header guard // 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 // Write namespace
std::cout << "namespace ToUTF8\n{\n\n"; std::cout << "namespace ToUTF8\n{\n\n";

4
components/to_utf8/tables_gen.hpp → components/toutf8/tablesgen.hpp
View File

@ -1,5 +1,5 @@
#ifndef COMPONENTS_TOUTF8_TABLE_GEN_H #ifndef OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP
#define COMPONENTS_TOUTF8_TABLE_GEN_H #define OPENMW_COMPONENTS_TOUTF8_TABLESGEN_HPP
namespace ToUTF8 namespace ToUTF8
{ {

4
components/to_utf8/to_utf8.cpp → components/toutf8/toutf8.cpp
View File

@ -1,4 +1,4 @@
#include "to_utf8.hpp" #include "toutf8.hpp"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
@ -41,7 +41,7 @@
*/ */
// Generated tables // Generated tables
#include "tables_gen.hpp" #include "tablesgen.hpp"
using namespace ToUTF8; using namespace ToUTF8;

4
components/to_utf8/to_utf8.hpp → components/toutf8/toutf8.hpp
View File

@ -1,5 +1,5 @@
#ifndef COMPONENTS_TOUTF8_H #ifndef OPENMW_COMPONENTS_TOUTF8_TOUTF8_HPP
#define COMPONENTS_TOUTF8_H #define OPENMW_COMPONENTS_TOUTF8_TOUTF8_HPP
#include <cstring> #include <cstring>
#include <string> #include <string>

2
components/translation/translation.hpp
View File

@ -2,7 +2,7 @@
#define COMPONENTS_TRANSLATION_DATA_H #define COMPONENTS_TRANSLATION_DATA_H
#include <components/files/collections.hpp> #include <components/files/collections.hpp>
#include <components/to_utf8/to_utf8.hpp> #include <components/toutf8/toutf8.hpp>
namespace Translation namespace Translation
{ {