Cleanup SDL headers (#3743)

widelands · Apr 21, 2020 · a6d0c10 · a6d0c10
1 parent 9dfa221
commit a6d0c10
Show file tree

Hide file tree

Showing 78 changed files with 154 additions and 74 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -43,7 +43,6 @@ if (WIN32)
     SRCS
       main.cc
       ${WIN32_ICON_O}
-    USES_SDL2
     DEPENDS
       base_exceptions
       widelands_ball_of_mud
@@ -53,7 +52,6 @@ else()
   wl_binary(widelands
     SRCS
       main.cc
-    USES_SDL2
     DEPENDS
       base_exceptions
       widelands_ball_of_mud
@@ -93,7 +91,6 @@ wl_library(widelands_ball_of_mud
     wlapplication_messages.h
   USES_BOOST_REGEX
   USES_SDL2
-  USES_SDL2_IMAGE
   USES_SDL2_TTF
   DEPENDS
     base_exceptions
@@ -136,9 +133,6 @@ wl_library(widelands_options
   SRCS
     wlapplication_options.cc
     wlapplication_options.h
-  USES_SDL2
-  USES_SDL2_IMAGE
-  USES_SDL2_TTF
   DEPENDS
     base_log
     io_filesystem

diff --git a/src/base/log.cc b/src/base/log.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <memory>
 
-#include <SDL.h>
+#include <SDL_log.h>
 #ifdef _WIN32
 #include <windows.h>
 #endif

diff --git a/src/base/scoped_timer.cc b/src/base/scoped_timer.cc
@@ -19,7 +19,7 @@
 
 #include "base/scoped_timer.h"
 
-#include <SDL.h>
+#include <SDL_timer.h>
 #include <boost/format.hpp>
 
 #include "base/log.h"

diff --git a/src/editor/editorinteractive.cc b/src/editor/editorinteractive.cc
@@ -22,6 +22,8 @@
 #include <memory>
 
 #include <SDL_keycode.h>
+#include <SDL_mouse.h>
+#include <SDL_timer.h>
 
 #include "base/i18n.h"
 #include "base/warning.h"

diff --git a/src/editor/ui_menus/tool_place_critter_options_menu.cc b/src/editor/ui_menus/tool_place_critter_options_menu.cc
@@ -19,8 +19,6 @@
 
 #include "editor/ui_menus/tool_place_critter_options_menu.h"
 
-#include <SDL_keycode.h>
-
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/place_critter_tool.h"

diff --git a/src/editor/ui_menus/tool_place_immovable_options_menu.cc b/src/editor/ui_menus/tool_place_immovable_options_menu.cc
@@ -19,8 +19,6 @@
 
 #include "editor/ui_menus/tool_place_immovable_options_menu.h"
 
-#include <SDL_keycode.h>
-
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/place_immovable_tool.h"

diff --git a/src/editor/ui_menus/tool_set_terrain_options_menu.cc b/src/editor/ui_menus/tool_set_terrain_options_menu.cc
@@ -21,8 +21,6 @@
 
 #include <memory>
 
-#include <SDL_keycode.h>
-
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/set_terrain_tool.h"

diff --git a/src/graphic/CMakeLists.txt b/src/graphic/CMakeLists.txt
@@ -64,7 +64,6 @@ wl_library(graphic_image_io
     image_io.h
     image_io.cc
   USES_PNG
-  USES_SDL2
   USES_SDL2_IMAGE
   DEPENDS
     base_exceptions
@@ -79,7 +78,6 @@ wl_library(graphic_image_cache
   SRCS
     image_cache.cc
     image_cache.h
-  USES_SDL2
   DEPENDS
     base_macros
     graphic_image_io
@@ -289,7 +287,6 @@ wl_library(graphic_wordwrap
     wordwrap.cc
     wordwrap.h
   USES_ICU
-  USES_SDL2_TTF
   DEPENDS
     base_geometry
     base_log

diff --git a/src/graphic/color.h b/src/graphic/color.h
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <SDL.h>
+#include <SDL_pixels.h>
 
 struct RGBColor {
 	RGBColor(uint8_t R, uint8_t G, uint8_t B);

diff --git a/src/graphic/gl/initialize.cc b/src/graphic/gl/initialize.cc
@@ -21,7 +21,7 @@
 
 #include <csignal>
 
-#include <SDL.h>
+#include <SDL_messagebox.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 

diff --git a/src/graphic/gl/initialize.h b/src/graphic/gl/initialize.h
@@ -20,7 +20,7 @@
 #ifndef WL_GRAPHIC_GL_INITIALIZE_H
 #define WL_GRAPHIC_GL_INITIALIZE_H
 
-#include <SDL.h>
+#include <SDL_video.h>
 
 #include "graphic/gl/system_headers.h"
 

diff --git a/src/graphic/graphic.cc b/src/graphic/graphic.cc
@@ -21,6 +21,8 @@
 
 #include <memory>
 
+#include <SDL_messagebox.h>
+
 #include "base/i18n.h"
 #include "base/log.h"
 #include "base/wexception.h"

diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include <SDL.h>
+#include <SDL_video.h>
 
 #include "graphic/image_cache.h"
 #include "graphic/style_manager.h"

diff --git a/src/graphic/image_cache.cc b/src/graphic/image_cache.cc
@@ -22,8 +22,6 @@
 #include <cassert>
 #include <memory>
 
-#include <SDL.h>
-
 #include "graphic/image.h"
 #include "graphic/image_io.h"
 #include "graphic/texture.h"

diff --git a/src/graphic/image_io.cc b/src/graphic/image_io.cc
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <SDL.h>
 #include <SDL_image.h>
 #include <png.h>
 

diff --git a/src/graphic/mouse_cursor.cc b/src/graphic/mouse_cursor.cc
@@ -21,6 +21,8 @@
 
 #include <string>
 
+#include <SDL_events.h>
+
 #include "graphic/graphic.h"
 #include "graphic/image_io.h"
 #include "graphic/rendertarget.h"

diff --git a/src/graphic/sdl_utils.cc b/src/graphic/sdl_utils.cc
@@ -19,7 +19,7 @@
 
 #include "graphic/sdl_utils.h"
 
-#include <SDL.h>
+#include <SDL_surface.h>
 
 SDL_Surface* empty_sdl_surface(int16_t w, int16_t h) {
 	SDL_Surface* const surface =

diff --git a/src/graphic/surface.cc b/src/graphic/surface.cc
@@ -19,8 +19,6 @@
 
 #include "graphic/surface.h"
 
-#include <SDL.h>
-
 #include "base/rect.h"
 #include "base/vector.h"
 #include "graphic/gl/coordinate_conversion.h"

diff --git a/src/graphic/text/CMakeLists.txt b/src/graphic/text/CMakeLists.txt
@@ -24,9 +24,9 @@ wl_library(graphic_text
     textstream.h
     texture_cache.h
     transient_cache.h
+  USES_ICU
   USES_SDL2
   USES_SDL2_TTF
-  USES_ICU
   DEPENDS
     base_exceptions
     base_geometry

diff --git a/src/graphic/text/rt_parse.cc b/src/graphic/text/rt_parse.cc
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <SDL.h>
 #include <boost/algorithm/string/replace.hpp>
 
 #include "graphic/text/rt_errors_impl.h"

diff --git a/src/graphic/text/rt_render.cc b/src/graphic/text/rt_render.cc
@@ -22,7 +22,6 @@
 #include <memory>
 #include <queue>
 
-#include <SDL.h>
 #include <boost/algorithm/string.hpp>
 
 #include "base/i18n.h"

diff --git a/src/graphic/text/sdl_ttf_font.cc b/src/graphic/text/sdl_ttf_font.cc
@@ -21,8 +21,6 @@
 
 #include <memory>
 
-#include <SDL.h>
-#include <SDL_ttf.h>
 #include <boost/format.hpp>
 
 #include "graphic/sdl_utils.h"

diff --git a/src/graphic/text/test/CMakeLists.txt b/src/graphic/text/test/CMakeLists.txt
@@ -8,6 +8,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/paths.h.cmake ${CMAKE_CURRENT_BINARY_
 wl_binary(wl_render_richtext
   SRCS
     render_richtext.cc
+  USES_SDL2_TTF
   DEPENDS
     base_log
     graphic

diff --git a/src/graphic/text/transient_cache.h b/src/graphic/text/transient_cache.h
@@ -25,7 +25,7 @@
 #include <map>
 #include <memory>
 
-#include <SDL.h>
+#include <SDL_timer.h>
 
 #include "base/macros.h"
 

diff --git a/src/graphic/texture.cc b/src/graphic/texture.cc
@@ -20,7 +20,7 @@
 
 #include <cassert>
 
-#include <SDL.h>
+#include <SDL_surface.h>
 
 #include "base/log.h"
 #include "base/macros.h"

diff --git a/src/graphic/wordwrap.cc b/src/graphic/wordwrap.cc
@@ -25,7 +25,6 @@
 
 #include <memory>
 
-#include <SDL_ttf.h>
 #include <unicode/unistr.h>
 
 #include "base/log.h"

diff --git a/src/logic/CMakeLists.txt b/src/logic/CMakeLists.txt
@@ -57,6 +57,7 @@ wl_library(logic_game_controller
     replay_game_controller.cc
     single_player_game_controller.h
     single_player_game_controller.cc
+  USES_SDL2
   DEPENDS
     ai
     logic

diff --git a/src/logic/game.cc b/src/logic/game.cc
@@ -23,9 +23,9 @@
 #include <string>
 
 #ifndef _WIN32
-#include <SDL.h>     // for a dirty hack.
 #include <unistd.h>  // for usleep
 #else
+#include <SDL_events.h>  // for a dirty hack.
 #include <windows.h>
 #endif
 

diff --git a/src/logic/map_objects/tribes/building_settings.h b/src/logic/map_objects/tribes/building_settings.h
@@ -20,6 +20,8 @@
 #ifndef WL_LOGIC_MAP_OBJECTS_TRIBES_BUILDING_SETTINGS_H
 #define WL_LOGIC_MAP_OBJECTS_TRIBES_BUILDING_SETTINGS_H
 
+#include <string>
+
 #include "logic/widelands.h"
 #include "map_io/tribes_legacy_lookup_table.h"
 

diff --git a/src/logic/replay_game_controller.cc b/src/logic/replay_game_controller.cc
@@ -19,6 +19,8 @@
 
 #include "logic/replay_game_controller.h"
 
+#include <SDL_timer.h>
+
 #include "logic/game.h"
 #include "logic/replay.h"
 #include "ui_basic/messagebox.h"

diff --git a/src/logic/save_handler.cc b/src/logic/save_handler.cc
@@ -19,6 +19,7 @@
 
 #include "logic/save_handler.h"
 
+#include <SDL_timer.h>
 #include <boost/algorithm/string.hpp>
 
 #include "base/log.h"

diff --git a/src/logic/single_player_game_controller.cc b/src/logic/single_player_game_controller.cc
@@ -19,6 +19,8 @@
 
 #include "logic/single_player_game_controller.h"
 
+#include <SDL_timer.h>
+
 #include "ai/computer_player.h"
 #include "logic/game.h"
 #include "logic/player.h"

diff --git a/src/main.cc b/src/main.cc
@@ -18,10 +18,8 @@
  */
 
 #include <iostream>
-
 #include <typeinfo>
 
-#include <SDL_main.h>
 #include <unistd.h>
 
 #include "base/wexception.h"

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -34,6 +34,7 @@ wl_library(network
     network_player_settings_backend.h
     network_protocol.h
     relay_protocol.h
+  USES_SDL2
   DEPENDS
     ai
     base_exceptions

diff --git a/src/network/gameclient.cc b/src/network/gameclient.cc
@@ -21,6 +21,8 @@
 
 #include <memory>
 
+#include <SDL_timer.h>
+
 #include "base/i18n.h"
 #include "base/log.h"
 #include "base/warning.h"

diff --git a/src/network/gamehost.cc b/src/network/gamehost.cc
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <memory>
 
+#include <SDL_timer.h>
 #ifndef _WIN32
 #include <unistd.h>  // for usleep
 #endif

diff --git a/src/network/network.cc b/src/network/network.cc
@@ -19,7 +19,7 @@
 
 #include "network/network.h"
 
-#include <SDL.h>
+#include <SDL_timer.h>
 
 #include "base/log.h"
 

diff --git a/src/scripting/CMakeLists.txt b/src/scripting/CMakeLists.txt
@@ -65,6 +65,7 @@ wl_library(scripting_lua_interface
     lua_path.h
     run_script.cc
     run_script.h
+  USES_SDL2
   DEPENDS
     base_i18n
     base_macros
@@ -99,6 +100,7 @@ wl_library(scripting_logic
     persistence.cc
     persistence.h
     eris.h
+  USES_SDL2
   DEPENDS
     base_exceptions
     base_log

diff --git a/src/scripting/lua_globals.cc b/src/scripting/lua_globals.cc
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <SDL.h>
+#include <SDL_timer.h>
 
 #include "base/i18n.h"
 #include "build_info.h"