Include SDL files as system headers

This excludes inclusions in SDL_GPU files.

src/ai/manager.cpp

@@ -56,7 +56,7 @@
 #include <utility>                      // for pair, make_pair
 #include <vector>                       // for vector, allocator, etc
 
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 namespace ai {
 

src/ai/testing/ca.cpp

@@ -38,7 +38,7 @@
 
 #include <numeric>
 
-#include "SDL.h"
+#include <SDL.h>
 
 static lg::log_domain log_ai_testing_ai_default("ai/ca/testing_ai_default");
 #define DBG_AI_TESTING_AI_DEFAULT LOG_STREAM(debug, log_ai_testing_ai_default)

src/ai/testing/stage_sf_with_rca.cpp

@@ -37,7 +37,7 @@
 #include "unit.hpp"
 
 #include <boost/bind.hpp>
-#include "SDL.h"
+#include <SDL.h>
 
 namespace ai {
 

src/animated.tpp

@@ -21,7 +21,7 @@
 
 #include <climits>
 
-#include "SDL.h"
+#include <SDL.h>
 #include "animated.hpp"
 
 namespace {

src/color_range.hpp

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#include "SDL_types.h"
+#include <SDL_types.h>
 
 /* Convert comma separated string into rgb values.
  * Return false and empty result on error.

src/display.cpp

@@ -47,7 +47,7 @@
 #include "whiteboard/manager.hpp"
 #include "show_dialog.hpp"
 
-#include "SDL_image.h"
+#include <SDL_image.h>
 
 #include <boost/foreach.hpp>
 

src/display_chat_manager.cpp

@@ -27,8 +27,8 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/foreach.hpp>
-#include "SDL_timer.h"
-#include "SDL_video.h"
+#include <SDL_timer.h>
+#include <SDL_video.h>
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/events.cpp

@@ -26,7 +26,7 @@
 #include "desktop/windows_tray_notification.hpp"
 #endif
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include <algorithm>
 #include <cassert>

src/events.hpp

@@ -15,8 +15,8 @@
 #ifndef EVENTS_HPP_INCLUDED
 #define EVENTS_HPP_INCLUDED
 
-#include "SDL_events.h"
-#include "SDL_version.h"
+#include <SDL_events.h>
+#include <SDL_version.h>
 #include <vector>
 
 //our user-defined double-click event type

src/game_launcher.cpp

@@ -66,12 +66,12 @@
 #include <cstdlib>                     // for NULL, system
 #include <iostream>                     // for operator<<, basic_ostream, etc
 #include <utility>                      // for pair
-#include "SDL.h"                        // for SDL_INIT_JOYSTICK, etc
-#include "SDL_events.h"                 // for SDL_ENABLE
-#include "SDL_joystick.h"               // for SDL_JoystickEventState, etc
-#include "SDL_timer.h"                  // for SDL_Delay
-#include "SDL_version.h"                // for SDL_VERSION_ATLEAST
-#include "SDL_video.h"                  // for SDL_WM_SetCaption, etc
+#include <SDL.h>                        // for SDL_INIT_JOYSTICK, etc
+#include <SDL_events.h>                 // for SDL_ENABLE
+#include <SDL_joystick.h>               // for SDL_JoystickEventState, etc
+#include <SDL_timer.h>                  // for SDL_Delay
+#include <SDL_version.h>                // for SDL_VERSION_ATLEAST
+#include <SDL_video.h>                  // for SDL_WM_SetCaption, etc
 
 #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
 #include "gui/widgets/debug.hpp"

src/generators/default_map_generator_job.cpp

@@ -31,7 +31,7 @@
 #include "util.hpp"
 #include "wml_exception.hpp"
 #include "formula_string_utils.hpp"
-#include "SDL.h"
+#include <SDL.h>
 
 #include <boost/foreach.hpp>
 #include "seed_rng.hpp"

src/gui/auxiliary/event/dispatcher.hpp

@@ -20,7 +20,7 @@
 #include "sdl/compat.hpp"
 #include "serialization/unicode_types.hpp"
 
-#include "SDL_events.h"
+#include <SDL_events.h>
 
 #include "utils/boost_function_guarded.hpp"
 #include <boost/mpl/int.hpp>

src/gui/auxiliary/event/dispatcher_private.hpp

@@ -19,7 +19,7 @@
 
 #include "gui/widgets/widget.hpp"
 
-#include "SDL_events.h"
+#include <SDL_events.h>
 
 #include <boost/mpl/for_each.hpp>
 

src/gui/widgets/helper.cpp

@@ -22,7 +22,7 @@
 
 #include "formula_string_utils.hpp"
 
-#include "SDL_ttf.h"
+#include <SDL_ttf.h>
 
 namespace gui2
 {

src/help/help_browser.cpp

@@ -15,7 +15,7 @@
 #include "help_browser.hpp"
 #include <stddef.h>                     // for NULL
 #include <iostream>                     // for operator<<, basic_ostream, etc
-#include "SDL_mouse.h"                  // for SDL_GetMouseState, etc
+#include <SDL_mouse.h>                  // for SDL_GetMouseState, etc
 #include "cursor.hpp"                   // for set, CURSOR_TYPE::HYPERLINK, etc
 #include "font.hpp"                     // for relative_size
 #include "gettext.hpp"                  // for _

src/help/help_browser.hpp

@@ -17,7 +17,7 @@
 
 #include <deque>                        // for deque
 #include <string>                       // for string
-#include "SDL_events.h"                 // for SDL_Event
+#include <SDL_events.h>                 // for SDL_Event
 #include "help_menu.hpp"		// for help_menu
 #include "help_text_area.hpp"           // for help_text_area
 #include "widgets/button.hpp"           // for button

src/help/help_text_area.hpp

@@ -18,7 +18,7 @@
 #include <list>                         // for list
 #include <string>                       // for string
 #include <utility>                      // for pair
-#include "SDL_video.h"                  // for SDL_Color (ptr only), etc
+#include <SDL_video.h>                  // for SDL_Color (ptr only), etc
 #include "font.hpp"                     // for NORMAL_COLOR
 #include "sdl/utils.hpp"                // for surface
 #include "widgets/scrollarea.hpp"       // for scrollarea

src/hotkey/hotkey_item.cpp

@@ -32,7 +32,7 @@
 
 #include "key.hpp"
 
-#include "SDL.h"
+#include <SDL.h>
 
 
 static lg::log_domain log_config("config");

src/hotkey/hotkey_item.hpp

@@ -16,8 +16,8 @@
 #ifndef HOTKEY_ITEM_HPP_INCLUDED
 #define HOTKEY_ITEM_HPP_INCLUDED
 
-#include "SDL_events.h"
-#include "SDL.h"
+#include <SDL_events.h>
+#include <SDL.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 

src/image.cpp

@@ -40,7 +40,7 @@
 #include "serialization/string_utils.hpp"
 #include "video.hpp"
 
-#include "SDL_image.h"
+#include <SDL_image.h>
 
 #include <boost/bind.hpp>
 #include <boost/functional/hash.hpp>

src/log.cpp

@@ -22,7 +22,7 @@
 #include "game_errors.hpp"
 #include "global.hpp"
 
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 #include "log.hpp"
 

src/mouse_events.cpp

@@ -62,8 +62,8 @@
 #include <new>                          // for bad_alloc
 #include <ostream>                      // for operator<<, basic_ostream, etc
 #include <string>                       // for string, operator<<, etc
-#include "SDL_mouse.h"                  // for SDL_GetMouseState
-#include "SDL_video.h"                  // for SDL_Color
+#include <SDL_mouse.h>                  // for SDL_GetMouseState
+#include <SDL_video.h>                  // for SDL_Color
 
 namespace gui { class slider; }
 

src/mouse_events.hpp

@@ -24,7 +24,7 @@
 
 #include <set>                          // for set
 #include <vector>                       // for vector
-#include "SDL_events.h"                 // for SDL_MouseButtonEvent
+#include <SDL_events.h>                 // for SDL_MouseButtonEvent
 
 class game_display;
 class battle_context;  // lines 23-23

src/mouse_handler_base.hpp

@@ -17,8 +17,8 @@
 #define MOUSE_HANDLER_BASE_H_INCLUDED
 
 #include "map_location.hpp"
-#include "SDL_events.h"
-#include "SDL_version.h"
+#include <SDL_events.h>
+#include <SDL_version.h>
 
 class display;
 

src/network.hpp

@@ -23,7 +23,7 @@
 class config;
 
 #include "exceptions.hpp"
-#include "SDL_net.h"
+#include <SDL_net.h>
 
 #include <string>
 #include <vector>

src/preferences.hpp

@@ -22,7 +22,7 @@ class display;
 
 #include "terrain_translation.hpp"
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include <utility>
 

src/save_blocker.hpp

@@ -15,7 +15,7 @@
 #ifndef SAVE_BLOCKER_H_INCLUDED
 #define SAVE_BLOCKER_H_INCLUDED
 
-#include "SDL_mutex.h"
+#include <SDL_mutex.h>
 
 #include <cassert>
 

src/scripting/game_lua_kernel.cpp

@@ -124,8 +124,8 @@
 #include <sstream>                      // for operator<<, basic_ostream, etc
 #include <utility>                      // for pair
 #include <vector>                       // for vector, etc
-#include "SDL_timer.h"                  // for SDL_GetTicks
-#include "SDL_video.h"                  // for SDL_Color, SDL_Surface
+#include <SDL_timer.h>                  // for SDL_GetTicks
+#include <SDL_video.h>                  // for SDL_Color, SDL_Surface
 #include "lua/lauxlib.h"                // for luaL_checkinteger, etc
 #include "lua/lua.h"                    // for lua_setfield, etc
 

src/sdl/image.cpp

@@ -15,7 +15,7 @@
 
 #include "sdl/image.hpp"
 
-#include "SDL_image.h"
+#include <SDL_image.h>
 #include "sdl/exception.hpp"
 #include "sdl/rect.hpp"
 #include "sdl/utils.hpp"

src/sdl/utils.hpp

@@ -21,7 +21,7 @@
 #include "util.hpp"
 #include "sdl/compat.hpp"
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include <cstdlib>
 #include <iosfwd>

src/sound.cpp

@@ -23,8 +23,8 @@
 #include "sound_music_track.hpp"
 #include "util.hpp"
 
-#include "SDL_mixer.h"
-#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h"
+#include <SDL_mixer.h>
+#include <SDL.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
 
 #include <boost/foreach.hpp>
 

src/soundsource.cpp

@@ -21,7 +21,7 @@
 #include "sound.hpp"
 #include "soundsource.hpp"
 
-#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h"
+#include <SDL.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
 
 namespace soundsource {
 

src/tests/gui/test_save_dialog.cpp

@@ -26,7 +26,7 @@
 #include "unit_types.hpp"
 //
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "tests/utils/fake_event_source.hpp"
 #include "tests/utils/fake_display.hpp"

src/tests/main.cpp

@@ -31,7 +31,7 @@
 
 #include <fstream>
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "filesystem.hpp"
 #include "game_config.hpp"

src/tests/utils/fake_event_source.hpp

@@ -18,7 +18,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <queue>
-#include "SDL.h"
+#include <SDL.h>
 
 #include "events.hpp"
 #include "sdl/compat.hpp"

src/thread.cpp

@@ -19,9 +19,9 @@
 #include "log.hpp"
 #include "thread.hpp"
 
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_version.h"
+#include <SDL_mutex.h>
+#include <SDL_thread.h>
+#include <SDL_version.h>
 
 #define ERR_G LOG_STREAM(err, lg::general())
 

src/tools/cutter.cpp

@@ -20,7 +20,7 @@
 #include "game_config.hpp"
 #include "exploder_composer.hpp"
 
-#include "SDL_image.h"
+#include <SDL_image.h>
 
 #include <iostream>
 

src/tools/exploder_composer.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "exploder_composer.hpp"
-#include "SDL_image.h"
+#include <SDL_image.h>
 
 #include <iostream>
 

src/tools/exploder_cutter.cpp

@@ -18,7 +18,7 @@
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
 #include "serialization/string_utils.hpp"
-#include "SDL_image.h"
+#include <SDL_image.h>
 
 #include <boost/foreach.hpp>
 

src/tooltips.cpp

@@ -23,7 +23,7 @@
 #include "resources.hpp"
 #include "video.hpp"
 
-#include "SDL.h" // Travis doesn't like this, although it works on my machine -> '#include "SDL_sound.h"
+#include <SDL.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>
 
 #include <boost/foreach.hpp>
 

src/unit.cpp

@@ -69,7 +69,7 @@
 #include <iterator>                     // for back_insert_iterator, etc
 #include <new>                          // for operator new
 #include <ostream>                      // for operator<<, basic_ostream, etc
-#include "SDL_video.h"                  // for SDL_Color
+#include <SDL_video.h>                  // for SDL_Color
 
 
 namespace t_translation { struct t_terrain; }

src/widgets/drop_target.hpp

@@ -14,7 +14,7 @@
 #ifndef DROP_TARGET_H_INCLUDED
 #define DROP_TARGET_H_INCLUDED
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include <map>
 

src/widgets/scrollpane.hpp

@@ -20,7 +20,7 @@
 #include <map>
 #include <vector>
 
-#include "SDL.h"
+#include <SDL.h>
 #include "sdl/utils.hpp"
 #include "scrollarea.hpp"
 

src/widgets/slider.hpp

@@ -14,7 +14,7 @@
 #ifndef SLIDER_HPP_INCLUDED
 #define SLIDER_HPP_INCLUDED
 
-#include "SDL.h"
+#include <SDL.h>
 
 #include "sdl/utils.hpp"