Moved helpers into subfolder.

CMakeLists.txt

@@ -93,9 +93,9 @@ set (LOOT_SRC   "${CMAKE_SOURCE_DIR}/src/backend/metadata/conditional_metadata.c
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/helpers.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/language.cpp"
-                "${CMAKE_SOURCE_DIR}/src/backend/version.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.cpp"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/graph.cpp"
                 "${CMAKE_SOURCE_DIR}/src/backend/git.cpp"
                 "${CMAKE_BINARY_DIR}/generated/globals.cpp")
@@ -117,14 +117,14 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/metadata/condition_grammar.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/masterlist.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_loader.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/helpers.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/language.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/version.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/streams.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.h"
+                "${CMAKE_SOURCE_DIR}/src/backend/helpers/yaml_set_helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/globals.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/yaml_set_helpers.h"
                 "${CMAKE_SOURCE_DIR}/src/backend/graph.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/error.h"
-                "${CMAKE_SOURCE_DIR}/src/backend/streams.h")
+                "${CMAKE_SOURCE_DIR}/src/backend/error.h")
 
 set (LOOT_GUI_SRC ${LOOT_SRC}
                   "${CMAKE_SOURCE_DIR}/src/gui/main_win.cpp"
@@ -137,7 +137,7 @@ set (LOOT_GUI_SRC ${LOOT_SRC}
 
 set (LOOT_GUI_HEADERS ${LOOT_HEADERS}
                   # Code the API doesn't need.
-                  "${CMAKE_SOURCE_DIR}/src/backend/json.h"
+                  "${CMAKE_SOURCE_DIR}/src/backend/helpers/json.h"
                   # Actual GUI code.
                   "${CMAKE_SOURCE_DIR}/src/gui/handler.h"
                   "${CMAKE_SOURCE_DIR}/src/gui/loot_handler.h"

src/api/api.cpp

@@ -26,7 +26,7 @@
 #include "../backend/game/game.h"
 #include "../backend/globals.h"
 #include "../backend/error.h"
-#include "../backend/streams.h"
+#include "../backend/helpers/streams.h"
 
 #include <yaml-cpp/yaml.h>
 

src/backend/game/game.cpp

@@ -24,9 +24,9 @@
 
 #include "game.h"
 #include "../globals.h"
-#include "../helpers.h"
+#include "../helpers/helpers.h"
 #include "../error.h"
-#include "../streams.h"
+#include "../helpers/streams.h"
 #include "../graph.h"
 
 #include <boost/algorithm/string.hpp>

src/backend/game/game_settings.cpp

@@ -24,7 +24,7 @@
 
 #include "game_settings.h"
 #include "../globals.h"
-#include "../helpers.h"
+#include "../helpers/helpers.h"
 #include "../error.h"
 
 #include <boost/algorithm/string.hpp>

src/backend/git.cpp

@@ -23,8 +23,8 @@
     */
 
 #include "error.h"
-#include "streams.h"
-#include "helpers.h"
+#include "helpers/streams.h"
+#include "helpers/helpers.h"
 #include "game/game.h"
 
 #include <boost/log/trivial.hpp>

src/backend/globals.cpp.in

@@ -23,7 +23,7 @@
     */
 
 #include "backend/globals.h"
-#include "backend/helpers.h"
+#include "backend/helpers/helpers.h"
 
 namespace loot {
     //Version numbers.

src/backend/graph.cpp

@@ -24,8 +24,8 @@
 
 #include "error.h"
 #include "graph.h"
-#include "streams.h"
-#include "helpers.h"
+#include "helpers/streams.h"
+#include "helpers/helpers.h"
 
 #include <cstdlib>
 

src/backend/helpers/helpers.cpp

@@ -23,7 +23,7 @@
     */
 
 #include "helpers.h"
-#include "error.h"
+#include "../error.h"
 #include "streams.h"
 
 #include <boost/spirit/include/karma.hpp>

src/backend/metadata/condition_grammar.h

@@ -34,9 +34,9 @@
 #endif
 
 #include "../game/game.h"
-#include "../helpers.h"
+#include "../helpers/helpers.h"
 #include "../plugin/plugin.h"
-#include "../version.h"
+#include "../helpers/version.h"
 #include "../error.h"
 
 #include <cstdint>

src/backend/metadata/message.cpp

@@ -23,7 +23,7 @@
     */
 
 #include "message.h"
-#include "../language.h"
+#include "../helpers/language.h"
 
 #include <boost/log/trivial.hpp>
 

src/backend/metadata/message.h

@@ -26,7 +26,7 @@
 
 #include "conditional_metadata.h"
 #include "message_content.h"
-#include "../language.h"
+#include "../helpers/language.h"
 
 #include <string>
 #include <vector>

src/backend/metadata/message_content.cpp

@@ -23,7 +23,7 @@
     */
 
 #include "message_content.h"
-#include "../language.h"
+#include "../helpers/language.h"
 
 #include <boost/algorithm/string.hpp>