From 4fc75979ec0d1cf68e635cae138d91ae96a96c6e Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sun, 29 Oct 2017 14:54:07 +0000 Subject: [PATCH] Move yaml headers out of API LOOT no longer needs them, so don't expose implementation details. --- CMakeLists.txt | 16 ++++++++-------- src/api/api_database.cpp | 2 +- src/api/metadata/file.cpp | 2 +- {include/loot => src/api/metadata}/yaml/file.h | 0 .../loot => src/api/metadata}/yaml/location.h | 0 .../loot => src/api/metadata}/yaml/message.h | 0 .../api/metadata}/yaml/message_content.h | 0 .../api/metadata}/yaml/plugin_cleaning_data.h | 0 .../api/metadata}/yaml/plugin_metadata.h | 14 +++++++------- {include/loot => src/api/metadata}/yaml/set.h | 0 {include/loot => src/api/metadata}/yaml/tag.h | 0 src/api/metadata_list.cpp | 2 +- .../internals/helpers/yaml_set_helpers_test.h | 2 +- src/tests/api/internals/metadata/file_test.h | 2 +- src/tests/api/internals/metadata/location_test.h | 2 +- .../internals/metadata/message_content_test.h | 2 +- src/tests/api/internals/metadata/message_test.h | 2 +- .../metadata/plugin_cleaning_data_test.h | 2 +- .../internals/metadata/plugin_metadata_test.h | 2 +- src/tests/api/internals/metadata/tag_test.h | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) rename {include/loot => src/api/metadata}/yaml/file.h (100%) rename {include/loot => src/api/metadata}/yaml/location.h (100%) rename {include/loot => src/api/metadata}/yaml/message.h (100%) rename {include/loot => src/api/metadata}/yaml/message_content.h (100%) rename {include/loot => src/api/metadata}/yaml/plugin_cleaning_data.h (100%) rename {include/loot => src/api/metadata}/yaml/plugin_metadata.h (95%) rename {include/loot => src/api/metadata}/yaml/set.h (100%) rename {include/loot => src/api/metadata}/yaml/tag.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6561b363..92930bea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,20 +200,20 @@ set (LOOT_API_HEADERS "${CMAKE_SOURCE_DIR}/include/loot/api.h" "${CMAKE_SOURCE_DIR}/include/loot/metadata/plugin_metadata.h" "${CMAKE_SOURCE_DIR}/include/loot/metadata/priority.h" "${CMAKE_SOURCE_DIR}/include/loot/metadata/tag.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/file.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/location.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/message.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/message_content.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/plugin_cleaning_data.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/plugin_metadata.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/set.h" - "${CMAKE_SOURCE_DIR}/include/loot/yaml/tag.h" "${CMAKE_SOURCE_DIR}/include/loot/plugin_interface.h" "${CMAKE_SOURCE_DIR}/include/loot/struct/masterlist_info.h" "${CMAKE_SOURCE_DIR}/include/loot/struct/simple_message.h" "${CMAKE_SOURCE_DIR}/src/api/api_database.h" "${CMAKE_SOURCE_DIR}/src/api/metadata/condition_evaluator.h" "${CMAKE_SOURCE_DIR}/src/api/metadata/condition_grammar.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/file.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/location.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/message.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/message_content.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/plugin_cleaning_data.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/plugin_metadata.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/set.h" + "${CMAKE_SOURCE_DIR}/src/api/metadata/yaml/tag.h" "${CMAKE_SOURCE_DIR}/src/api/game/game.h" "${CMAKE_SOURCE_DIR}/src/api/game/game_cache.h" "${CMAKE_SOURCE_DIR}/src/api/game/load_order_handler.h" diff --git a/src/api/api_database.cpp b/src/api/api_database.cpp index fe527e53..6c80e6be 100644 --- a/src/api/api_database.cpp +++ b/src/api/api_database.cpp @@ -30,7 +30,7 @@ #include #include "loot/exception/file_access_error.h" -#include "loot/yaml/plugin_metadata.h" +#include "api/metadata/yaml/plugin_metadata.h" #include "api/game/game.h" #include "api/metadata/condition_evaluator.h" #include "api/plugin/plugin_sorter.h" diff --git a/src/api/metadata/file.cpp b/src/api/metadata/file.cpp index c69b041c..49448a7b 100644 --- a/src/api/metadata/file.cpp +++ b/src/api/metadata/file.cpp @@ -26,7 +26,7 @@ #include -#include "loot/yaml/file.h" +#include "api/metadata/yaml/file.h" namespace loot { File::File() {} diff --git a/include/loot/yaml/file.h b/src/api/metadata/yaml/file.h similarity index 100% rename from include/loot/yaml/file.h rename to src/api/metadata/yaml/file.h diff --git a/include/loot/yaml/location.h b/src/api/metadata/yaml/location.h similarity index 100% rename from include/loot/yaml/location.h rename to src/api/metadata/yaml/location.h diff --git a/include/loot/yaml/message.h b/src/api/metadata/yaml/message.h similarity index 100% rename from include/loot/yaml/message.h rename to src/api/metadata/yaml/message.h diff --git a/include/loot/yaml/message_content.h b/src/api/metadata/yaml/message_content.h similarity index 100% rename from include/loot/yaml/message_content.h rename to src/api/metadata/yaml/message_content.h diff --git a/include/loot/yaml/plugin_cleaning_data.h b/src/api/metadata/yaml/plugin_cleaning_data.h similarity index 100% rename from include/loot/yaml/plugin_cleaning_data.h rename to src/api/metadata/yaml/plugin_cleaning_data.h diff --git a/include/loot/yaml/plugin_metadata.h b/src/api/metadata/yaml/plugin_metadata.h similarity index 95% rename from include/loot/yaml/plugin_metadata.h rename to src/api/metadata/yaml/plugin_metadata.h index 6e46fd07..a9723b9d 100644 --- a/include/loot/yaml/plugin_metadata.h +++ b/src/api/metadata/yaml/plugin_metadata.h @@ -35,13 +35,13 @@ #include "loot/metadata/plugin_metadata.h" -#include "loot/yaml/file.h" -#include "loot/yaml/location.h" -#include "loot/yaml/message_content.h" -#include "loot/yaml/message.h" -#include "loot/yaml/plugin_cleaning_data.h" -#include "loot/yaml/set.h" -#include "loot/yaml/tag.h" +#include "api/metadata/yaml/file.h" +#include "api/metadata/yaml/location.h" +#include "api/metadata/yaml/message_content.h" +#include "api/metadata/yaml/message.h" +#include "api/metadata/yaml/plugin_cleaning_data.h" +#include "api/metadata/yaml/set.h" +#include "api/metadata/yaml/tag.h" namespace YAML { template<> diff --git a/include/loot/yaml/set.h b/src/api/metadata/yaml/set.h similarity index 100% rename from include/loot/yaml/set.h rename to src/api/metadata/yaml/set.h diff --git a/include/loot/yaml/tag.h b/src/api/metadata/yaml/tag.h similarity index 100% rename from include/loot/yaml/tag.h rename to src/api/metadata/yaml/tag.h diff --git a/src/api/metadata_list.cpp b/src/api/metadata_list.cpp index bec6d1bb..b1168b8f 100644 --- a/src/api/metadata_list.cpp +++ b/src/api/metadata_list.cpp @@ -29,7 +29,7 @@ #include #include "loot/exception/file_access_error.h" -#include "loot/yaml/plugin_metadata.h" +#include "api/metadata/yaml/plugin_metadata.h" #include "api/game/game.h" #include "api/metadata/condition_evaluator.h" diff --git a/src/tests/api/internals/helpers/yaml_set_helpers_test.h b/src/tests/api/internals/helpers/yaml_set_helpers_test.h index 50cb9db5..874b1bba 100644 --- a/src/tests/api/internals/helpers/yaml_set_helpers_test.h +++ b/src/tests/api/internals/helpers/yaml_set_helpers_test.h @@ -25,7 +25,7 @@ along with LOOT. If not, see #ifndef LOOT_TESTS_API_INTERNALS_HELPERS_YAML_SET_HELPERS_TEST #define LOOT_TESTS_API_INTERNALS_HELPERS_YAML_SET_HELPERS_TEST -#include "loot/yaml/set.h" +#include "api/metadata/yaml/set.h" #include diff --git a/src/tests/api/internals/metadata/file_test.h b/src/tests/api/internals/metadata/file_test.h index 92c8c4c0..e15fc66a 100644 --- a/src/tests/api/internals/metadata/file_test.h +++ b/src/tests/api/internals/metadata/file_test.h @@ -29,7 +29,7 @@ along with LOOT. If not, see #include -#include "loot/yaml/file.h" +#include "api/metadata/yaml/file.h" namespace loot { namespace test { diff --git a/src/tests/api/internals/metadata/location_test.h b/src/tests/api/internals/metadata/location_test.h index 9c5fbfd1..241c1cc3 100644 --- a/src/tests/api/internals/metadata/location_test.h +++ b/src/tests/api/internals/metadata/location_test.h @@ -29,7 +29,7 @@ along with LOOT. If not, see #include -#include "loot/yaml/location.h" +#include "api/metadata/yaml/location.h" namespace loot { namespace test { diff --git a/src/tests/api/internals/metadata/message_content_test.h b/src/tests/api/internals/metadata/message_content_test.h index 97b59cb9..9e78caa1 100644 --- a/src/tests/api/internals/metadata/message_content_test.h +++ b/src/tests/api/internals/metadata/message_content_test.h @@ -29,7 +29,7 @@ along with LOOT. If not, see #include -#include "loot/yaml/message_content.h" +#include "api/metadata/yaml/message_content.h" namespace loot { namespace test { diff --git a/src/tests/api/internals/metadata/message_test.h b/src/tests/api/internals/metadata/message_test.h index fdb203da..60b1856d 100644 --- a/src/tests/api/internals/metadata/message_test.h +++ b/src/tests/api/internals/metadata/message_test.h @@ -28,7 +28,7 @@ along with LOOT. If not, see #include "loot/metadata/message.h" #include "api/game/game.h" -#include "loot/yaml/message.h" +#include "api/metadata/yaml/message.h" #include "tests/common_game_test_fixture.h" namespace loot { diff --git a/src/tests/api/internals/metadata/plugin_cleaning_data_test.h b/src/tests/api/internals/metadata/plugin_cleaning_data_test.h index f93c7390..d7fcbf0c 100644 --- a/src/tests/api/internals/metadata/plugin_cleaning_data_test.h +++ b/src/tests/api/internals/metadata/plugin_cleaning_data_test.h @@ -28,7 +28,7 @@ along with LOOT. If not, see #include "loot/metadata/plugin_cleaning_data.h" #include "api/game/game.h" -#include "loot/yaml/plugin_cleaning_data.h" +#include "api/metadata/yaml/plugin_cleaning_data.h" #include "tests/common_game_test_fixture.h" namespace loot { diff --git a/src/tests/api/internals/metadata/plugin_metadata_test.h b/src/tests/api/internals/metadata/plugin_metadata_test.h index 18196876..44f904b0 100644 --- a/src/tests/api/internals/metadata/plugin_metadata_test.h +++ b/src/tests/api/internals/metadata/plugin_metadata_test.h @@ -29,7 +29,7 @@ along with LOOT. If not, see #include "tests/common_game_test_fixture.h" -#include "loot/yaml/plugin_metadata.h" +#include "api/metadata/yaml/plugin_metadata.h" namespace loot { namespace test { diff --git a/src/tests/api/internals/metadata/tag_test.h b/src/tests/api/internals/metadata/tag_test.h index c89bbfbd..0cdbf9f8 100644 --- a/src/tests/api/internals/metadata/tag_test.h +++ b/src/tests/api/internals/metadata/tag_test.h @@ -29,7 +29,7 @@ along with LOOT. If not, see #include -#include "loot/yaml/tag.h" +#include "api/metadata/yaml/tag.h" namespace loot { namespace test {