Cleaned up global.hpp includes

hsilva · Jan 23, 2021 · 204d3b4 · 204d3b4
1 parent a04f6d2
commit 204d3b4
Show file tree

Hide file tree

Showing 26 changed files with 6 additions and 31 deletions.
diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp
@@ -27,6 +27,7 @@
 #include "attack_prediction.hpp"
 #include "filesystem.hpp"
 #include "game_board.hpp"
+#include "global.hpp"
 #include "display.hpp"
 #include "log.hpp"
 #include "map/label.hpp"

diff --git a/src/commandline_argv.cpp b/src/commandline_argv.cpp
@@ -15,7 +15,6 @@
 
 #ifdef _WIN32
 
-#include "global.hpp"
 #include "serialization/unicode_cast.hpp"
 
 #include <windows.h>

diff --git a/src/config.hpp b/src/config.hpp
@@ -29,7 +29,6 @@
 
 #include "config_attribute_value.hpp"
 #include "exceptions.hpp"
-#include "global.hpp"
 
 #include <climits>
 #include <ctime>

diff --git a/src/config_attribute_value.hpp b/src/config_attribute_value.hpp
@@ -27,7 +27,6 @@
 
 #pragma once
 
-#include "global.hpp"
 #include "tstring.hpp"
 #include "utils/variant.hpp"
 

diff --git a/src/exceptions.hpp b/src/exceptions.hpp
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <exception>
 #include <string>
 

diff --git a/src/formula/function.cpp b/src/formula/function.cpp
@@ -19,6 +19,7 @@
 #include "formula/debugger.hpp"
 #include "game_config.hpp"
 #include "game_display.hpp"
+#include "global.hpp"
 #include "log.hpp"
 
 #include <boost/math/constants/constants.hpp>

diff --git a/src/gettext.cpp b/src/gettext.cpp
@@ -12,7 +12,6 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "filesystem.hpp"

diff --git a/src/gui/auxiliary/iterator/walker_grid.cpp b/src/gui/auxiliary/iterator/walker_grid.cpp
@@ -16,8 +16,6 @@
 
 #include "gui/auxiliary/iterator/walker_grid.hpp"
 
-#include "global.hpp"
-
 #include <cassert>
 
 namespace gui2

diff --git a/src/gui/auxiliary/iterator/walker_tree_node.cpp b/src/gui/auxiliary/iterator/walker_tree_node.cpp
@@ -16,8 +16,6 @@
 
 #include "gui/auxiliary/iterator/walker_tree_node.hpp"
 
-#include "global.hpp"
-
 #include <cassert>
 
 namespace gui2

diff --git a/src/gui/auxiliary/iterator/walker_widget.cpp b/src/gui/auxiliary/iterator/walker_widget.cpp
@@ -16,7 +16,6 @@
 
 #include "gui/auxiliary/iterator/walker_widget.hpp"
 
-#include "global.hpp"
 #include "gui/widgets/widget.hpp"
 
 #include <cassert>

diff --git a/src/hash.hpp b/src/hash.hpp
@@ -18,7 +18,6 @@
 #include <cstdint>
 #include <string>
 
-#include "global.hpp"
 #include "exceptions.hpp"
 
 // Not configurable. The size (64) is both hard-, and implicitly-coded in crypt_blowfish

diff --git a/src/lexical_cast.hpp b/src/lexical_cast.hpp
@@ -45,7 +45,6 @@
 #define __LONG_LONG_SUPPORTED
 #endif
 
-#include "global.hpp"
 #include <optional>
 
 #include <cstdlib>

diff --git a/src/log.cpp b/src/log.cpp
@@ -28,8 +28,6 @@
 #include <ctime>
 #include <mutex>
 
-#include "global.hpp"
-
 namespace {
 
 class null_streambuf : public std::streambuf

diff --git a/src/log.hpp b/src/log.hpp
@@ -44,8 +44,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #ifndef __func__
  #ifdef __FUNCTION__
   #define __func__ __FUNCTION__

diff --git a/src/lua_jailbreak_exception.hpp b/src/lua_jailbreak_exception.hpp
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 /**
  * Base class for exceptions that want to be thrown 'through' lua.
  *

diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp
@@ -15,6 +15,7 @@
 #include "scripting/lua_terrainmap.hpp"
 
 #include "formatter.hpp"
+#include "global.hpp"
 #include "log.hpp"
 #include "map/location.hpp"
 #include "map/map.hpp"

diff --git a/src/scripting/lua_terrainmap.cpp b/src/scripting/lua_terrainmap.cpp
@@ -15,6 +15,7 @@
 #include "scripting/lua_terrainfilter.hpp"
 
 #include "formatter.hpp"
+#include "global.hpp"
 #include "log.hpp"
 #include "map/location.hpp"
 #include "map/map.hpp"

diff --git a/src/scripting/push_check.hpp b/src/scripting/push_check.hpp
@@ -16,6 +16,7 @@
 #include "scripting/lua_common.hpp"
 #include "scripting/lua_widget.hpp"
 
+#include "global.hpp"
 #include "tstring.hpp"
 #include "map/location.hpp"
 #include "lua/lauxlib.h"

diff --git a/src/sdl/surface.hpp b/src/sdl/surface.hpp
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "global.hpp"
 #include "utils/const_clone.hpp"
 
 #include <SDL2/SDL.h>

diff --git a/src/serialization/tokenizer.cpp b/src/serialization/tokenizer.cpp
@@ -13,7 +13,6 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
 #include "serialization/tokenizer.hpp"
 #include "wesconfig.h"
 

diff --git a/src/units/abilities.cpp b/src/units/abilities.cpp
@@ -21,6 +21,7 @@
 #include "display_context.hpp"
 #include "font/text_formatting.hpp"
 #include "game_board.hpp"
+#include "global.hpp"
 #include "lexical_cast.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

diff --git a/src/utils/general.hpp b/src/utils/general.hpp
@@ -13,8 +13,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <algorithm>
 #include <cctype>
 #include <functional>

diff --git a/src/utils/make_enum.hpp b/src/utils/make_enum.hpp
@@ -77,8 +77,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <cassert>
 #include <exception>
 #include <string>

diff --git a/src/utils/name_generator.hpp b/src/utils/name_generator.hpp
@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <string>
 #include <map>
 #include <exception>

diff --git a/src/utils/scope_exit.hpp b/src/utils/scope_exit.hpp
@@ -13,8 +13,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <functional>
 
 namespace utils {

diff --git a/src/utils/shared_reference.hpp b/src/utils/shared_reference.hpp
@@ -13,8 +13,6 @@
 
 #pragma once
 
-#include "global.hpp"
-
 #include <memory>
 #include <stdexcept>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,6 @@ @@
     #pragma once
-    #include "global.hpp"
     /**
      * Base class for exceptions that want to be thrown 'through' lua.
      *
@@ Expand Down @@