Merge branch 'fix_clang_tidy' into 'master'

Fix clang-tidy checks

See merge request OpenMW/openmw!4980

.gitlab-ci.yml

@@ -429,7 +429,11 @@ Ubuntu_Clang:
     - mkdir -pv "${CCACHE_DIR}"
     - ccache -z -M "${CCACHE_SIZE}"
     - CI/before_script.linux.sh
-    - cp extern/.clang-tidy build/.clang-tidy
+    - mkdir -p build/extern build/apps/launcher build/apps/opencs build/apps/wizard
+    - cp extern/.clang-tidy build/extern/
+    - cp extern/.clang-tidy build/apps/launcher/
+    - cp extern/.clang-tidy build/apps/opencs/
+    - cp extern/.clang-tidy build/apps/wizard/
     - cd build
     - find . -name *.o -exec touch {} \;
     - cmake --build . -- -j $(nproc) ${BUILD_TARGETS}

components/lua/util.hpp

@@ -2,7 +2,6 @@
 #define COMPONENTS_LUA_UTIL_H
 
 #include <cstdint>
-#include <string>
 
 #include <sol/sol.hpp>
 
@@ -24,11 +23,11 @@ namespace LuaUtil
 
 // ADL-based customization point for sol2 to automatically convert ESM::RefId
 // Empty RefIds are converted to nil, non-empty ones are serialized to strings
-inline int sol_lua_push(sol::types<ESM::RefId>, lua_State* L, const ESM::RefId& id)
+inline int sol_lua_push(sol::types<ESM::RefId>, lua_State* state, const ESM::RefId& id)
 {
     if (id.empty())
-        return sol::stack::push(L, sol::lua_nil);
-    return sol::stack::push(L, id.serializeText());
+        return sol::stack::push(state, sol::lua_nil);
+    return sol::stack::push(state, id.serializeText());
 }
 
-#endif
+#endif