From 98cca22c6509437cb1bf8075577031f624139c6f Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sat, 10 Dec 2016 21:53:34 +1100 Subject: [PATCH] Moved the SDL_Rect ostream operator to the appropriate file --- src/gui/widgets/minimap.cpp | 1 + src/gui/widgets/panel.cpp | 1 + src/gui/widgets/styled_widget.cpp | 1 + src/gui/widgets/tree_view_node.cpp | 1 + src/sdl/rect.hpp | 2 ++ src/sdl/utils.hpp | 2 -- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/minimap.cpp b/src/gui/widgets/minimap.cpp index 654009d92992..e3f9985718a7 100644 --- a/src/gui/widgets/minimap.cpp +++ b/src/gui/widgets/minimap.cpp @@ -23,6 +23,7 @@ #include "gui/widgets/settings.hpp" #include "map/map.hpp" #include "map/exception.hpp" +#include "sdl/rect.hpp" #include "terrain/type_data.hpp" #include "../../minimap.hpp" // We want the file in src/ diff --git a/src/gui/widgets/panel.cpp b/src/gui/widgets/panel.cpp index e7c2d5b8e47b..1682ba802025 100644 --- a/src/gui/widgets/panel.cpp +++ b/src/gui/widgets/panel.cpp @@ -20,6 +20,7 @@ #include "gui/core/register_widget.hpp" #include "gui/widgets/settings.hpp" #include "gettext.hpp" +#include "sdl/rect.hpp" #include "wml_exception.hpp" #include "utils/functional.hpp" diff --git a/src/gui/widgets/styled_widget.cpp b/src/gui/widgets/styled_widget.cpp index f639c5941a76..736b78f8641b 100644 --- a/src/gui/widgets/styled_widget.cpp +++ b/src/gui/widgets/styled_widget.cpp @@ -26,6 +26,7 @@ #include "hotkey/hotkey_item.hpp" #include "formatter.hpp" #include "gettext.hpp" +#include "sdl/rect.hpp" #include "wml_exception.hpp" #include "utils/functional.hpp" diff --git a/src/gui/widgets/tree_view_node.cpp b/src/gui/widgets/tree_view_node.cpp index 296d3488e595..f374607d774e 100644 --- a/src/gui/widgets/tree_view_node.cpp +++ b/src/gui/widgets/tree_view_node.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/toggle_button.hpp" #include "gui/widgets/toggle_panel.hpp" #include "gui/widgets/tree_view.hpp" +#include "sdl/rect.hpp" #include "utils/functional.hpp" diff --git a/src/sdl/rect.hpp b/src/sdl/rect.hpp index b250f18bf06a..e86522e855f8 100644 --- a/src/sdl/rect.hpp +++ b/src/sdl/rect.hpp @@ -146,4 +146,6 @@ inline void fill_rect(surface& dst, SDL_Rect* dst_rect, const Uint32 color) bool operator==(const SDL_Rect& a, const SDL_Rect& b); bool operator!=(const SDL_Rect& a, const SDL_Rect& b); +std::ostream& operator<<(std::ostream& s, const SDL_Rect& rect); + #endif diff --git a/src/sdl/utils.hpp b/src/sdl/utils.hpp index 927e2a3b10eb..1a278f63c46e 100644 --- a/src/sdl/utils.hpp +++ b/src/sdl/utils.hpp @@ -496,6 +496,4 @@ struct clip_rect_setter void draw_centered_on_background(surface surf, const SDL_Rect& rect, const color_t& color, surface target); -std::ostream& operator<<(std::ostream& s, const SDL_Rect& rect); - #endif