[Wesnoth-cvs-commits] wesnoth/src about.hpp actions.hpp cavegen.hpp m...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/09 20:48:42

Modified files:
        src            : about.hpp actions.hpp cavegen.hpp 
                         map_create.cpp mapgen.hpp multiplayer.cpp 
                         multiplayer_connect.cpp playturn.hpp 

Log message:
        include cleanup: about, actions, cavegen, mapgen

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.hpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.hpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cavegen.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_create.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.hpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.119&tr2=1.120&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.hpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text

Patches:
Index: wesnoth/src/about.hpp
diff -u wesnoth/src/about.hpp:1.12 wesnoth/src/about.hpp:1.13
--- wesnoth/src/about.hpp:1.12  Tue Jul 20 11:56:58 2004
+++ wesnoth/src/about.hpp       Wed Mar  9 20:48:42 2005
@@ -1,4 +1,4 @@
-/* $Id: about.hpp,v 1.12 2004/07/20 11:56:58 gakusho Exp $ */
+/* $Id: about.hpp,v 1.13 2005/03/09 20:48:42 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,7 +14,8 @@
 #ifndef ABOUT_H_INCLUDED
 #define ABOUT_H_INCLUDED
 
-#include "display.hpp"
+class display;
+
 #include <vector>
 #include <string>
 
Index: wesnoth/src/actions.hpp
diff -u wesnoth/src/actions.hpp:1.48 wesnoth/src/actions.hpp:1.49
--- wesnoth/src/actions.hpp:1.48        Sun Dec  5 18:37:36 2004
+++ wesnoth/src/actions.hpp     Wed Mar  9 20:48:42 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.hpp,v 1.48 2004/12/05 18:37:36 silene Exp $ */
+/* $Id: actions.hpp,v 1.49 2005/03/09 20:48:42 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,16 +14,18 @@
 #ifndef ACTIONS_H_INCLUDED
 #define ACTIONS_H_INCLUDED
 
-#include "display.hpp"
-#include "gamestatus.hpp"
+class display;
+class gamestatus;
+class replay;
+
 #include "map.hpp"
-#include "replay.hpp"
 #include "unit.hpp"
 #include "unit_types.hpp"
 
 #include <deque>
 #include <map>
 #include <string>
+#include <vector>
 
 //this file defines various functions which implement different in-game
 //events and commands.
Index: wesnoth/src/cavegen.hpp
diff -u wesnoth/src/cavegen.hpp:1.5 wesnoth/src/cavegen.hpp:1.6
--- wesnoth/src/cavegen.hpp:1.5 Mon May  3 18:08:12 2004
+++ wesnoth/src/cavegen.hpp     Wed Mar  9 20:48:42 2005
@@ -3,6 +3,8 @@
 
 #include "mapgen.hpp"
 
+#include <set>
+
 class cave_map_generator : public map_generator
 {
 public:
Index: wesnoth/src/map_create.cpp
diff -u wesnoth/src/map_create.cpp:1.2 wesnoth/src/map_create.cpp:1.3
--- wesnoth/src/map_create.cpp:1.2      Tue Mar  8 02:29:10 2005
+++ wesnoth/src/map_create.cpp  Wed Mar  9 20:48:42 2005
@@ -4,6 +4,7 @@
 #include "log.hpp"
 #include "map_create.hpp"
 #include "mapgen_dialog.hpp"
+#include "serialization/string_utils.hpp"
 
 #define ERR_CF lg::err(lg::config)
 
Index: wesnoth/src/mapgen.hpp
diff -u wesnoth/src/mapgen.hpp:1.12 wesnoth/src/mapgen.hpp:1.13
--- wesnoth/src/mapgen.hpp:1.12 Sat Mar  5 16:07:54 2005
+++ wesnoth/src/mapgen.hpp      Wed Mar  9 20:48:42 2005
@@ -1,10 +1,14 @@
 #ifndef MAP_GEN_HPP_INCLUDED
 #define MAP_GEN_HPP_INCLUDED
 
-#include "config.hpp"
-#include "display.hpp"
+class config;
+class display;
 
+#include "map.hpp"
+
+#include <map>
 #include <string>
+#include <vector>
 
 class map_generator
 {
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.145 wesnoth/src/multiplayer.cpp:1.146
--- wesnoth/src/multiplayer.cpp:1.145   Sat Mar  5 10:54:25 2005
+++ wesnoth/src/multiplayer.cpp Wed Mar  9 20:48:42 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.145 2005/03/05 10:54:25 silene Exp $ */
+/* $Id: multiplayer.cpp,v 1.146 2005/03/09 20:48:42 ydirson Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -25,6 +25,7 @@
 #include "network.hpp"
 #include "playlevel.hpp"
 #include "preferences.hpp"
+#include "replay.hpp"
 
 #define LOG_NW lg::info(lg::network)
 
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.119 
wesnoth/src/multiplayer_connect.cpp:1.120
--- wesnoth/src/multiplayer_connect.cpp:1.119   Wed Mar  9 09:45:04 2005
+++ wesnoth/src/multiplayer_connect.cpp Wed Mar  9 20:48:42 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.119 2005/03/09 09:45:04 j_daniel Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.120 2005/03/09 20:48:42 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -15,11 +15,12 @@
 #include "dialogs.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
+#include "gettext.hpp"
 #include "multiplayer_connect.hpp"
 #include "preferences.hpp"
+#include "replay.hpp"
 #include "show_dialog.hpp"
 #include "wassert.hpp"
-#include "gettext.hpp"
 #include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)
Index: wesnoth/src/playturn.hpp
diff -u wesnoth/src/playturn.hpp:1.61 wesnoth/src/playturn.hpp:1.62
--- wesnoth/src/playturn.hpp:1.61       Sun Feb  6 10:40:12 2005
+++ wesnoth/src/playturn.hpp    Wed Mar  9 20:48:42 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.hpp,v 1.61 2005/02/06 10:40:12 isaaccp Exp $ */
+/* $Id: playturn.hpp,v 1.62 2005/03/09 20:48:42 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,6 +13,8 @@
 #ifndef PLAYTURN_HPP_INCLUDED
 #define PLAYTURN_HPP_INCLUDED
 
+class replay_network_sender;
+
 #include "actions.hpp"
 #include "ai_interface.hpp"
 #include "config.hpp"