Skip to content

Commit

Permalink
Eliminate warnings (#701)
Browse files Browse the repository at this point in the history
* Externals in angle brackets.

* Commons from lib

* Update to preview versions of externals.

* Update fronter

* Switch to std::filesystem::path

* Unused variables

* Type conversion stuff.

* constness

* Missing headers

* Prefix increment, not postfix

* Check optional

* Remove a stray extern

* explicit

* Return an error case.

* Default value

* Enforce warnings.

* Disable some unfixable warnings.

* Update commons

* Formatting

* Fix a test

* Use fixed common

* Fix tests.

* Formatting

* Update to merged versions

* Make codefactor happier.
  • Loading branch information
Idhrendur authored Jan 26, 2025
1 parent 3d56a65 commit 66d4e2b
Show file tree
Hide file tree
Showing 349 changed files with 2,471 additions and 2,120 deletions.
65 changes: 28 additions & 37 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ set(CMAKE_CXX_STANDARD 23)
set (UNICODE_DEFAULT OFF)

if (PLATFORM STREQUAL "Windows")
ADD_DEFINITIONS(-DUNICODE)
ADD_DEFINITIONS(-D_UNICODE)
ADD_DEFINITIONS(-DUNICODE -D_UNICODE -DWINDOWS)
elseif (PLATFORM STREQUAL "Linux")
if (COVERAGE STREQUAL true)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
Expand Down Expand Up @@ -194,47 +193,25 @@ set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/wars/war_importer.cpp
set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/world/vic3_world_builder.cpp")
set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/world/vic3_world_importer.cpp")

set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/BulkParser.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Color.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/CommonFunctions.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ConvenientParser.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ConverterVersion.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Date.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/GameVersion.cpp")
if (PLATFORM STREQUAL "Windows")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/WinUtils.cpp")
elseif (PLATFORM STREQUAL "Linux")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/LinuxUtils.cpp")
endif (PLATFORM STREQUAL "Windows")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Localization/LocalizationBlock.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Localization/LocalizationDatabase.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Log.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ModLoader/ModFilesystem.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ModLoader/ModLoader.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ModLoader/ModParser.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/OSCommonLayer.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/Parser.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/ParserHelpers.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/StringUtils.cpp")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/external/zip/src/zip.c")
set(COMMON_SOURCES ${COMMON_SOURCES} "external/commonItems/iconvlite.cpp")

set(FORMAT_SOURCES ${FORMAT_SOURCES} "external/fmt/src/format.cc")
set(FORMAT_SOURCES ${FORMAT_SOURCES} "external/fmt/src/os.cc")

add_library(fmtLib ${FORMAT_SOURCES})

link_directories("./external/rakaly")

add_library(CommonItems ${COMMON_SOURCES})
add_subdirectory(external/commonItems EXCLUDE_FROM_ALL)

add_library(Vic3ToHoi4lib
${CONVERTER_SOURCES}
${FORMAT_SOURCES}
)
)
target_precompile_headers(Vic3ToHoi4lib PUBLIC ${PCH_SOURCES})
if (PLATFORM STREQUAL "Windows")
target_link_libraries(Vic3ToHoi4lib LINK_PUBLIC CommonItems rakaly.dll.lib)
target_compile_options(Vic3ToHoi4lib PRIVATE /permissive /W4 /w14242 /w14254 /w14263 /w14265 /w14287 /we4289 /w14296
/w14311 /w14545 /w14546 /w14547 /w14549 /w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928
/external:anglebrackets /external:W0 /WX)
target_link_libraries(Vic3ToHoi4lib LINK_PUBLIC commonLib fmtLib rakaly.dll.lib)
elseif (PLATFORM STREQUAL "Linux")
target_link_libraries(Vic3ToHoi4lib LINK_PUBLIC CommonItems rakaly)
target_link_libraries(Vic3ToHoi4lib LINK_PUBLIC commonLib fmtLib rakaly)
endif (PLATFORM STREQUAL "Windows")

add_executable(
Expand All @@ -247,6 +224,14 @@ set_target_properties( Vic3ToHoi4
)
target_precompile_headers(Vic3ToHoi4 REUSE_FROM Vic3ToHoi4lib)
target_link_libraries(Vic3ToHoi4 LINK_PUBLIC Vic3ToHoi4lib)
if (PLATFORM STREQUAL "Windows")
target_compile_options(Vic3ToHoi4 PRIVATE /permissive /W4 /w14242 /w14254 /w14263 /w14265 /w14287 /we4289 /w14296
/w14311 /w14545 /w14546 /w14547 /w14549 /w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928
/external:anglebrackets /external:W0 /WX)
target_link_libraries(Vic3ToHoi4 LINK_PUBLIC commonLib rakaly.dll.lib)
elseif (PLATFORM STREQUAL "Linux")
target_link_libraries(Vic3ToHoi4 LINK_PUBLIC commonLib rakaly)
endif (PLATFORM STREQUAL "Windows")

configure_file("data/version.txt" "${FRONTER_OUTPUT_DIRECTORY}/version.txt" COPYONLY)
configure_file("data/readme.txt" "${FRONTER_OUTPUT_DIRECTORY}/readme.txt" COPYONLY)
Expand Down Expand Up @@ -345,9 +330,9 @@ set_target_properties(ConverterFrontend
RUNTIME_OUTPUT_DIRECTORY ${FRONTER_OUTPUT_DIRECTORY}
)
if (PLATFORM STREQUAL "Windows")
target_link_libraries(ConverterFrontend LINK_PUBLIC ${LIBCURL_LIB} ${LIBCURL_DLL_LIB} CommonItems)
target_link_libraries(ConverterFrontend LINK_PUBLIC ${LIBCURL_LIB} ${LIBCURL_DLL_LIB} commonLib)
elseif (PLATFORM STREQUAL "Linux")
target_link_libraries(ConverterFrontend LINK_PUBLIC ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES} CommonItems)
target_link_libraries(ConverterFrontend LINK_PUBLIC ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES} commonLib)
endif (PLATFORM STREQUAL "Windows")

if (PLATFORM STREQUAL "Windows")
Expand All @@ -362,7 +347,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Release")
elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxbase32ud_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxmsw32ud_core_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
endif (PLATFORM STREQUAL "Release")
endif (CMAKE_BUILD_TYPE STREQUAL "Release")
file(GLOB FRONTER_CONFIG "data/fronter/*")
file(COPY ${FRONTER_CONFIG} DESTINATION "${FRONTER_OUTPUT_DIRECTORY}/Configuration/")
file(GLOB LOCALIZATIONS "external/Fronter/Fronter/Resources/*.yml")
Expand Down Expand Up @@ -532,11 +517,17 @@ add_executable(
${TEST_SOURCES}
${GTEST_SOURCES}
)
set_target_properties( Vic3ToHoi4Tests
set_target_properties(Vic3ToHoi4Tests
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${TEST_OUTPUT_DIRECTORY}
)
target_precompile_headers(Vic3ToHoi4Tests REUSE_FROM Vic3ToHoi4lib)
if (PLATFORM STREQUAL "Windows")
target_compile_options(Vic3ToHoi4Tests PRIVATE /permissive /W4 /w14242 /w14254 /w14263 /w14265 /w14287 /we4289
/w14296 /w14311 /w14545 /w14546 /w14547 /w14549 /w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928
/external:anglebrackets /external:W0 /WX)
elseif (PLATFORM STREQUAL "Linux")
endif (PLATFORM STREQUAL "Windows")

file(COPY "data/blank_mod" DESTINATION "${TEST_OUTPUT_DIRECTORY}")
file(COPY "data/test_files" DESTINATION "${TEST_OUTPUT_DIRECTORY}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SaveGame = "path/that\will//be\\removed/\test_save with spaces.v3"
SaveGame = "path/that\will//be\\removed\/test_save with spaces.v3"
2 changes: 1 addition & 1 deletion external/commonItems
Submodule commonItems updated 52 files
+12 −8 BulkParser.cpp
+5 −2 BulkParser.h
+28 −30 CMakeLists.txt
+9 −0 CommonFunctions.cpp
+7 −6 CommonFunctions.h
+10 −3 CommonItems/CommonItems.vcxproj
+0 −15 CommonItems/CommonItems.vcxproj.filters
+21 −2 ConverterVersion.cpp
+2 −1 ConverterVersion.h
+53 −5 GameVersion.cpp
+18 −4 GameVersion.h
+16 −1 LinuxUtils.cpp
+22 −5 Localization/LocalizationDatabase.cpp
+3 −2 Localization/LocalizationDatabase.h
+7 −4 ModLoader/Mod.h
+64 −65 ModLoader/ModFilesystem.cpp
+16 −8 ModLoader/ModFilesystem.h
+257 −57 ModLoader/ModLoader.cpp
+15 −11 ModLoader/ModLoader.h
+76 −33 ModLoader/ModParser.cpp
+25 −14 ModLoader/ModParser.h
+167 −41 OSCommonLayer.cpp
+24 −27 OSCompatibilityLayer.h
+23 −5 Parser.cpp
+8 −2 Parser.h
+14 −14 ParserHelpers.cpp
+24 −2 WinUtils.cpp
+1 −1 external/googletest
+104 −0 external/zip/CMakeLists.txt
+1 −1 tests/ColorTests.cpp
+55 −2 tests/CommonFunctionsTests.cpp
+9 −0 tests/CommonItemsTests.sln
+7 −2 tests/CommonItemsTests.vcxproj
+1 −1 tests/CommonRegexesTests.cpp
+1 −1 tests/ConvenientParserTests.cpp
+21 −5 tests/ConverterVersionTests.cpp
+2 −2 tests/DateTests.cpp
+65 −17 tests/GameVersionTests.cpp
+4 −4 tests/Localization/LocalizationBlockTests.cpp
+20 −8 tests/Localization/LocalizationDatabaseTests.cpp
+1 −1 tests/LogTests.cpp
+35 −32 tests/ModFilesystemTests.cpp
+106 −18 tests/ModLoaderTests.cpp
+76 −11 tests/ModParserTests.cpp
+4 −1 tests/ParserHelperTests.cpp
+2 −2 tests/ParserTests.cpp
+1 −1 tests/StringUtilsTests.cpp
+1 −1 tests/iconvliteTests.cpp
+1 −1 tests/test_main.cpp
+142 −0 zip/zip.vcxproj
+30 −0 zip/zip.vcxproj.filters
+4 −0 zip/zip.vcxproj.user
41 changes: 21 additions & 20 deletions src/configuration/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@



#include <string>
#include <external/commonItems/ConverterVersion.h>
#include <external/commonItems/OSCompatibilityLayer.h>
#include <external/fmt/include/fmt/format.h>

#include "external/commonItems/ConverterVersion.h"
#include "external/commonItems/OSCompatibilityLayer.h"
#include "external/fmt/include/fmt/format.h"
#include <filesystem>
#include <string>



Expand All @@ -23,12 +24,12 @@ enum class UseStories

struct Configuration
{
std::string vic3_directory;
std::string vic3_steam_mod_path;
std::string vic3_mod_path;
std::string hoi4_directory;
std::string hoi4_mod_path;
std::string save_game;
std::filesystem::path vic3_directory;
std::filesystem::path vic3_steam_mod_path;
std::filesystem::path vic3_mod_path;
std::filesystem::path hoi4_directory;
std::filesystem::path hoi4_mod_path;
std::filesystem::path save_game;
bool debug = false;
std::string output_name;
bool dynamic_resources = true;
Expand All @@ -38,32 +39,32 @@ struct Configuration
{
if (!commonItems::DoesFolderExist(vic3_directory))
{
throw std::runtime_error(fmt::format("Victoria 3 path {} doesn't exist.", vic3_directory));
throw std::runtime_error(fmt::format("Victoria 3 path {} doesn't exist.", vic3_directory.string()));
}
if (!commonItems::DoesFileExist(vic3_directory + "/binaries/victoria3.exe") &&
!commonItems::DoesFileExist(vic3_directory + "/binaries/victoria3"))
if (!commonItems::DoesFileExist(vic3_directory / "binaries/victoria3.exe") &&
!commonItems::DoesFileExist(vic3_directory / "binaries/victoria3"))
{
throw std::runtime_error(fmt::format("{} does not contain Victoria 3.", vic3_directory));
throw std::runtime_error(fmt::format("{} does not contain Victoria 3.", vic3_directory.string()));
}
}

void verifyHOI4Path()
{
if (!commonItems::DoesFolderExist(hoi4_directory))
{
throw std::runtime_error(fmt::format("Hearts of Iron 4 path {} doesn't exist.", hoi4_directory));
throw std::runtime_error(fmt::format("Hearts of Iron 4 path {} doesn't exist.", hoi4_directory.string()));
}
if (!commonItems::DoesFileExist(hoi4_directory + "/hoi4.exe") &&
!commonItems::DoesFileExist(hoi4_directory + "/hoi4"))
if (!commonItems::DoesFileExist(hoi4_directory / "hoi4.exe") &&
!commonItems::DoesFileExist(hoi4_directory / "hoi4"))
{
throw std::runtime_error(fmt::format("{} does not contain Hearts of Iron 4.", hoi4_directory));
throw std::runtime_error(fmt::format("{} does not contain Hearts of Iron 4.", hoi4_directory.string()));
}
}

void verifyVic3Version(const commonItems::ConverterVersion& converterVersion) const
{
const auto V3Version =
GameVersion::extractVersionFromLauncher(vic3_directory + "/launcher/launcher-settings.json");
GameVersion::extractVersionFromLauncher(vic3_directory / "launcher/launcher-settings.json");
if (!V3Version)
{
Log(LogLevel::Error) << "Vic3 version could not be determined, proceeding blind!";
Expand All @@ -89,7 +90,7 @@ struct Configuration

void verifyHOI4Version(const commonItems::ConverterVersion& converterVersion) const
{
const auto HOI4Version = GameVersion::extractVersionFromLauncher(hoi4_directory + "/launcher-settings.json");
const auto HOI4Version = GameVersion::extractVersionFromLauncher(hoi4_directory / "launcher-settings.json");
if (!HOI4Version)
{
Log(LogLevel::Error) << "HOI4 version could not be determined, proceeding blind!";
Expand Down
25 changes: 13 additions & 12 deletions src/configuration/configuration_importer.cpp
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
#include "src/configuration/configuration_importer.h"

#include "external/commonItems/CommonFunctions.h"
#include "external/commonItems/Log.h"
#include "external/commonItems/OSCompatibilityLayer.h"
#include "external/commonItems/ParserHelpers.h"
#include "external/fmt/include/fmt/format.h"
#include <external/commonItems/CommonFunctions.h>
#include <external/commonItems/Log.h>
#include <external/commonItems/OSCompatibilityLayer.h>
#include <external/commonItems/ParserHelpers.h>
#include <external/fmt/include/fmt/format.h>



using std::filesystem::path;



namespace
{

std::string DetermineOutputName(std::string_view save_name)
std::string DetermineOutputName(const path& save_name)
{
std::string output_name = trimPath(std::string(save_name));
if (getExtension(output_name) != "v3")
if (save_name.extension() != ".v3")
{
throw std::invalid_argument("The save was not a Vic3 save. Choose a save ending in '.v3' and convert again.");
}

output_name = trimExtension(output_name);

return output_name;
return save_name.stem().string();
}

} // namespace


configuration::Configuration configuration::ImportConfiguration(std::string_view configuration_file,
configuration::Configuration configuration::ImportConfiguration(const path& configuration_file,
const commonItems::ConverterVersion& converter_version)
{
commonItems::parser configuration_parser;
Expand Down
6 changes: 4 additions & 2 deletions src/configuration/configuration_importer.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@



#include <external/commonItems/Parser.h>

#include <filesystem>
#include <string_view>

#include "external/commonItems/Parser.h"
#include "src/configuration/configuration.h"



namespace configuration
{

[[nodiscard]] Configuration ImportConfiguration(std::string_view configuration_file,
[[nodiscard]] Configuration ImportConfiguration(const std::filesystem::path& configuration_file,
const commonItems::ConverterVersion& converter_version);

} // namespace configuration
Expand Down
17 changes: 9 additions & 8 deletions src/configuration/configuration_importer_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h"
#include "external/commonItems/external/googletest/googletest/include/gtest/gtest.h"
#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>

#include "src/configuration/configuration_importer.h"


Expand Down Expand Up @@ -86,13 +87,13 @@ TEST(ConfigurationTest, ItemsAreLoggedWhenImported)
const auto _ =
ImportConfiguration("test_files/configuration/test_configuration.txt", commonItems::ConverterVersion());

EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 install path is test_files/test_folders/vic3_folder)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 Steam mod path is vic3_steam_mod_directory)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 mod path is vic3_mod_directory)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 install path is "test_files/test_folders/vic3_folder")"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 Steam mod path is "vic3_steam_mod_directory")"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Victoria 3 mod path is "vic3_mod_directory")"));
EXPECT_THAT(log.str(),
testing::HasSubstr(R"(Hearts of Iron 4 install path is test_files/test_folders/hoi4_folder)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Hearts of Iron 4 mod path is hoi4_mod_directory)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Save game is test_save.v3)"));
testing::HasSubstr(R"(Hearts of Iron 4 install path is "test_files/test_folders/hoi4_folder")"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Hearts of Iron 4 mod path is "hoi4_mod_directory")"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Save game is "test_save.v3")"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Debug is active)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Using output name test_output_name)"));
EXPECT_THAT(log.str(), testing::HasSubstr(R"(Dynamic resources is not active)"));
Expand Down
9 changes: 5 additions & 4 deletions src/hoi4_world/characters/hoi4_character_converter.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "src/hoi4_world/characters/hoi4_character_converter.h"

#include "external/commonItems/Log.h"
#include "external/fmt/include/fmt/format.h"
#include <external/commonItems/Log.h>
#include <external/fmt/include/fmt/format.h>



Expand Down Expand Up @@ -41,8 +41,9 @@ std::optional<hoi4::General> GeneratePossibleGeneral(const vic3::Character& sour
return character_trait_mapper.GetGeneralMappedData(source_character.GetTraits(),
field_marshal_ids.contains(source_character.GetId()));
}


std::optional<hoi4::Advisor> GeneratePossibleAdvisor(const vic3::Character& source_character,
const std::optional<hoi4::Leader>& is_leader,
const std::set<int>& advisor_ids,
const mappers::CharacterTraitMapper& character_trait_mapper)
{
Expand Down Expand Up @@ -241,7 +242,7 @@ hoi4::Character hoi4::ConvertCharacter(const vic3::Character& source_character,
character_trait_mapper);
std::optional<Leader> leader_data = GeneratePossibleLeader(source_character, sub_ideology, leader_id);
std::optional<Advisor> advisor_data =
GeneratePossibleAdvisor(source_character, leader_data, role_ids.advisor_ids, character_trait_mapper);
GeneratePossibleAdvisor(source_character, role_ids.advisor_ids, character_trait_mapper);
std::optional<Spy> spy_data =
GeneratePossibleSpy(source_character, tag, country_mapper, role_ids.spy_ids, character_trait_mapper);

Expand Down
5 changes: 3 additions & 2 deletions src/hoi4_world/characters/hoi4_character_converter_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h"
#include "external/commonItems/external/googletest/googletest/include/gtest/gtest.h"
#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>

#include "hoi4_character_converter.h"
#include "src/mappers/character/character_trait_mapper_importer.h"

Expand Down
5 changes: 3 additions & 2 deletions src/hoi4_world/characters/hoi4_character_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h"
#include "external/commonItems/external/googletest/googletest/include/gtest/gtest.h"
#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>

#include "src/hoi4_world/characters/hoi4_character.h"


Expand Down
5 changes: 3 additions & 2 deletions src/hoi4_world/characters/hoi4_characters_converter.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#include "src/hoi4_world/characters/hoi4_characters_converter.h"

#include <external/commonItems/Log.h>
#include <external/fmt/include/fmt/format.h>

#include <algorithm>
#include <random>
#include <ranges>

#include "external/commonItems/Log.h"
#include "external/fmt/include/fmt/format.h"
#include "src/hoi4_world/characters/hoi4_character_converter.h"


Expand Down
7 changes: 4 additions & 3 deletions src/hoi4_world/characters/hoi4_characters_converter_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include <ranges>
#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>

#include <ranges>

#include "external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h"
#include "external/commonItems/external/googletest/googletest/include/gtest/gtest.h"
#include "src/hoi4_world/characters/hoi4_characters_converter.h"
#include "src/mappers/character/character_trait_mapper_importer.h"
#include "src/mappers/character/leader_type_mapper_importer.h"
Expand Down
Loading

0 comments on commit 66d4e2b

Please sign in to comment.