Skip to content

Commit

Permalink
Include SDL files as system headers
Browse files Browse the repository at this point in the history
This excludes inclusions in SDL_GPU files.
  • Loading branch information
Vultraz committed Mar 20, 2016
1 parent 6f57ee8 commit 37d9b10
Show file tree
Hide file tree
Showing 44 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion src/ai/manager.cpp
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/ai/testing/ca.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/ai/testing/stage_sf_with_rca.cpp
Expand Up @@ -37,7 +37,7 @@
#include "unit.hpp"

#include <boost/bind.hpp>
#include "SDL.h"
#include <SDL.h>

namespace ai {

Expand Down
2 changes: 1 addition & 1 deletion src/animated.tpp
Expand Up @@ -21,7 +21,7 @@

#include <climits>

#include "SDL.h"
#include <SDL.h>
#include "animated.hpp"

namespace {
Expand Down
2 changes: 1 addition & 1 deletion src/color_range.hpp
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/display.cpp
Expand Up @@ -47,7 +47,7 @@
#include "whiteboard/manager.hpp"
#include "show_dialog.hpp"

#include "SDL_image.h"
#include <SDL_image.h>

#include <boost/foreach.hpp>

Expand Down
4 changes: 2 additions & 2 deletions src/display_chat_manager.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/events.cpp
Expand Up @@ -26,7 +26,7 @@
#include "desktop/windows_tray_notification.hpp"
#endif

#include "SDL.h"
#include <SDL.h>

#include <algorithm>
#include <cassert>
Expand Down
4 changes: 2 additions & 2 deletions src/events.hpp
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/game_launcher.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/generators/default_map_generator_job.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/auxiliary/event/dispatcher.hpp
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/auxiliary/event/dispatcher_private.hpp
Expand Up @@ -19,7 +19,7 @@

#include "gui/widgets/widget.hpp"

#include "SDL_events.h"
#include <SDL_events.h>

#include <boost/mpl/for_each.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/helper.cpp
Expand Up @@ -22,7 +22,7 @@

#include "formula_string_utils.hpp"

#include "SDL_ttf.h"
#include <SDL_ttf.h>

namespace gui2
{
Expand Down
2 changes: 1 addition & 1 deletion src/help/help_browser.cpp
Expand Up @@ -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 _
Expand Down
2 changes: 1 addition & 1 deletion src/help/help_browser.hpp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/help/help_text_area.hpp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/hotkey/hotkey_item.cpp
Expand Up @@ -32,7 +32,7 @@

#include "key.hpp"

#include "SDL.h"
#include <SDL.h>


static lg::log_domain log_config("config");
Expand Down
4 changes: 2 additions & 2 deletions src/hotkey/hotkey_item.hpp
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/image.cpp
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/log.cpp
Expand Up @@ -22,7 +22,7 @@
#include "game_errors.hpp"
#include "global.hpp"

#include "SDL_timer.h"
#include <SDL_timer.h>

#include "log.hpp"

Expand Down
4 changes: 2 additions & 2 deletions src/mouse_events.cpp
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion src/mouse_events.hpp
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/mouse_handler_base.hpp
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/network.hpp
Expand Up @@ -23,7 +23,7 @@
class config;

#include "exceptions.hpp"
#include "SDL_net.h"
#include <SDL_net.h>

#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/preferences.hpp
Expand Up @@ -22,7 +22,7 @@ class display;

#include "terrain_translation.hpp"

#include "SDL.h"
#include <SDL.h>

#include <utility>

Expand Down
2 changes: 1 addition & 1 deletion src/save_blocker.hpp
Expand Up @@ -15,7 +15,7 @@
#ifndef SAVE_BLOCKER_H_INCLUDED
#define SAVE_BLOCKER_H_INCLUDED

#include "SDL_mutex.h"
#include <SDL_mutex.h>

#include <cassert>

Expand Down
4 changes: 2 additions & 2 deletions src/scripting/game_lua_kernel.cpp
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/sdl/image.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/sdl/utils.hpp
Expand Up @@ -21,7 +21,7 @@
#include "util.hpp"
#include "sdl/compat.hpp"

#include "SDL.h"
#include <SDL.h>

#include <cstdlib>
#include <iosfwd>
Expand Down
4 changes: 2 additions & 2 deletions src/sound.cpp
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/soundsource.cpp
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/tests/gui/test_save_dialog.cpp
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/main.cpp
Expand Up @@ -31,7 +31,7 @@

#include <fstream>

#include "SDL.h"
#include <SDL.h>

#include "filesystem.hpp"
#include "game_config.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/utils/fake_event_source.hpp
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/thread.cpp
Expand Up @@ -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())

Expand Down
2 changes: 1 addition & 1 deletion src/tools/cutter.cpp
Expand Up @@ -20,7 +20,7 @@
#include "game_config.hpp"
#include "exploder_composer.hpp"

#include "SDL_image.h"
#include <SDL_image.h>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion src/tools/exploder_composer.cpp
Expand Up @@ -13,7 +13,7 @@
*/

#include "exploder_composer.hpp"
#include "SDL_image.h"
#include <SDL_image.h>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion src/tools/exploder_cutter.cpp
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/tooltips.cpp
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/unit.cpp
Expand Up @@ -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; }
Expand Down

0 comments on commit 37d9b10

Please sign in to comment.