Move sdl_utils to sdl/utils.

src/CMakeLists.txt

@@ -363,6 +363,7 @@ set(wesnoth-sdl_SRC
 	sdl/rect.cpp
 	sdl/texture.cpp
 	sdl/window.cpp
+	sdl/utils.cpp
 )
 
 add_library(wesnoth-sdl
@@ -948,7 +949,6 @@ set(libwesnoth-game_STAT_SRC
 	race.cpp
 	random.cpp
 	reports.cpp
-	sdl_utils.cpp
 	show_dialog.cpp
 	simple_rng.cpp
 	sound.cpp
@@ -1127,7 +1127,7 @@ set(exploder_SRC
 	tools/exploder_cutter.cpp
 	tools/exploder_composer.cpp
 	tools/dummy_video.cpp
-	sdl_utils.cpp
+	sdl/utils.cpp
 	tracer.cpp
 	loadscreen_empty.cpp
 )
@@ -1143,7 +1143,7 @@ set(cutter_SRC
 	tools/exploder_utils.cpp
 	tools/exploder_cutter.cpp
 	tools/dummy_video.cpp
-	sdl_utils.cpp
+	sdl/utils.cpp
 	tracer.cpp
 	loadscreen_empty.cpp
 )
@@ -1194,7 +1194,7 @@ set(wesmage_SRC
 	wesmage/options.cpp
 	tools/dummy_video.cpp
 	tools/exploder_utils.cpp
-	sdl_utils.cpp
+	sdl/utils.cpp
 	tracer.cpp
 	loadscreen_empty.cpp
 )
@@ -1330,7 +1330,7 @@ if(ENABLE_TESTS)
 			tests/create_images.cpp
 			tools/dummy_video.cpp
 			tools/exploder_utils.cpp
-			sdl_utils.cpp
+			sdl/utils.cpp
 			tracer.cpp
 			loadscreen_empty.cpp
 		)

src/SConscript

@@ -151,7 +151,7 @@ libcampaignd_sources = Split("""
 libcampaignd = env.Library("campaignd", libcampaignd_sources, OBJPREFIX = "campaignd_")
 
 libwesnoth_sdl_sources = Split("""
-    sdl_utils.cpp
+    sdl/utils.cpp
     sdl/alpha.cpp
     sdl/exception.cpp
     sdl/rect.cpp
@@ -639,7 +639,7 @@ wesmage_sources = Split("""
     wesmage/options.cpp
     tools/dummy_video.cpp
     tools/exploder_utils.cpp
-    sdl_utils.cpp
+    sdl/utils.cpp
     sdl/alpha.cpp
     sdl/window.cpp
     tracer.cpp
@@ -686,7 +686,7 @@ create_images_sources = Split("""
     tests/create_images.cpp
     tools/dummy_video.cpp
     tools/exploder_utils.cpp
-    sdl_utils.cpp
+    sdl/utils.cpp
     sdl/alpha.cpp
     sdl/window.cpp
     tracer.cpp

src/ai/testing/ca_global_fallback.cpp

@@ -27,7 +27,7 @@
 #include "../../map_label.hpp"
 #include "../../replay.hpp"
 #include "../../resources.hpp"
-#include "../../sdl_utils.hpp"
+#include "../../sdl/utils.hpp"
 #include "../../team.hpp"
 #include "../../terrain_filter.hpp"
 #include "../../tod_manager.hpp"

src/font.hpp

@@ -16,7 +16,7 @@
 
 #include "exceptions.hpp"
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <SDL_ttf.h>
 

src/gui/auxiliary/canvas.hpp

@@ -22,7 +22,7 @@
 #define GUI_AUXILIARY_CANVAS_HPP_INCLUDED
 
 #include "formula_callable.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 class config;
 class variant;

src/gui/dialogs/lobby/lobby_data.hpp

@@ -15,7 +15,7 @@
 #ifndef INC_LOBBY_DATA
 #define INC_LOBBY_DATA
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <set>
 #include <deque>

src/gui/widgets/widget.hpp

@@ -19,7 +19,7 @@
 #include "gui/lib/types/point.hpp"
 #include "gui/widgets/event_executor.hpp"
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <boost/noncopyable.hpp>
 

src/hotkey/hotkey_item.cpp

@@ -20,7 +20,7 @@
 
 #include "gettext.hpp"
 #include "serialization/unicode.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include "boost/foreach.hpp"
 #include <boost/algorithm/string/join.hpp>

src/image.hpp

@@ -16,7 +16,7 @@
 #define IMAGE_HPP_INCLUDED
 
 #include "map_location.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "terrain_translation.hpp"
 #include "game_config.hpp"
 

src/image_modifications.hpp

@@ -17,7 +17,7 @@
 #ifndef IMAGE_MODIFICATIONS_HPP_INCLUDED
 #define IMAGE_MODIFICATIONS_HPP_INCLUDED
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include <queue>
 
 namespace image {

src/joystick.hpp

@@ -13,7 +13,7 @@
 */
 
 #include <vector>
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "map.hpp"
 
 #ifndef JOYSTICK_HPP_

src/loadscreen.hpp

@@ -19,7 +19,7 @@
 
 class CVideo;
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 class loadscreen {
 	public:

src/minimap.cpp

@@ -21,7 +21,7 @@
 #include "image.hpp"
 #include "log.hpp"
 #include "map.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include "team.hpp"
 #include "wml_exception.hpp"

src/sdl/rect.cpp

@@ -14,7 +14,7 @@
 
 #include "sdl/rect.hpp"
 #include "sdl/alpha.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 namespace sdl
 {

src/sdl/rect.hpp

@@ -21,7 +21,7 @@
  */
 
 #include <SDL_version.h>
-#include <sdl_utils.hpp>
+#include "utils.hpp"
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 #include <SDL_rect.h>

src/sdl/texture.cpp

@@ -20,7 +20,7 @@
 #include "SDL_image.h"
 #include "sdl/exception.hpp"
 #include "sdl/rect.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <cassert>
 

src/sdl_utils.cpp → src/sdl/utils.cpp

@@ -19,7 +19,7 @@
 
 #include "global.hpp"
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "sdl/alpha.hpp"
 #include "sdl/rect.hpp"
 

src/sdl/window.hpp

@@ -24,7 +24,7 @@
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <boost/noncopyable.hpp>
 
@@ -109,7 +109,7 @@ class twindow : private boost::noncopyable
 	 *
 	 * This is a wrapper for @ref SDL_SetWindowTitle.
 	 *
-	 * @param title               The new title for the window.
+	 * @param title               The new title for the window.
 	 */
 	void set_title(const std::string& title);
 
@@ -121,7 +121,7 @@ class twindow : private boost::noncopyable
 	 * @note The @p icon is a @ref SDL_Surface and not a @ref SDL_Texture, this
 	 * is part of the SDL 2 API.
 	 *
-	 * @param icon                The new icon for the window.
+	 * @param icon                The new icon for the window.
 	 */
 	void set_icon(const surface& icon);
 

src/storyscreen/part.hpp

@@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 class config;
 class vconfig;

src/tests/gui/test_drop_target.cpp

@@ -19,7 +19,7 @@
 #include <boost/bind.hpp>
 
 #include "sdl/rect.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "widgets/drop_target.hpp"
 
 BOOST_AUTO_TEST_SUITE( test_drop_target )

src/tests/test_sdl_utils.hpp

@@ -15,7 +15,7 @@
 #ifndef TESTS_TEST_SDL_UTILS_HPP_INCLUDED
 #define TESTS_TEST_SDL_UTILS_HPP_INCLUDED
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <boost/function.hpp>
 

src/text.hpp

@@ -15,7 +15,7 @@
 #ifndef TEXT_HPP_INCLUDED
 #define TEXT_HPP_INCLUDED
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "serialization/unicode.hpp"
 
 #include <boost/noncopyable.hpp>

src/tools/dummy_video.cpp

@@ -15,7 +15,7 @@
 /** @file */
 
 #include "../video.hpp"
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 
 static surface dummy_screen_surface(NULL);
 

src/tools/exploder_cutter.hpp

@@ -15,9 +15,8 @@
 #ifndef EXPLODER_CUTTER_HPP_INCLUDED
 #define EXPLODER_CUTTER_HPP_INCLUDED
 
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 #include "../config.hpp"
-#include "../sdl_utils.hpp"
 #include "exploder_utils.hpp"
 
 class cutter

src/tools/exploder_utils.hpp

@@ -15,7 +15,7 @@
 #ifndef EXPLODER_UTILS_HPP_INCLUDED
 #define EXPLODER_UTILS_HPP_INCLUDED
 
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 #include <string>
 
 struct exploder_failure

src/video.cpp

@@ -24,7 +24,7 @@
 #include "log.hpp"
 #include "preferences.hpp"
 #include "preferences_display.hpp"
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 #include "sdl/rect.hpp"
 #include "sdl/window.hpp"
 #include "video.hpp"

src/wesmage/filter.hpp

@@ -20,7 +20,7 @@
 #ifndef WESMAGE_FILTER_HPP_INCLUDED
 #define WESMAGE_FILTER_HPP_INCLUDED
 
-#include "sdl_utils.hpp"
+#include "sdl/utils.hpp"
 
 #include <string>
 #include <vector>

src/widgets/scrollpane.hpp

@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "SDL.h"
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 #include "scrollarea.hpp"
 
 namespace gui {

src/widgets/slider.hpp

@@ -16,7 +16,7 @@
 
 #include "SDL.h"
 
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 
 #include "widget.hpp"
 

src/widgets/widget.hpp

@@ -16,7 +16,7 @@
 #define WIDGET_HPP_INCLUDED
 
 #include "../events.hpp"
-#include "../sdl_utils.hpp"
+#include "../sdl/utils.hpp"
 
 class CVideo;