Cleaned up inclusions of video.hpp

src/addon/manager.cpp

@@ -36,7 +36,6 @@
 #include "marked-up_text.hpp"
 #include "serialization/parser.hpp"
 #include "version.hpp"
-#include "video.hpp"
 #include "wml_separators.hpp"
 #include "formula_string_utils.hpp"
 #include "addon/client.hpp"

src/cursor.cpp

@@ -23,7 +23,6 @@
 #include "image.hpp"
 #include "preferences_display.hpp"
 #include "sdl/rect.hpp"
-#include "video.hpp"
 
 #include <iostream>
 #include <boost/logic/tribool.hpp>

src/font.cpp

@@ -25,7 +25,6 @@
 #include "marked-up_text.hpp"
 #include "text.hpp"
 #include "tooltips.hpp"
-#include "video.hpp"
 #include "sdl/alpha.hpp"
 #include "sdl/rect.hpp"
 #include "serialization/parser.hpp"

src/generators/default_map_generator.cpp

@@ -19,7 +19,6 @@
 #include "default_map_generator.hpp"
 
 #include "default_map_generator_job.hpp"
-#include "video.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"

src/gui/auxiliary/event/dispatcher.hpp

@@ -22,8 +22,6 @@
 
 #include "SDL_events.h"
 
-#include "video.hpp"
-
 #include "utils/boost_function_guarded.hpp"
 #include <boost/mpl/int.hpp>
 #include <boost/utility/enable_if.hpp>

src/gui/auxiliary/event/distributor.hpp

@@ -42,6 +42,8 @@
 #include "gui/auxiliary/event/handler.hpp"
 #include "gui/lib/types/point.hpp"
 #include "serialization/unicode_types.hpp"
+#include "video.hpp"
+
 #include <string>
 #include <vector>
 

src/show_dialog.hpp

@@ -16,14 +16,13 @@
 #define SHOW_DIALOG_HPP_INCLUDED
 
 class config;
-class CVideo;
 class display;
 
 #include "cursor.hpp"
 #include "floating_label.hpp"
 #include "font.hpp"
 #include "tooltips.hpp"
-
+#include "video.hpp"
 #include "widgets/menu.hpp"
 
 namespace gui

src/storyscreen/controller.hpp

@@ -22,10 +22,10 @@
 
 #include "events.hpp"
 #include "interface.hpp"
-#include "video.hpp" //for resize_lock
 
 #include <boost/shared_ptr.hpp>
 
+class CVideo;
 class vconfig;
 
 namespace storyscreen {

src/storyscreen/interface.cpp

@@ -29,6 +29,7 @@
 #include "log.hpp"
 #include "sound.hpp"
 #include "text.hpp"
+#include "video.hpp"
 
 static lg::log_domain log_engine("engine");
 #define LOG_NG LOG_STREAM(info, log_engine)

src/storyscreen/render.hpp

@@ -24,12 +24,11 @@
 #include "key.hpp"
 #include "storyscreen/part.hpp"
 #include "events.hpp"
-#include "video.hpp"
 // #include "widgets/button.hpp"
 
+class CVideo;
 class display;
 
-
 namespace gui { class button; }
 
 namespace storyscreen {

src/widgets/widget.hpp

@@ -17,7 +17,6 @@
 
 #include "events.hpp"
 #include "sdl/utils.hpp"
-#include "video.hpp"
 
 class CVideo;