From fe67e3fc54bb48405d04b12d564e4154962e2d63 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 13 Jun 2015 23:22:31 +0100 Subject: [PATCH] Moved helpers into subfolder. --- CMakeLists.txt | 20 ++++++++++---------- src/api/api.cpp | 2 +- src/backend/game/game.cpp | 4 ++-- src/backend/game/game_settings.cpp | 2 +- src/backend/git.cpp | 4 ++-- src/backend/globals.cpp.in | 2 +- src/backend/graph.cpp | 4 ++-- src/backend/{ => helpers}/helpers.cpp | 2 +- src/backend/{ => helpers}/helpers.h | 0 src/backend/{ => helpers}/json.h | 0 src/backend/{ => helpers}/language.cpp | 0 src/backend/{ => helpers}/language.h | 0 src/backend/{ => helpers}/streams.h | 0 src/backend/{ => helpers}/version.cpp | 0 src/backend/{ => helpers}/version.h | 0 src/backend/{ => helpers}/yaml_set_helpers.h | 0 src/backend/metadata/condition_grammar.h | 4 ++-- src/backend/metadata/message.cpp | 2 +- src/backend/metadata/message.h | 2 +- src/backend/metadata/message_content.cpp | 2 +- src/backend/metadata/message_content.h | 2 +- src/backend/metadata/plugin_metadata.cpp | 2 +- src/backend/metadata/plugin_metadata.h | 2 +- src/backend/metadata_list.cpp | 2 +- src/backend/plugin/plugin.cpp | 2 +- src/backend/plugin/plugin_loader.cpp | 2 +- src/gui/handler.cpp | 4 ++-- src/gui/loot_app.cpp | 4 ++-- src/gui/loot_handler.cpp | 4 ++-- src/gui/loot_state.cpp | 6 +++--- src/tests/fixtures.h | 2 +- 31 files changed, 41 insertions(+), 41 deletions(-) rename src/backend/{ => helpers}/helpers.cpp (99%) rename src/backend/{ => helpers}/helpers.h (100%) rename src/backend/{ => helpers}/json.h (100%) rename src/backend/{ => helpers}/language.cpp (100%) rename src/backend/{ => helpers}/language.h (100%) rename src/backend/{ => helpers}/streams.h (100%) rename src/backend/{ => helpers}/version.cpp (100%) rename src/backend/{ => helpers}/version.h (100%) rename src/backend/{ => helpers}/yaml_set_helpers.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c003b9f..7b498518 100644 --- a/CMakeLists.txt +++ b/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" diff --git a/src/api/api.cpp b/src/api/api.cpp index 24dcd9f0..d79e7a08 100644 --- a/src/api/api.cpp +++ b/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 diff --git a/src/backend/game/game.cpp b/src/backend/game/game.cpp index 99b66906..89743955 100644 --- a/src/backend/game/game.cpp +++ b/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 diff --git a/src/backend/game/game_settings.cpp b/src/backend/game/game_settings.cpp index e8726ab3..4209eb3c 100644 --- a/src/backend/game/game_settings.cpp +++ b/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 diff --git a/src/backend/git.cpp b/src/backend/git.cpp index f1bd007c..5baa0294 100644 --- a/src/backend/git.cpp +++ b/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 diff --git a/src/backend/globals.cpp.in b/src/backend/globals.cpp.in index bfd7edf9..4faa8850 100644 --- a/src/backend/globals.cpp.in +++ b/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. diff --git a/src/backend/graph.cpp b/src/backend/graph.cpp index 42791fff..0f7f42f0 100644 --- a/src/backend/graph.cpp +++ b/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 diff --git a/src/backend/helpers.cpp b/src/backend/helpers/helpers.cpp similarity index 99% rename from src/backend/helpers.cpp rename to src/backend/helpers/helpers.cpp index e00fcdd0..c8db8c64 100644 --- a/src/backend/helpers.cpp +++ b/src/backend/helpers/helpers.cpp @@ -23,7 +23,7 @@ */ #include "helpers.h" -#include "error.h" +#include "../error.h" #include "streams.h" #include diff --git a/src/backend/helpers.h b/src/backend/helpers/helpers.h similarity index 100% rename from src/backend/helpers.h rename to src/backend/helpers/helpers.h diff --git a/src/backend/json.h b/src/backend/helpers/json.h similarity index 100% rename from src/backend/json.h rename to src/backend/helpers/json.h diff --git a/src/backend/language.cpp b/src/backend/helpers/language.cpp similarity index 100% rename from src/backend/language.cpp rename to src/backend/helpers/language.cpp diff --git a/src/backend/language.h b/src/backend/helpers/language.h similarity index 100% rename from src/backend/language.h rename to src/backend/helpers/language.h diff --git a/src/backend/streams.h b/src/backend/helpers/streams.h similarity index 100% rename from src/backend/streams.h rename to src/backend/helpers/streams.h diff --git a/src/backend/version.cpp b/src/backend/helpers/version.cpp similarity index 100% rename from src/backend/version.cpp rename to src/backend/helpers/version.cpp diff --git a/src/backend/version.h b/src/backend/helpers/version.h similarity index 100% rename from src/backend/version.h rename to src/backend/helpers/version.h diff --git a/src/backend/yaml_set_helpers.h b/src/backend/helpers/yaml_set_helpers.h similarity index 100% rename from src/backend/yaml_set_helpers.h rename to src/backend/helpers/yaml_set_helpers.h diff --git a/src/backend/metadata/condition_grammar.h b/src/backend/metadata/condition_grammar.h index 9ecf33d7..5936e476 100644 --- a/src/backend/metadata/condition_grammar.h +++ b/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 diff --git a/src/backend/metadata/message.cpp b/src/backend/metadata/message.cpp index f6f046c5..071a7e65 100644 --- a/src/backend/metadata/message.cpp +++ b/src/backend/metadata/message.cpp @@ -23,7 +23,7 @@ */ #include "message.h" -#include "../language.h" +#include "../helpers/language.h" #include diff --git a/src/backend/metadata/message.h b/src/backend/metadata/message.h index b2319e6b..18e1cd35 100644 --- a/src/backend/metadata/message.h +++ b/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 #include diff --git a/src/backend/metadata/message_content.cpp b/src/backend/metadata/message_content.cpp index 024f8136..4a3a27c0 100644 --- a/src/backend/metadata/message_content.cpp +++ b/src/backend/metadata/message_content.cpp @@ -23,7 +23,7 @@ */ #include "message_content.h" -#include "../language.h" +#include "../helpers/language.h" #include diff --git a/src/backend/metadata/message_content.h b/src/backend/metadata/message_content.h index eb48af35..a36f0aff 100644 --- a/src/backend/metadata/message_content.h +++ b/src/backend/metadata/message_content.h @@ -24,7 +24,7 @@ #ifndef __LOOT_METADATA_MESSAGE_CONTENT__ #define __LOOT_METADATA_MESSAGE_CONTENT__ -#include "../language.h" +#include "../helpers/language.h" #include diff --git a/src/backend/metadata/plugin_metadata.cpp b/src/backend/metadata/plugin_metadata.cpp index e09f181f..187ed89c 100644 --- a/src/backend/metadata/plugin_metadata.cpp +++ b/src/backend/metadata/plugin_metadata.cpp @@ -24,7 +24,7 @@ #include "plugin_metadata.h" #include "../game/game.h" -#include "../helpers.h" +#include "../helpers/helpers.h" #include #include diff --git a/src/backend/metadata/plugin_metadata.h b/src/backend/metadata/plugin_metadata.h index 22b4f1a3..4a91d0b1 100644 --- a/src/backend/metadata/plugin_metadata.h +++ b/src/backend/metadata/plugin_metadata.h @@ -30,7 +30,7 @@ #include "message.h" #include "plugin_dirty_info.h" #include "tag.h" -#include "../yaml_set_helpers.h" +#include "../helpers/yaml_set_helpers.h" #include #include diff --git a/src/backend/metadata_list.cpp b/src/backend/metadata_list.cpp index e54e8649..0315d074 100644 --- a/src/backend/metadata_list.cpp +++ b/src/backend/metadata_list.cpp @@ -25,7 +25,7 @@ #include "metadata_list.h" #include "globals.h" #include "error.h" -#include "streams.h" +#include "helpers/streams.h" #include #include diff --git a/src/backend/plugin/plugin.cpp b/src/backend/plugin/plugin.cpp index 5c35bf7e..076db2ac 100644 --- a/src/backend/plugin/plugin.cpp +++ b/src/backend/plugin/plugin.cpp @@ -25,7 +25,7 @@ #include "plugin.h" #include "plugin_loader.h" #include "../game/game.h" -#include "../helpers.h" +#include "../helpers/helpers.h" #include #include diff --git a/src/backend/plugin/plugin_loader.cpp b/src/backend/plugin/plugin_loader.cpp index 8fb34254..ca9ad8e8 100644 --- a/src/backend/plugin/plugin_loader.cpp +++ b/src/backend/plugin/plugin_loader.cpp @@ -24,7 +24,7 @@ #include "plugin_loader.h" #include "../game/game.h" -#include "../helpers.h" +#include "../helpers/helpers.h" #include diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index cac0ecce..d5688d7d 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -29,8 +29,8 @@ #include "../backend/error.h" #include "../backend/globals.h" -#include "../backend/helpers.h" -#include "../backend/json.h" +#include "../backend/helpers/helpers.h" +#include "../backend/helpers/json.h" #include #include diff --git a/src/gui/loot_app.cpp b/src/gui/loot_app.cpp index e95e7120..1d6dba02 100644 --- a/src/gui/loot_app.cpp +++ b/src/gui/loot_app.cpp @@ -27,8 +27,8 @@ #include "scheme.h" #include "../backend/globals.h" -#include "../backend/helpers.h" -#include "../backend/language.h" +#include "../backend/helpers/helpers.h" +#include "../backend/helpers/language.h" #include #include diff --git a/src/gui/loot_handler.cpp b/src/gui/loot_handler.cpp index 6ff0d099..aa944cec 100644 --- a/src/gui/loot_handler.cpp +++ b/src/gui/loot_handler.cpp @@ -29,8 +29,8 @@ #include "../backend/error.h" #include "../backend/globals.h" -#include "../backend/helpers.h" -#include "../backend/json.h" +#include "../backend/helpers/helpers.h" +#include "../backend/helpers/json.h" #include #include diff --git a/src/gui/loot_state.cpp b/src/gui/loot_state.cpp index 471fe9bb..d4f2b55a 100644 --- a/src/gui/loot_state.cpp +++ b/src/gui/loot_state.cpp @@ -26,9 +26,9 @@ #include "../backend/error.h" #include "../backend/globals.h" -#include "../backend/helpers.h" -#include "../backend/language.h" -#include "../backend/streams.h" +#include "../backend/helpers/helpers.h" +#include "../backend/helpers/language.h" +#include "../backend/helpers/streams.h" #include #include diff --git a/src/tests/fixtures.h b/src/tests/fixtures.h index 92485f8b..b756cc6d 100644 --- a/src/tests/fixtures.h +++ b/src/tests/fixtures.h @@ -25,7 +25,7 @@ along with LOOT. If not, see #ifndef LOOT_TEST_FIXTURES #define LOOT_TEST_FIXTURES -#include "backend/streams.h" +#include "backend/helpers/streams.h" #include