From 1a3498cbf3f7b6c744bafbb1a6de0c57e7ea7d74 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Sat, 5 Mar 2022 02:45:09 -0600 Subject: [PATCH] Rename nowarn/ to lua/ Also cleanup the includes. --- src/ai/default/aspect_attacks.cpp | 2 +- src/ai/lua/aspect_advancements.cpp | 3 +-- src/ai/lua/core.cpp | 4 +--- src/ai/lua/lua_object.cpp | 2 +- src/ai/lua/lua_object.hpp | 2 +- src/build_info.cpp | 2 +- src/{nowarn => lua}/lauxlib.h | 0 src/{nowarn => lua}/lua.h | 0 src/{nowarn => lua}/lualib.h | 0 src/nowarn/llimits.h | 13 ------------- src/nowarn/luaconf.h | 13 ------------- src/scripting/application_lua_kernel.cpp | 4 +--- src/scripting/debug_lua.hpp | 2 +- src/scripting/game_lua_kernel.cpp | 3 +-- src/scripting/lua_audio.cpp | 3 +-- src/scripting/lua_color.cpp | 3 +-- src/scripting/lua_common.cpp | 3 +-- src/scripting/lua_cpp_function.cpp | 3 +-- src/scripting/lua_formula_bridge.cpp | 3 +-- src/scripting/lua_gui2.cpp | 3 +-- src/scripting/lua_kernel_base.cpp | 5 ++--- src/scripting/lua_map_location_ops.cpp | 4 +--- src/scripting/lua_mathx.cpp | 4 +--- src/scripting/lua_pathfind_cost_calculator.hpp | 2 +- src/scripting/lua_preferences.cpp | 3 +-- src/scripting/lua_race.cpp | 3 +-- src/scripting/lua_rng.cpp | 3 +-- src/scripting/lua_stringx.cpp | 3 +-- src/scripting/lua_team.cpp | 3 +-- src/scripting/lua_terrainfilter.cpp | 3 +-- src/scripting/lua_terrainmap.cpp | 3 +-- src/scripting/lua_unit.cpp | 3 +-- src/scripting/lua_unit_attacks.cpp | 3 +-- src/scripting/lua_unit_type.cpp | 3 +-- src/scripting/lua_widget.cpp | 3 +-- src/scripting/lua_widget_attributes.cpp | 3 +-- src/scripting/lua_widget_methods.cpp | 3 +-- src/scripting/lua_wml.cpp | 3 +-- src/scripting/mapgen_lua_kernel.cpp | 3 +-- src/scripting/push_check.hpp | 2 +- 40 files changed, 36 insertions(+), 94 deletions(-) rename src/{nowarn => lua}/lauxlib.h (100%) rename src/{nowarn => lua}/lua.h (100%) rename src/{nowarn => lua}/lualib.h (100%) delete mode 100644 src/nowarn/llimits.h delete mode 100644 src/nowarn/luaconf.h diff --git a/src/ai/default/aspect_attacks.cpp b/src/ai/default/aspect_attacks.cpp index 4803222c496..88889ddb4db 100644 --- a/src/ai/default/aspect_attacks.cpp +++ b/src/ai/default/aspect_attacks.cpp @@ -24,7 +24,7 @@ #include "ai/manager.hpp" #include "game_board.hpp" #include "log.hpp" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" #include "map/map.hpp" #include "pathfind/pathfind.hpp" #include "resources.hpp" diff --git a/src/ai/lua/aspect_advancements.cpp b/src/ai/lua/aspect_advancements.cpp index c0f3f619ffb..76dc94f7bad 100644 --- a/src/ai/lua/aspect_advancements.cpp +++ b/src/ai/lua/aspect_advancements.cpp @@ -16,8 +16,7 @@ #include "ai/lua/aspect_advancements.hpp" #include "log.hpp" // for LOG_STREAM, logger, etc -#include "nowarn/lauxlib.h" // for luaL_ref, LUA_REFNIL -#include "nowarn/lua.h" // for lua_isstring, etc +#include "lua/lauxlib.h" // for luaL_ref, LUA_REFNIL, lua_isstring, etc #include "map/location.hpp" // for map_location #include "serialization/string_utils.hpp" // for split #include "units/unit.hpp" diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 1bfeb8fdb0d..59909f5aba0 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -44,9 +44,7 @@ #include "ai/composite/contexts.hpp" #include "ai/default/aspect_attacks.hpp" -#include "nowarn/lualib.h" -#include "nowarn/lauxlib.h" -#include "nowarn/llimits.h" +#include "lua/lauxlib.h" static lg::log_domain log_ai_engine_lua("ai/engine/lua"); #define LOG_LUA LOG_STREAM(info, log_ai_engine_lua) diff --git a/src/ai/lua/lua_object.cpp b/src/ai/lua/lua_object.cpp index 44b61ce4c70..21d1c846fd3 100644 --- a/src/ai/lua/lua_object.cpp +++ b/src/ai/lua/lua_object.cpp @@ -24,7 +24,7 @@ #include "scripting/lua_common.hpp" #include "resources.hpp" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" namespace ai { diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp index 380dabe1b59..67ce5229a7b 100644 --- a/src/ai/lua/lua_object.hpp +++ b/src/ai/lua/lua_object.hpp @@ -22,7 +22,7 @@ #include "config.hpp" #include "log.hpp" -#include "nowarn/lua.h" +#include "lua/lua.h" #include "map/location.hpp" #include "resources.hpp" #include "scripting/lua_common.hpp" diff --git a/src/build_info.cpp b/src/build_info.cpp index 80d04026eb8..516df0e256a 100644 --- a/src/build_info.cpp +++ b/src/build_info.cpp @@ -33,7 +33,7 @@ #include #include -#include "nowarn/lua.h" +#include "lua/lua.h" #include #include diff --git a/src/nowarn/lauxlib.h b/src/lua/lauxlib.h similarity index 100% rename from src/nowarn/lauxlib.h rename to src/lua/lauxlib.h diff --git a/src/nowarn/lua.h b/src/lua/lua.h similarity index 100% rename from src/nowarn/lua.h rename to src/lua/lua.h diff --git a/src/nowarn/lualib.h b/src/lua/lualib.h similarity index 100% rename from src/nowarn/lualib.h rename to src/lua/lualib.h diff --git a/src/nowarn/llimits.h b/src/nowarn/llimits.h deleted file mode 100644 index 56e60f840f9..00000000000 --- a/src/nowarn/llimits.h +++ /dev/null @@ -1,13 +0,0 @@ -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wold-style-cast" - #include "modules/lua/llimits.h" - #pragma clang diagnostic pop -#elif defined(__GNUG__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wold-style-cast" - #include "modules/lua/llimits.h" - #pragma GCC diagnostic pop -#elif defined(_MSC_VER) - #include "modules/lua/llimits.h" -#endif diff --git a/src/nowarn/luaconf.h b/src/nowarn/luaconf.h deleted file mode 100644 index 8e4f858b978..00000000000 --- a/src/nowarn/luaconf.h +++ /dev/null @@ -1,13 +0,0 @@ -#if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wold-style-cast" - #include "modules/lua/luaconf.h" - #pragma clang diagnostic pop -#elif defined(__GNUG__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wold-style-cast" - #include "modules/lua/luaconf.h" - #pragma GCC diagnostic pop -#elif defined(_MSC_VER) - #include "modules/lua/luaconf.h" -#endif diff --git a/src/scripting/application_lua_kernel.cpp b/src/scripting/application_lua_kernel.cpp index 99507335188..eaf49c1145e 100644 --- a/src/scripting/application_lua_kernel.cpp +++ b/src/scripting/application_lua_kernel.cpp @@ -50,9 +50,7 @@ #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" -#include "nowarn/luaconf.h" +#include "lua/lauxlib.h" struct lua_State; diff --git a/src/scripting/debug_lua.hpp b/src/scripting/debug_lua.hpp index 565b5805969..1f4b695a85d 100644 --- a/src/scripting/debug_lua.hpp +++ b/src/scripting/debug_lua.hpp @@ -17,7 +17,7 @@ #pragma once -#include "nowarn/lualib.h" +#include "lua/lualib.h" void ds(lua_State *L, const bool verbose_table = true); diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 90546f25547..7565f69d740 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -122,8 +122,7 @@ #include #include // for vector, etc #include // for SDL_GetTicks -#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc -#include "nowarn/lua.h" // for lua_setfield, etc +#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc class CVideo; diff --git a/src/scripting/lua_audio.cpp b/src/scripting/lua_audio.cpp index b0ec4c4bd5d..9cafe3cd5c6 100644 --- a/src/scripting/lua_audio.cpp +++ b/src/scripting/lua_audio.cpp @@ -15,8 +15,7 @@ #include "lua_audio.hpp" #include "log.hpp" -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" #include "sound.hpp" diff --git a/src/scripting/lua_color.cpp b/src/scripting/lua_color.cpp index 2711f9f069f..0045dd4bb74 100644 --- a/src/scripting/lua_color.cpp +++ b/src/scripting/lua_color.cpp @@ -16,8 +16,7 @@ #include "scripting/lua_color.hpp" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" // for lua_State, lua_settop, etc +#include "lua/lauxlib.h" #include "log.hpp" #include "game_config.hpp" diff --git a/src/scripting/lua_common.cpp b/src/scripting/lua_common.cpp index b06137828f1..d9e8896ee9e 100644 --- a/src/scripting/lua_common.cpp +++ b/src/scripting/lua_common.cpp @@ -39,8 +39,7 @@ #include // for operator new #include // for string, basic_string -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" static const char gettextKey[] = "gettext"; static const char vconfigKey[] = "vconfig"; diff --git a/src/scripting/lua_cpp_function.cpp b/src/scripting/lua_cpp_function.cpp index 85ab0ad00ce..630ef381699 100644 --- a/src/scripting/lua_cpp_function.cpp +++ b/src/scripting/lua_cpp_function.cpp @@ -20,8 +20,7 @@ #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" #include "scripting/lua_common.hpp" // for new(L) static lg::log_domain log_scripting_lua("scripting/lua"); diff --git a/src/scripting/lua_formula_bridge.cpp b/src/scripting/lua_formula_bridge.cpp index 2cd414f69e7..78fde0f288d 100644 --- a/src/scripting/lua_formula_bridge.cpp +++ b/src/scripting/lua_formula_bridge.cpp @@ -18,8 +18,7 @@ #include "scripting/game_lua_kernel.hpp" #include "scripting/lua_unit.hpp" #include "scripting/lua_common.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" #include "formula/callable_objects.hpp" #include "formula/formula.hpp" #include "variable.hpp" diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp index 5c706e9e7d8..3ea99f58c5f 100644 --- a/src/scripting/lua_gui2.cpp +++ b/src/scripting/lua_gui2.cpp @@ -49,8 +49,7 @@ #include #include -#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc -#include "nowarn/lua.h" // for lua_setfield, etc +#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_kernel_base.cpp b/src/scripting/lua_kernel_base.cpp index 43dc2010bff..6f4a3ae903d 100644 --- a/src/scripting/lua_kernel_base.cpp +++ b/src/scripting/lua_kernel_base.cpp @@ -57,9 +57,8 @@ #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" -#include "nowarn/lualib.h" +#include "lua/lauxlib.h" +#include "lua/lualib.h" static lg::log_domain log_scripting_lua("scripting/lua"); static lg::log_domain log_user("scripting/lua/user"); diff --git a/src/scripting/lua_map_location_ops.cpp b/src/scripting/lua_map_location_ops.cpp index 4aabea6707c..6d8c807da83 100644 --- a/src/scripting/lua_map_location_ops.cpp +++ b/src/scripting/lua_map_location_ops.cpp @@ -22,10 +22,8 @@ #include #include -#include // for and -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" namespace lua_map_location { diff --git a/src/scripting/lua_mathx.cpp b/src/scripting/lua_mathx.cpp index 89853f53178..a8e20ad4bdf 100644 --- a/src/scripting/lua_mathx.cpp +++ b/src/scripting/lua_mathx.cpp @@ -19,9 +19,7 @@ #include "random.hpp" #include "SDL2/SDL_timer.h" // for SDL_GetTicks -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" -#include "nowarn/lualib.h" +#include "lua/lauxlib.h" #include #include diff --git a/src/scripting/lua_pathfind_cost_calculator.hpp b/src/scripting/lua_pathfind_cost_calculator.hpp index 4a4a1872c24..d2c1303ed3e 100644 --- a/src/scripting/lua_pathfind_cost_calculator.hpp +++ b/src/scripting/lua_pathfind_cost_calculator.hpp @@ -14,7 +14,7 @@ #pragma once -#include "nowarn/lua.h" +#include "lua/lua.h" #include "map/location.hpp" #include "pathfind/pathfind.hpp" diff --git a/src/scripting/lua_preferences.cpp b/src/scripting/lua_preferences.cpp index d7501d11c50..d9d1b985922 100644 --- a/src/scripting/lua_preferences.cpp +++ b/src/scripting/lua_preferences.cpp @@ -16,8 +16,7 @@ #include "scripting/lua_preferences.hpp" #include "config.hpp" -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" #include "preferences/general.hpp" #include "scripting/lua_common.hpp" diff --git a/src/scripting/lua_race.cpp b/src/scripting/lua_race.cpp index 61a0b3cd4d5..a9b3fbf1c07 100644 --- a/src/scripting/lua_race.cpp +++ b/src/scripting/lua_race.cpp @@ -23,8 +23,7 @@ #include #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" /** * Implementation for a lua reference to a race, diff --git a/src/scripting/lua_rng.cpp b/src/scripting/lua_rng.cpp index 387318f7ecf..ff8f30985c5 100644 --- a/src/scripting/lua_rng.cpp +++ b/src/scripting/lua_rng.cpp @@ -23,8 +23,7 @@ #include #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" static lg::log_domain log_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_lua) diff --git a/src/scripting/lua_stringx.cpp b/src/scripting/lua_stringx.cpp index 207db08c588..0519c34d4da 100644 --- a/src/scripting/lua_stringx.cpp +++ b/src/scripting/lua_stringx.cpp @@ -23,8 +23,7 @@ #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" namespace lua_stringx { diff --git a/src/scripting/lua_team.cpp b/src/scripting/lua_team.cpp index d57dc4f57fa..51dc65f7f9b 100644 --- a/src/scripting/lua_team.cpp +++ b/src/scripting/lua_team.cpp @@ -26,8 +26,7 @@ #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" /** * Implementation for a lua reference to a team, diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp index 79b30da46a1..4c0835df681 100644 --- a/src/scripting/lua_terrainfilter.cpp +++ b/src/scripting/lua_terrainfilter.cpp @@ -33,8 +33,7 @@ #include #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" static lg::log_domain log_scripting_lua_mapgen("scripting/lua/mapgen"); #define LOG_LMG LOG_STREAM(info, log_scripting_lua_mapgen) diff --git a/src/scripting/lua_terrainmap.cpp b/src/scripting/lua_terrainmap.cpp index 85fbde9934b..a489973a0a5 100644 --- a/src/scripting/lua_terrainmap.cpp +++ b/src/scripting/lua_terrainmap.cpp @@ -27,8 +27,7 @@ #include "game_board.hpp" #include "play_controller.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit.cpp b/src/scripting/lua_unit.cpp index 57e5a75def4..b0ccdd6e604 100644 --- a/src/scripting/lua_unit.cpp +++ b/src/scripting/lua_unit.cpp @@ -31,8 +31,7 @@ #include "game_version.hpp" #include "deprecation.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" // for lua_State, lua_settop, etc +#include "lua/lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit_attacks.cpp b/src/scripting/lua_unit_attacks.cpp index 7f906c88c1c..f6d789fc764 100644 --- a/src/scripting/lua_unit_attacks.cpp +++ b/src/scripting/lua_unit_attacks.cpp @@ -24,8 +24,7 @@ #include "units/attack_type.hpp" #include "utils/const_clone.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" // for lua_State, lua_settop, etc +#include "lua/lauxlib.h" #include diff --git a/src/scripting/lua_unit_type.cpp b/src/scripting/lua_unit_type.cpp index 2e9257c3f9b..07a2a14ec1e 100644 --- a/src/scripting/lua_unit_type.cpp +++ b/src/scripting/lua_unit_type.cpp @@ -23,8 +23,7 @@ #include #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" /** * Implementation for a lua reference to a unit_type. diff --git a/src/scripting/lua_widget.cpp b/src/scripting/lua_widget.cpp index a82ca1ad159..25bd8ae35fd 100644 --- a/src/scripting/lua_widget.cpp +++ b/src/scripting/lua_widget.cpp @@ -25,8 +25,7 @@ #include "scripting/push_check.hpp" -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" // for lua_State, lua_settop, etc +#include "lua/lauxlib.h" #include diff --git a/src/scripting/lua_widget_attributes.cpp b/src/scripting/lua_widget_attributes.cpp index e1749575625..0836f8adc63 100644 --- a/src/scripting/lua_widget_attributes.cpp +++ b/src/scripting/lua_widget_attributes.cpp @@ -54,8 +54,7 @@ #include #include -#include "nowarn/lauxlib.h" // for luaL_checkinteger, etc -#include "nowarn/lua.h" // for lua_setfield, etc +#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_widget_methods.cpp b/src/scripting/lua_widget_methods.cpp index 54f9323e13c..2c935bd23dd 100644 --- a/src/scripting/lua_widget_methods.cpp +++ b/src/scripting/lua_widget_methods.cpp @@ -50,8 +50,7 @@ #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_wml.cpp b/src/scripting/lua_wml.cpp index eb43d0bf685..d634b86bb14 100644 --- a/src/scripting/lua_wml.cpp +++ b/src/scripting/lua_wml.cpp @@ -25,8 +25,7 @@ #include -#include "nowarn/lua.h" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" namespace lua_wml { diff --git a/src/scripting/mapgen_lua_kernel.cpp b/src/scripting/mapgen_lua_kernel.cpp index 87dba9cc287..c464064bc2d 100644 --- a/src/scripting/mapgen_lua_kernel.cpp +++ b/src/scripting/mapgen_lua_kernel.cpp @@ -30,8 +30,7 @@ #include #include -#include "nowarn/lauxlib.h" -#include "nowarn/lua.h" +#include "lua/lauxlib.h" #include "scripting/push_check.hpp" #include "generators/default_map_generator_job.hpp" diff --git a/src/scripting/push_check.hpp b/src/scripting/push_check.hpp index 76798a3d78f..74d963c402b 100644 --- a/src/scripting/push_check.hpp +++ b/src/scripting/push_check.hpp @@ -17,7 +17,7 @@ #include "scripting/lua_common.hpp" #include "scripting/lua_widget.hpp" -#include "nowarn/lauxlib.h" +#include "lua/lauxlib.h" #include "global.hpp" #include "tstring.hpp" #include "map/location.hpp"