Refactor API include headers

CMakeLists.txt

@@ -219,16 +219,16 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/app/loot_paths.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/helpers/yaml_set_helpers.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/api_decorator.h"
-                "${CMAKE_SOURCE_DIR}/include/loot/error_categories.h"
+                "${CMAKE_SOURCE_DIR}/include/loot/exception/error_categories.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/exception/condition_syntax_error.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/exception/cyclic_interaction_error.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/exception/file_access_error.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/exception/game_detection_error.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/exception/git_state_error.h"
-                "${CMAKE_SOURCE_DIR}/include/loot/game_type.h"
-                "${CMAKE_SOURCE_DIR}/include/loot/language_code.h"
+                "${CMAKE_SOURCE_DIR}/include/loot/enum/game_type.h"
+                "${CMAKE_SOURCE_DIR}/include/loot/enum/language_code.h"
                 "${CMAKE_SOURCE_DIR}/include/loot/loot_version.h"
-                "${CMAKE_SOURCE_DIR}/include/loot/message_type.h")
+                "${CMAKE_SOURCE_DIR}/include/loot/enum/message_type.h")
 
 set (LOOT_GUI_SRC "${CMAKE_SOURCE_DIR}/src/gui/main.cpp"
                   "${CMAKE_SOURCE_DIR}/src/gui/loot_handler.cpp"
@@ -282,20 +282,20 @@ set (LOOT_API_SRC "${CMAKE_BINARY_DIR}/generated/loot_version.cpp"
 set (LOOT_API_HEADERS "${CMAKE_SOURCE_DIR}/include/loot/api.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/api_decorator.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/database_interface.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/error_categories.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/exception/error_categories.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/exception/condition_syntax_error.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/exception/cyclic_interaction_error.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/exception/file_access_error.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/exception/game_detection_error.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/exception/git_state_error.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/game_type.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/language_code.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/enum/game_type.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/enum/language_code.h"
                       "${CMAKE_SOURCE_DIR}/include/loot/loot_version.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/masterlist_info.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/message_type.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/plugin_cleanliness.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/plugin_tags.h"
-                      "${CMAKE_SOURCE_DIR}/include/loot/simple_message.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/struct/masterlist_info.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/enum/message_type.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/enum/plugin_cleanliness.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/struct/plugin_tags.h"
+                      "${CMAKE_SOURCE_DIR}/include/loot/struct/simple_message.h"
                       "${CMAKE_SOURCE_DIR}/src/api/api_database.h")
 
 set (LOOT_VALIDATOR_SRC "${CMAKE_SOURCE_DIR}/src/validator/main.cpp")

include/loot/api.h

@@ -30,13 +30,13 @@
 
 #include "loot/api_decorator.h"
 #include "loot/database_interface.h"
-#include "loot/error_categories.h"
+#include "loot/exception/error_categories.h"
 #include "loot/exception/condition_syntax_error.h"
 #include "loot/exception/cyclic_interaction_error.h"
 #include "loot/exception/file_access_error.h"
 #include "loot/exception/game_detection_error.h"
 #include "loot/exception/git_state_error.h"
-#include "loot/game_type.h"
+#include "loot/enum/game_type.h"
 #include "loot/loot_version.h"
 
 namespace loot {

include/loot/database_interface.h

@@ -27,11 +27,11 @@
 #include <string>
 #include <vector>
 
-#include "loot/language_code.h"
-#include "loot/masterlist_info.h"
-#include "loot/plugin_cleanliness.h"
-#include "loot/plugin_tags.h"
-#include "loot/simple_message.h"
+#include "loot/enum/language_code.h"
+#include "loot/struct/masterlist_info.h"
+#include "loot/enum/plugin_cleanliness.h"
+#include "loot/struct/plugin_tags.h"
+#include "loot/struct/simple_message.h"
 
 namespace loot {
 /** @brief The interface provided by API's database handle. */

include/loot/struct/simple_message.h

@@ -24,7 +24,7 @@
 #ifndef LOOT_SIMPLE_MESSAGE
 #define LOOT_SIMPLE_MESSAGE
 
-#include "loot/message_type.h"
+#include "loot/enum/message_type.h"
 
 namespace loot {
 /** @brief A structure that holds the type of a message and the message string itself. */

src/backend/error_categories.cpp

@@ -22,7 +22,7 @@
     <https://www.gnu.org/licenses/>.
     */
 
-#include "loot/error_categories.h"
+#include "loot/exception/error_categories.h"
 
 namespace loot {
 namespace detail {

src/backend/game/game_settings.h

@@ -32,7 +32,7 @@
 #include <libespm/GameId.h>
 #include <yaml-cpp/yaml.h>
 
-#include "loot/game_type.h"
+#include "loot/enum/game_type.h"
 
 namespace loot {
 class GameSettings {

src/backend/game/load_order_handler.cpp

@@ -28,7 +28,7 @@
 #include <boost/locale.hpp>
 #include <boost/log/trivial.hpp>
 
-#include "loot/error_categories.h"
+#include "loot/exception/error_categories.h"
 
 using boost::locale::translate;
 using std::string;

src/backend/helpers/git_helper.cpp

@@ -28,7 +28,7 @@
 #include <boost/locale.hpp>
 #include <boost/log/trivial.hpp>
 
-#include "loot/error_categories.h"
+#include "loot/exception/error_categories.h"
 #include "loot/exception/git_state_error.h"
 
 using boost::locale::translate;

src/backend/helpers/language.h

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#include "loot/language_code.h"
+#include "loot/enum/language_code.h"
 
 namespace loot {
     //Language class for simpler language support.

src/backend/metadata/message.h

@@ -33,9 +33,9 @@
 
 #include "backend/metadata/conditional_metadata.h"
 #include "backend/metadata/message_content.h"
-#include "loot/language_code.h"
-#include "loot/message_type.h"
-#include "loot/simple_message.h"
+#include "loot/enum/language_code.h"
+#include "loot/enum/message_type.h"
+#include "loot/struct/simple_message.h"
 
 namespace loot {
 class Message : public ConditionalMetadata {

src/gui/editor_message.h

@@ -25,7 +25,7 @@
 #define LOOT_GUI_EDITOR_MESSAGE
 
 #include "backend/metadata/message.h"
-#include "loot/simple_message.h"
+#include "loot/struct/simple_message.h"
 
 namespace loot {
 struct EditorMessage : public SimpleMessage {

src/gui/yaml_simple_message_helpers.h

@@ -27,7 +27,7 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include "loot/simple_message.h"
+#include "loot/struct/simple_message.h"
 
 namespace YAML {
 template<>

src/tests/common_game_test_fixture.h

@@ -33,7 +33,7 @@ along with LOOT.  If not, see
 #include <boost/filesystem/fstream.hpp>
 #include <gtest/gtest.h>
 
-#include "loot/game_type.h"
+#include "loot/enum/game_type.h"
 
 namespace loot {
 namespace test {