diff --git a/src/ObjCommon/Localize/LocalizeFile.cpp b/src/ObjCommon/Localize/LocalizeFile.cpp deleted file mode 100644 index 3cd6e3d0d..000000000 --- a/src/ObjCommon/Localize/LocalizeFile.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "LocalizeFile.h" - -LocalizeFileEntry::LocalizeFileEntry() = default; - -LocalizeFileEntry::LocalizeFileEntry(std::string key, std::string value) - : m_key(std::move(key)), - m_value(std::move(value)) -{ -} diff --git a/src/ObjCommon/Localize/LocalizeFile.h b/src/ObjCommon/Localize/LocalizeFile.h deleted file mode 100644 index 73ac2dad9..000000000 --- a/src/ObjCommon/Localize/LocalizeFile.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include - -class LocalizeFileEntry -{ -public: - std::string m_key; - std::string m_value; - - LocalizeFileEntry(); - LocalizeFileEntry(std::string key, std::string value); -}; diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.cpp b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.cpp index d4d89ff38..6295f5219 100644 --- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.cpp +++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderLocalizeEntry.cpp @@ -1,7 +1,7 @@ #include "AssetLoaderLocalizeEntry.h" #include "Localize/LocalizeCommon.h" -#include "Parsing/LocalizeFile/LocalizeFileReader.h" +#include "Localize/Parsing/LocalizeFileReader.h" #include @@ -36,16 +36,17 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw( if (!file.IsOpen()) return false; - LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language); + auto* zoneState = manager->GetAssetLoadingContext()->GetZoneAssetLoaderState(); + LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language, zoneState); const auto localizeEntries = reader.ReadLocalizeFile(); - for (const auto& entry : localizeEntries) + for (const auto& [key, value] : localizeEntries) { auto* localizeEntry = memory->Create(); - localizeEntry->name = memory->Dup(entry.m_key.c_str()); - localizeEntry->value = memory->Dup(entry.m_value.c_str()); + localizeEntry->name = memory->Dup(key.c_str()); + localizeEntry->value = memory->Dup(value.c_str()); - manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); + manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, key, localizeEntry); } return true; diff --git a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.cpp b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.cpp index d3b94c757..52c4a53e0 100644 --- a/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.cpp +++ b/src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderLocalizeEntry.cpp @@ -1,7 +1,7 @@ #include "AssetLoaderLocalizeEntry.h" #include "Localize/LocalizeCommon.h" -#include "Parsing/LocalizeFile/LocalizeFileReader.h" +#include "Localize/Parsing/LocalizeFileReader.h" #include @@ -36,16 +36,17 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw( if (!file.IsOpen()) return false; - LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language); + auto* zoneState = manager->GetAssetLoadingContext()->GetZoneAssetLoaderState(); + LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language, zoneState); const auto localizeEntries = reader.ReadLocalizeFile(); - for (const auto& entry : localizeEntries) + for (const auto& [key, value] : localizeEntries) { auto* localizeEntry = memory->Create(); - localizeEntry->name = memory->Dup(entry.m_key.c_str()); - localizeEntry->value = memory->Dup(entry.m_value.c_str()); + localizeEntry->name = memory->Dup(key.c_str()); + localizeEntry->value = memory->Dup(value.c_str()); - manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); + manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, key, localizeEntry); } return true; diff --git a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.cpp b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.cpp index 33f67fafc..05e353a97 100644 --- a/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.cpp +++ b/src/ObjLoading/Game/T5/AssetLoaders/AssetLoaderLocalizeEntry.cpp @@ -1,7 +1,7 @@ #include "AssetLoaderLocalizeEntry.h" #include "Localize/LocalizeCommon.h" -#include "Parsing/LocalizeFile/LocalizeFileReader.h" +#include "Localize/Parsing/LocalizeFileReader.h" #include @@ -36,16 +36,17 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw( if (!file.IsOpen()) return false; - LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language); + auto* zoneState = manager->GetAssetLoadingContext()->GetZoneAssetLoaderState(); + LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language, zoneState); const auto localizeEntries = reader.ReadLocalizeFile(); - for (const auto& entry : localizeEntries) + for (const auto& [key, value] : localizeEntries) { auto* localizeEntry = memory->Create(); - localizeEntry->name = memory->Dup(entry.m_key.c_str()); - localizeEntry->value = memory->Dup(entry.m_value.c_str()); + localizeEntry->name = memory->Dup(key.c_str()); + localizeEntry->value = memory->Dup(value.c_str()); - manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); + manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, key, localizeEntry); } return true; diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.cpp index 1a2265f71..9dda88e42 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderLocalizeEntry.cpp @@ -1,7 +1,7 @@ #include "AssetLoaderLocalizeEntry.h" #include "Localize/LocalizeCommon.h" -#include "Parsing/LocalizeFile/LocalizeFileReader.h" +#include "Localize/Parsing/LocalizeFileReader.h" #include @@ -36,16 +36,17 @@ bool AssetLoaderLocalizeEntry::LoadFromRaw( if (!file.IsOpen()) return false; - LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language); + auto* zoneState = manager->GetAssetLoadingContext()->GetZoneAssetLoaderState(); + LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language, zoneState); const auto localizeEntries = reader.ReadLocalizeFile(); - for (const auto& entry : localizeEntries) + for (const auto& [key, value] : localizeEntries) { auto* localizeEntry = memory->Create(); - localizeEntry->name = memory->Dup(entry.m_key.c_str()); - localizeEntry->value = memory->Dup(entry.m_value.c_str()); + localizeEntry->name = memory->Dup(key.c_str()); + localizeEntry->value = memory->Dup(value.c_str()); - manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, entry.m_key, localizeEntry); + manager->AddAsset(ASSET_TYPE_LOCALIZE_ENTRY, key, localizeEntry); } return true; diff --git a/src/ObjLoading/Localize/LocalizeReadingZoneState.cpp b/src/ObjLoading/Localize/LocalizeReadingZoneState.cpp new file mode 100644 index 000000000..652c5ba9f --- /dev/null +++ b/src/ObjLoading/Localize/LocalizeReadingZoneState.cpp @@ -0,0 +1,11 @@ +#include "LocalizeReadingZoneState.h" + +bool LocalizeReadingZoneState::DoLocalizeEntryDuplicateCheck(const std::string& key) +{ + const auto existingEntry = m_keys.find(key); + if (existingEntry != m_keys.end()) + return false; + + m_keys.emplace(key); + return true; +} diff --git a/src/ObjLoading/Localize/LocalizeReadingZoneState.h b/src/ObjLoading/Localize/LocalizeReadingZoneState.h new file mode 100644 index 000000000..6350e138b --- /dev/null +++ b/src/ObjLoading/Localize/LocalizeReadingZoneState.h @@ -0,0 +1,22 @@ +#pragma once + +#include "AssetLoading/IZoneAssetLoaderState.h" + +#include +#include + +class LocalizeReadingZoneState final : public IZoneAssetLoaderState +{ +public: + /** + * Checks whether a localize key was already added. + * Inserts key if it was not added yet. + * + * \param key The key to check + * \returns \c true if key was not duplicated yet, \c false otherwise + */ + bool DoLocalizeEntryDuplicateCheck(const std::string& key); + +private: + std::unordered_set m_keys; +}; diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp similarity index 88% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.cpp rename to src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp index c2a46338c..56413ac65 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp @@ -8,8 +8,8 @@ #include "Sequence/SequenceLocalizeFileReference.h" #include "Sequence/SequenceLocalizeFileVersion.h" -LocalizeFileParser::LocalizeFileParser(SimpleLexer* lexer, GameLanguage language) - : AbstractParser(lexer, std::make_unique(language)) +LocalizeFileParser::LocalizeFileParser(SimpleLexer* lexer, GameLanguage language, LocalizeReadingZoneState* zoneState) + : AbstractParser(lexer, std::make_unique(language, zoneState)) { } @@ -32,7 +32,7 @@ const std::vector::se return !m_state->m_end ? tests : noTests; } -std::vector LocalizeFileParser::GetParsedValues() +std::map LocalizeFileParser::GetParsedValues() { return std::move(m_state->m_entries); } diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.h b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h similarity index 82% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.h rename to src/ObjLoading/Localize/Parsing/LocalizeFileParser.h index 348e2a9e4..e9072cf2f 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParser.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h @@ -12,6 +12,6 @@ class LocalizeFileParser final : public AbstractParser& GetTestsForState() override; public: - LocalizeFileParser(SimpleLexer* lexer, GameLanguage language); - std::vector GetParsedValues(); + LocalizeFileParser(SimpleLexer* lexer, GameLanguage language, LocalizeReadingZoneState* zoneState); + std::map GetParsedValues(); }; diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp similarity index 74% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.cpp rename to src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp index 803081ec6..35dbc8086 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp @@ -2,9 +2,10 @@ #include "Localize/LocalizeCommon.h" -LocalizeFileParserState::LocalizeFileParserState(const GameLanguage language) +LocalizeFileParserState::LocalizeFileParserState(const GameLanguage language, LocalizeReadingZoneState* zoneState) : m_end(false), - m_language(language) + m_language(language), + m_zone_state(zoneState) { m_language_name_caps = LocalizeCommon::GetNameOfLanguage(m_language); for (auto& c : m_language_name_caps) diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.h b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h similarity index 55% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.h rename to src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h index 9a01bf604..ad83741ea 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileParserState.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h @@ -1,22 +1,24 @@ #pragma once + #include "Game/GameLanguage.h" -#include "Localize/LocalizeFile.h" +#include "Localize/LocalizeReadingZoneState.h" +#include #include -#include class LocalizeFileParserState { public: bool m_end; - std::vector m_entries; + std::map m_entries; GameLanguage m_language; + LocalizeReadingZoneState* m_zone_state; std::string m_language_name_caps; std::string m_current_reference; std::unordered_set m_current_reference_languages; - explicit LocalizeFileParserState(GameLanguage language); + LocalizeFileParserState(GameLanguage language, LocalizeReadingZoneState* zoneState); }; diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp similarity index 82% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.cpp rename to src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp index d9a28df54..a2c1a3444 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp @@ -4,10 +4,11 @@ #include "Parsing/Impl/CommentRemovingStreamProxy.h" #include "Parsing/Impl/ParserSingleInputStream.h" -LocalizeFileReader::LocalizeFileReader(std::istream& stream, std::string fileName, GameLanguage language) +LocalizeFileReader::LocalizeFileReader(std::istream& stream, std::string fileName, GameLanguage language, LocalizeReadingZoneState* zoneState) : m_file_name(std::move(fileName)), m_stream(nullptr), - m_language(language) + m_language(language), + m_zone_state(zoneState) { OpenBaseStream(stream); SetupStreamProxies(); @@ -27,7 +28,7 @@ void LocalizeFileReader::SetupStreamProxies() m_stream = m_open_streams.back().get(); } -std::vector LocalizeFileReader::ReadLocalizeFile() +std::map LocalizeFileReader::ReadLocalizeFile() { SimpleLexer::Config lexerConfig; lexerConfig.m_emit_new_line_tokens = true; @@ -37,11 +38,11 @@ std::vector LocalizeFileReader::ReadLocalizeFile() lexerConfig.m_read_floating_point_numbers = false; const auto lexer = std::make_unique(m_stream, std::move(lexerConfig)); - const auto parser = std::make_unique(lexer.get(), m_language); + const auto parser = std::make_unique(lexer.get(), m_language, m_zone_state); if (parser->Parse()) return parser->GetParsedValues(); std::cout << "Parsing localization file failed!" << std::endl; - return std::vector(); + return std::map(); } diff --git a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.h b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h similarity index 67% rename from src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.h rename to src/ObjLoading/Localize/Parsing/LocalizeFileReader.h index 34130c96c..cf4572bc8 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/LocalizeFileReader.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h @@ -1,9 +1,10 @@ #pragma once #include "Game/GameLanguage.h" -#include "Localize/LocalizeFile.h" +#include "Localize/LocalizeReadingZoneState.h" #include "Parsing/IParserLineStream.h" +#include #include #include #include @@ -14,12 +15,13 @@ class LocalizeFileReader IParserLineStream* m_stream; std::vector> m_open_streams; GameLanguage m_language; + LocalizeReadingZoneState* m_zone_state; bool OpenBaseStream(std::istream& stream); void SetupStreamProxies(); public: - LocalizeFileReader(std::istream& stream, std::string fileName, GameLanguage language); + LocalizeFileReader(std::istream& stream, std::string fileName, GameLanguage language, LocalizeReadingZoneState* zoneState); - std::vector ReadLocalizeFile(); + std::map ReadLocalizeFile(); }; diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConfig.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConfig.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConfig.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConfig.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConfig.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConfig.h similarity index 83% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConfig.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConfig.h index a17bd0c97..0059b6419 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConfig.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConfig.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileConfig final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConsumeEmptyLines.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConsumeEmptyLines.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConsumeEmptyLines.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConsumeEmptyLines.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConsumeEmptyLines.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConsumeEmptyLines.h similarity index 84% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConsumeEmptyLines.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConsumeEmptyLines.h index 6f3b0e9e3..b65f21dfb 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileConsumeEmptyLines.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileConsumeEmptyLines.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileConsumeEmptyLines final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileEndMarker.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileEndMarker.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileEndMarker.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileEndMarker.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileEndMarker.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileEndMarker.h similarity index 83% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileEndMarker.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileEndMarker.h index 6c77f1ea6..020fe9bd1 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileEndMarker.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileEndMarker.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileEndMarker final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp similarity index 78% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp index 81ce8b4a4..064a5fcd6 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.cpp +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp @@ -31,5 +31,13 @@ void SequenceLocalizeFileLanguageValue::ProcessMatch(LocalizeFileParserState* st state->m_current_reference_languages.emplace(langName); if (langName == state->m_language_name_caps) - state->m_entries.emplace_back(state->m_current_reference, valueToken.StringValue()); + { + const auto& currentReference = state->m_current_reference; + if (!state->m_zone_state->DoLocalizeEntryDuplicateCheck(currentReference)) + { + std::cout << "Localize: a value for reference \"" << currentReference << "\" was already defined\n"; + } + + state->m_entries[currentReference] = valueToken.StringValue(); + } } diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.h similarity index 87% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.h index f6379745a..4a3411831 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileLanguageValue.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileLanguageValue final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileNotes.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileNotes.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileNotes.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileNotes.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileNotes.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileNotes.h similarity index 83% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileNotes.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileNotes.h index e36d19c0f..3701b8c7b 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileNotes.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileNotes.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileNotes final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileReference.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileReference.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileReference.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileReference.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileReference.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileReference.h similarity index 86% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileReference.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileReference.h index c0d78402a..5c5266326 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileReference.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileReference.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileReference final : public LocalizeFileParser::sequence_t { diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileVersion.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileVersion.cpp similarity index 100% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileVersion.cpp rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileVersion.cpp diff --git a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileVersion.h b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileVersion.h similarity index 85% rename from src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileVersion.h rename to src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileVersion.h index a74fdae82..e1131a3c1 100644 --- a/src/ObjLoading/Parsing/LocalizeFile/Sequence/SequenceLocalizeFileVersion.h +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileVersion.h @@ -1,6 +1,6 @@ #pragma once -#include "Parsing/LocalizeFile/LocalizeFileParser.h" +#include "Localize/Parsing/LocalizeFileParser.h" class SequenceLocalizeFileVersion final : public LocalizeFileParser::sequence_t {