[Wesnoth-cvs-commits] wesnoth/src builder.hpp cursor.cpp dialogs.hpp ...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/09 22:21:54

Modified files:
        src            : builder.hpp cursor.cpp dialogs.hpp display.hpp 
                         halo.cpp multiplayer_ui.cpp 
        src/widgets    : widget.cpp 

Log message:
        include cleanup: builder, cursor, dialogs, display

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.hpp.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cursor.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.hpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.cpp.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.hpp
diff -u wesnoth/src/builder.hpp:1.27 wesnoth/src/builder.hpp:1.28
--- wesnoth/src/builder.hpp:1.27        Sun Feb 27 14:09:10 2005
+++ wesnoth/src/builder.hpp     Wed Mar  9 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.hpp,v 1.27 2005/02/27 14:09:10 gruikya Exp $ */
+/* $Id: builder.hpp,v 1.28 2005/03/09 22:21:54 ydirson Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -13,9 +13,9 @@
 #ifndef BUILDER_H_INCLUDED
 #define BUILDER_H_INCLUDED
 
-#include "config.hpp"
+class config;
+class image::locator;
 #include "map.hpp"
-#include "image.hpp"
 #include "animated.hpp"
 #include "SDL.h"
 
Index: wesnoth/src/cursor.cpp
diff -u wesnoth/src/cursor.cpp:1.14 wesnoth/src/cursor.cpp:1.15
--- wesnoth/src/cursor.cpp:1.14 Thu Nov 18 04:08:32 2004
+++ wesnoth/src/cursor.cpp      Wed Mar  9 22:21:54 2005
@@ -6,6 +6,7 @@
 #include "preferences.hpp"
 #include "scoped_resource.hpp"
 #include "sdl_utils.hpp"
+#include "video.hpp"
 
 #include "SDL.h"
 
Index: wesnoth/src/dialogs.hpp
diff -u wesnoth/src/dialogs.hpp:1.29 wesnoth/src/dialogs.hpp:1.30
--- wesnoth/src/dialogs.hpp:1.29        Sun Dec 19 21:18:14 2004
+++ wesnoth/src/dialogs.hpp     Wed Mar  9 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.hpp,v 1.29 2004/12/19 21:18:14 silene Exp $ */
+/* $Id: dialogs.hpp,v 1.30 2005/03/09 22:21:54 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,9 +13,9 @@
 #ifndef DIALOGS_H_INCLUDED
 #define DIALOGS_H_INCLUDED
 
-#include "actions.hpp"
-#include "config.hpp"
-#include "display.hpp"
+class config;
+class display;
+
 #include "map.hpp"
 #include "show_dialog.hpp"
 #include "unit.hpp"
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.93 wesnoth/src/display.hpp:1.94
--- wesnoth/src/display.hpp:1.93        Wed Feb  9 23:32:01 2005
+++ wesnoth/src/display.hpp     Wed Mar  9 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.93 2005/02/09 23:32:01 ydirson Exp $ */
+/* $Id: display.hpp,v 1.94 2005/03/09 22:21:54 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,7 +13,8 @@
 #ifndef DISPLAY_H_INCLUDED
 #define DISPLAY_H_INCLUDED
 
-#include "config.hpp"
+class config;
+class CVideo;
 #include "gamestatus.hpp"
 #include "image.hpp"
 #include "key.hpp"
@@ -25,7 +26,6 @@
 #include "team.hpp"
 #include "theme.hpp"
 #include "unit.hpp"
-#include "video.hpp"
 #include "widgets/button.hpp"
 
 #include "SDL.h"
Index: wesnoth/src/halo.cpp
diff -u wesnoth/src/halo.cpp:1.14 wesnoth/src/halo.cpp:1.15
--- wesnoth/src/halo.cpp:1.14   Mon Feb 21 09:05:51 2005
+++ wesnoth/src/halo.cpp        Wed Mar  9 22:21:54 2005
@@ -5,6 +5,7 @@
 #include "preferences.hpp"
 #include "sdl_utils.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"
 
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.9 wesnoth/src/multiplayer_ui.cpp:1.10
--- wesnoth/src/multiplayer_ui.cpp:1.9  Thu Mar  3 21:52:39 2005
+++ wesnoth/src/multiplayer_ui.cpp      Wed Mar  9 22:21:54 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.9 2005/03/03 21:52:39 gruikya Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.10 2005/03/09 22:21:54 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -11,12 +11,13 @@
    See the COPYING file for more details.
 */
 
+#include "gettext.hpp"
+#include "game_config.hpp"
 #include "global.hpp"
 #include "multiplayer_ui.hpp"
 #include "network.hpp"
-#include "game_config.hpp"
 #include "sound.hpp"
-#include "gettext.hpp"
+#include "video.hpp"
 
 #define LOG_NW lg::info(lg::network)
 #define ERR_NW lg::err(lg::network)
Index: wesnoth/src/widgets/widget.cpp
diff -u wesnoth/src/widgets/widget.cpp:1.27 wesnoth/src/widgets/widget.cpp:1.28
--- wesnoth/src/widgets/widget.cpp:1.27 Thu Feb 24 23:39:35 2005
+++ wesnoth/src/widgets/widget.cpp      Wed Mar  9 22:21:54 2005
@@ -2,6 +2,7 @@
 
 #include "widget.hpp"
 #include "../display.hpp"
+#include "../video.hpp"
 
 namespace {
        const SDL_Rect EmptyRect = {-1234,-1234,0,0};