Moving include files to have proper include statement

guillaumeLepape · Nov 3, 2023 · 93e85c2 · 93e85c2
1 parent c716783
commit 93e85c2
Show file tree

Hide file tree

Showing 81 changed files with 256 additions and 256 deletions.
diff --git a/src/action/include/action_writer.h → .../include/elevation/action/action_writer.h b/src/action/include/action_writer.h → .../include/elevation/action/action_writer.h
@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "concept.h"
-#include "pause.h"
+#include "elevation/utils/concept.h"
+#include "elevation/utils/pause.h"
 
 namespace action {
 namespace statement {

diff --git a/src/action/include/add_weapon.h → ...ion/include/elevation/action/add_weapon.h b/src/action/include/add_weapon.h → ...ion/include/elevation/action/add_weapon.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "action_writer.h"
-#include "concept.h"
-#include "player.h"
-#include "plug.h"
-#include "weapon.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/entity/player.h"
+#include "elevation/entity/plug.h"
+#include "elevation/utils/concept.h"
+#include "elevation/weapon/weapon.h"
 
 namespace action {
 class AddWeapon {

diff --git a/src/action/include/answer.h → src/action/include/elevation/action/answer.h b/src/action/include/answer.h → src/action/include/elevation/action/answer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/src/action/include/choose_plug.h → ...on/include/elevation/action/choose_plug.h b/src/action/include/choose_plug.h → ...on/include/elevation/action/choose_plug.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/src/action/include/dead.h → src/action/include/elevation/action/dead.h b/src/action/include/dead.h → src/action/include/elevation/action/dead.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "concept.h"
-#include "plug.h"
+#include "elevation/entity/plug.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable U>

diff --git a/src/action/include/game_over.h → ...tion/include/elevation/action/game_over.h b/src/action/include/game_over.h → ...tion/include/elevation/action/game_over.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "action_writer.h"
-#include "concept.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/...action/include/increase_max_life_points.h → ...evation/action/increase_max_life_points.h b/...action/include/increase_max_life_points.h → ...evation/action/increase_max_life_points.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable U>

diff --git a/src/action/include/information_combo.h → ...lude/elevation/action/information_combo.h b/src/action/include/information_combo.h → ...lude/elevation/action/information_combo.h
@@ -2,8 +2,8 @@
 
 #include <range/v3/algorithm/for_each.hpp>
 
-#include "combo_writer.h"
-#include "concept.h"
+#include "elevation/fight/combo_writer.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/...on/include/information_weapon_inventory.h → ...ion/action/information_weapon_inventory.h b/...on/include/information_weapon_inventory.h → ...ion/action/information_weapon_inventory.h
@@ -4,9 +4,9 @@
 
 #include <range/v3/algorithm/for_each.hpp>
 
-#include "concept.h"
-#include "utils_writer.h"
-#include "weapon_writer.h"
+#include "elevation/utils/concept.h"
+#include "elevation/weapon/weapon_writer.h"
+#include "elevation/writer/utils_writer.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/src/action/include/negociate.h → ...tion/include/elevation/action/negociate.h b/src/action/include/negociate.h → ...tion/include/elevation/action/negociate.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "action_writer.h"
-#include "concept.h"
-#include "languages.h"
-#include "message_writer.h"
-#include "pause.h"
-#include "player.h"
-#include "plug.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/data_files/languages.h"
+#include "elevation/entity/player.h"
+#include "elevation/entity/plug.h"
+#include "elevation/utils/concept.h"
+#include "elevation/utils/pause.h"
+#include "elevation/writer/message_writer.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/src/action/include/nothing.h → ...action/include/elevation/action/nothing.h b/src/action/include/nothing.h → ...action/include/elevation/action/nothing.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/src/action/include/plug_attack.h → ...on/include/elevation/action/plug_attack.h b/src/action/include/plug_attack.h → ...on/include/elevation/action/plug_attack.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 class PlugAttack {

diff --git a/src/action/include/pseudo.h → src/action/include/elevation/action/pseudo.h b/src/action/include/pseudo.h → src/action/include/elevation/action/pseudo.h
@@ -2,12 +2,12 @@
 
 #include <range/v3/algorithm/binary_search.hpp>
 
-#include "action_writer.h"
-#include "concept.h"
-#include "languages.h"
-#include "list_name_data.h"
-#include "message_writer.h"
-#include "player.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/data/list_name_data.h"
+#include "elevation/data_files/languages.h"
+#include "elevation/entity/player.h"
+#include "elevation/utils/concept.h"
+#include "elevation/writer/message_writer.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/src/action/include/regenerate_all_life.h → ...de/elevation/action/regenerate_all_life.h b/src/action/include/regenerate_all_life.h → ...de/elevation/action/regenerate_all_life.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "player.h"
+#include "elevation/entity/player.h"
 
 namespace action {
 class RegenerateAllLife {

diff --git a/src/action/include/regeneration.h → ...n/include/elevation/action/regeneration.h b/src/action/include/regeneration.h → ...n/include/elevation/action/regeneration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "player.h"
+#include "elevation/entity/player.h"
 
 namespace action {
 class Regeneration {

diff --git a/src/action/include/save_and_quit.h → .../include/elevation/action/save_and_quit.h b/src/action/include/save_and_quit.h → .../include/elevation/action/save_and_quit.h
@@ -2,8 +2,8 @@
 
 #include <iostream>
 
-#include "action_writer.h"
-#include "concept.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/src/action/include/use_weapon.h → ...ion/include/elevation/action/use_weapon.h b/src/action/include/use_weapon.h → ...ion/include/elevation/action/use_weapon.h
@@ -3,11 +3,11 @@
 #include <range/v3/algorithm/find_if.hpp>
 #include <range/v3/range/concepts.hpp>
 
-#include "action_writer.h"
-#include "dead.h"
-#include "languages.h"
-#include "player.h"
-#include "plug.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/action/dead.h"
+#include "elevation/data_files/languages.h"
+#include "elevation/entity/player.h"
+#include "elevation/entity/plug.h"
 
 namespace action {
 class UseWeapon {

diff --git a/src/beginning/include/game_engine.h → ...include/elevation/beginning/game_engine.h b/src/beginning/include/game_engine.h → ...include/elevation/beginning/game_engine.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "options.h"
+#include "elevation/utils/options.h"
 
 namespace game_engine {
 void launch(const utils::Options& options, const std::string& game_id);

diff --git a/src/beginning/include/load_game.h → ...g/include/elevation/beginning/load_game.h b/src/beginning/include/load_game.h → ...g/include/elevation/beginning/load_game.h
@@ -2,11 +2,11 @@
 
 #include <fmt/color.h>
 
-#include "concept.h"
-#include "game_engine.h"
-#include "options.h"
-#include "results.h"
-#include "selection.h"
+#include "elevation/beginning/game_engine.h"
+#include "elevation/entity/results.h"
+#include "elevation/selection/selection.h"
+#include "elevation/utils/concept.h"
+#include "elevation/utils/options.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/src/beginning/include/quit.h → ...inning/include/elevation/beginning/quit.h b/src/beginning/include/quit.h → ...inning/include/elevation/beginning/quit.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "action_writer.h"
-#include "concept.h"
+#include "elevation/action/action_writer.h"
+#include "elevation/utils/concept.h"
 
 namespace action {
 template <utils::Printable T, utils::Printable U>

diff --git a/src/beginning/include/start_game.h → .../include/elevation/beginning/start_game.h b/src/beginning/include/start_game.h → .../include/elevation/beginning/start_game.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "concept.h"
-#include "game_engine.h"
-#include "id.h"
-#include "options.h"
-#include "results.h"
+#include "elevation/beginning/game_engine.h"
+#include "elevation/entity/results.h"
+#include "elevation/utils/concept.h"
+#include "elevation/utils/id.h"
+#include "elevation/utils/options.h"
 
 namespace action {
 template <utils::Printable T>

diff --git a/src/beginning/src/game_engine.cpp b/src/beginning/src/game_engine.cpp
@@ -1,20 +1,20 @@
-#include "game_engine.h"
+#include "elevation/beginning/game_engine.h"
 
-#include "introduction.h"
-#include "level1.h"
-#include "level10.h"
-#include "level2.h"
-#include "level3.h"
-#include "level4.h"
-#include "level5.h"
-#include "level6.h"
-#include "level7.h"
-#include "level8.h"
-#include "level9.h"
-#include "level_utils.h"
-#include "outro.h"
-#include "player.h"
-#include "results.h"
+#include "elevation/entity/player.h"
+#include "elevation/entity/results.h"
+#include "elevation/level/introduction.h"
+#include "elevation/level/level1.h"
+#include "elevation/level/level10.h"
+#include "elevation/level/level2.h"
+#include "elevation/level/level3.h"
+#include "elevation/level/level4.h"
+#include "elevation/level/level5.h"
+#include "elevation/level/level6.h"
+#include "elevation/level/level7.h"
+#include "elevation/level/level8.h"
+#include "elevation/level/level9.h"
+#include "elevation/level/level_utils.h"
+#include "elevation/level/outro.h"
 
 namespace game_engine {
 void launch(const utils::Options& options, const std::string& game_id) {

diff --git a/src/data/include/data.h → src/data/include/elevation/data/data.h b/src/data/include/data.h → src/data/include/elevation/data/data.h
@@ -5,7 +5,7 @@
 #include <fstream>
 #include <nlohmann/json.hpp>
 
-#include "concept.h"
+#include "elevation/utils/concept.h"
 
 namespace data {
 template <utils::Printable T>

diff --git a/src/data/include/list_name_data.h → ...a/include/elevation/data/list_name_data.h b/src/data/include/list_name_data.h → ...a/include/elevation/data/list_name_data.h
diff --git a/src/data/src/list_name_data.cpp b/src/data/src/list_name_data.cpp
@@ -1,8 +1,8 @@
-#include "list_name_data.h"
+#include "elevation/data/list_name_data.h"
 
 #include <fstream>
 
-#include "data.h"
+#include "elevation/data/data.h"
 
 namespace data {
 std::set<std::string> read_list_name(fs::path&& file_path) {

diff --git a/src/data_files/include/french_data.h → ...nclude/elevation/data_files/french_data.h b/src/data_files/include/french_data.h → ...nclude/elevation/data_files/french_data.h
diff --git a/src/data_files/include/languages.h → .../include/elevation/data_files/languages.h b/src/data_files/include/languages.h → .../include/elevation/data_files/languages.h
@@ -4,5 +4,5 @@
 #define FRENCH
 
 #ifdef FRENCH
-#  include "french_data.h"
+#  include "elevation/data_files/french_data.h"
 #endif
diff --git a/src/entity/include/health_bar.h → ...ity/include/elevation/entity/health_bar.h b/src/entity/include/health_bar.h → ...ity/include/elevation/entity/health_bar.h
diff --git a/src/entity/include/player.h → src/entity/include/elevation/entity/player.h b/src/entity/include/player.h → src/entity/include/elevation/entity/player.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "health_bar.h"
-#include "weapon.h"
+#include "elevation/entity/health_bar.h"
+#include "elevation/weapon/weapon.h"
 
 static constexpr int MAX_LIFE_POINTS_PLAYER = 100;
 

diff --git a/src/entity/include/plug.h → src/entity/include/elevation/entity/plug.h b/src/entity/include/plug.h → src/entity/include/elevation/entity/plug.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "health_bar.h"
-#include "weapon.h"
+#include "elevation/entity/health_bar.h"
+#include "elevation/weapon/weapon.h"
 
 namespace entity {
 class Plug {

diff --git a/src/entity/include/results.h → ...entity/include/elevation/entity/results.h b/src/entity/include/results.h → ...entity/include/elevation/entity/results.h
@@ -5,8 +5,8 @@
 #include <filesystem>
 #include <fstream>
 
-#include "data.h"
-#include "player.h"
+#include "elevation/data/data.h"
+#include "elevation/entity/player.h"
 
 namespace fs = std::filesystem;
 

diff --git a/src/entity/src/player.cpp b/src/entity/src/player.cpp
@@ -1,9 +1,9 @@
-#include "player.h"
+#include "elevation/entity/player.h"
 
 #include <algorithm>
 #include <iostream>
 
-#include "results.h"
+#include "elevation/entity/results.h"
 
 namespace entity {
 Player::Player(const std::string& pseudo, int nbLevelSuceeded,

diff --git a/src/entity/src/plug.cpp b/src/entity/src/plug.cpp
@@ -1,4 +1,4 @@
-#include "plug.h"
+#include "elevation/entity/plug.h"
 
 namespace entity {
 Plug::Plug(const std::string& name, int nbLifePoints, weapon::Weapon&& weapon)

diff --git a/src/entity/src/results.cpp b/src/entity/src/results.cpp
@@ -1,4 +1,4 @@
-#include "results.h"
+#include "elevation/entity/results.h"
 
 #include <iomanip>
 #include <iostream>

diff --git a/src/fight/include/combo.h → src/fight/include/elevation/fight/combo.h b/src/fight/include/combo.h → src/fight/include/elevation/fight/combo.h
@@ -2,10 +2,10 @@
 
 #include <variant>
 
-#include "concept.h"
-#include "nothing.h"
-#include "selection.h"
-#include "use_weapon.h"
+#include "elevation/action/nothing.h"
+#include "elevation/action/use_weapon.h"
+#include "elevation/selection/selection.h"
+#include "elevation/utils/concept.h"
 
 template <utils::Printable T>
 class Combo {

diff --git a/...fight/include/combo_double_melee_weapon.h → ...evation/fight/combo_double_melee_weapon.h b/...fight/include/combo_double_melee_weapon.h → ...evation/fight/combo_double_melee_weapon.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "combo.h"
-#include "nothing.h"
-#include "selection.h"
-#include "use_weapon.h"
+#include "elevation/action/nothing.h"
+#include "elevation/action/use_weapon.h"
+#include "elevation/fight/combo.h"
+#include "elevation/selection/selection.h"
 
 template <utils::Printable T>
 class ComboDoubleMeleeWeapon : public Combo<T> {