Rename nowarn/ to lua/

Also cleanup the includes.

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"

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"

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)

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 {
 

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"

src/build_info.cpp

@@ -33,7 +33,7 @@
 #include <fstream>
 #include <iomanip>
 
-#include "nowarn/lua.h"
+#include "lua/lua.h"
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>

src/nowarn/llimits.h

@@ -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

src/nowarn/luaconf.h

@@ -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

src/scripting/application_lua_kernel.cpp

@@ -50,9 +50,7 @@
 #include <boost/range/adaptors.hpp>
 #include <SDL2/SDL.h>
 
-#include "nowarn/lauxlib.h"
-#include "nowarn/lua.h"
-#include "nowarn/luaconf.h"
+#include "lua/lauxlib.h"
 
 struct lua_State;
 

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);
 

src/scripting/game_lua_kernel.cpp

@@ -122,8 +122,7 @@
 #include <algorithm>
 #include <vector>                       // for vector, etc
 #include <SDL2/SDL_timer.h>                  // 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;
 

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"

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"
 

src/scripting/lua_common.cpp

@@ -39,8 +39,7 @@
 #include <new>                          // for operator new
 #include <string>                       // 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";

src/scripting/lua_cpp_function.cpp

@@ -20,8 +20,7 @@
 #include <sstream>
 #include <string>
 
-#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");

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"

src/scripting/lua_gui2.cpp

@@ -49,8 +49,7 @@
 #include <utility>
 #include <vector>
 
-#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)

src/scripting/lua_kernel_base.cpp

@@ -57,9 +57,8 @@
 #include <sstream>
 #include <vector>
 
-#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");

src/scripting/lua_map_location_ops.cpp

@@ -22,10 +22,8 @@
 
 #include <string>
 #include <utility>
-#include <ciso646>   // for and
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 namespace lua_map_location {
 

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 <cstdio>
 #include <cmath>

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"
 

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"
 

src/scripting/lua_race.cpp

@@ -23,8 +23,7 @@
 #include <string>
 #include <cstring>
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 /**
  * Implementation for a lua reference to a race,

src/scripting/lua_rng.cpp

@@ -23,8 +23,7 @@
 #include <new>
 #include <string>
 
-#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)

src/scripting/lua_stringx.cpp

@@ -23,8 +23,7 @@
 
 #include <boost/algorithm/string/trim.hpp>
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 namespace lua_stringx {
 

src/scripting/lua_team.cpp

@@ -26,8 +26,7 @@
 
 #include <string>
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 /**
  * Implementation for a lua reference to a team,

src/scripting/lua_terrainfilter.cpp

@@ -33,8 +33,7 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <unordered_map>
-#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)

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)

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)

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 <type_traits>
 

src/scripting/lua_unit_type.cpp

@@ -23,8 +23,7 @@
 #include <string>
 #include <cstring>
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 /**
  * Implementation for a lua reference to a unit_type.

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 <type_traits>
 

src/scripting/lua_widget_attributes.cpp

@@ -54,8 +54,7 @@
 #include <utility>
 #include <vector>
 
-#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)

src/scripting/lua_widget_methods.cpp

@@ -50,8 +50,7 @@
 #include <utility>
 #include <vector>
 
-#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)

src/scripting/lua_wml.cpp

@@ -25,8 +25,7 @@
 
 #include <fstream>
 
-#include "nowarn/lua.h"
-#include "nowarn/lauxlib.h"
+#include "lua/lauxlib.h"
 
 namespace lua_wml {
 

src/scripting/mapgen_lua_kernel.cpp

@@ -30,8 +30,7 @@
 #include <string>
 #include <functional>
 
-#include "nowarn/lauxlib.h"
-#include "nowarn/lua.h"
+#include "lua/lauxlib.h"
 #include "scripting/push_check.hpp"
 #include "generators/default_map_generator_job.hpp"
 

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"