[Wesnoth-cvs-commits] wesnoth/src game_events.cpp unit.cpp unit.hpp u...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/10 22:57:25

Modified files:
        src            : game_events.cpp unit.cpp unit.hpp 
                         unit_display.cpp unit_display.hpp variable.hpp 

Log message:
        include cleanup: unit*, variable

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.127&tr2=1.128&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.125 wesnoth/src/game_events.cpp:1.126
--- wesnoth/src/game_events.cpp:1.125   Thu Mar 10 20:43:48 2005
+++ wesnoth/src/game_events.cpp Thu Mar 10 22:57:23 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.125 2005/03/10 20:43:48 ydirson Exp $ */
+/* $Id: game_events.cpp,v 1.126 2005/03/10 22:57:23 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,6 +14,7 @@
 #include "global.hpp"
 
 #include "ai.hpp"
+#include "display.hpp"
 #include "game_events.hpp"
 #include "image.hpp"
 #include "language.hpp"
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.127 wesnoth/src/unit.cpp:1.128
--- wesnoth/src/unit.cpp:1.127  Thu Mar 10 20:59:20 2005
+++ wesnoth/src/unit.cpp        Thu Mar 10 22:57:23 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.127 2005/03/10 20:59:20 ydirson Exp $ */
+/* $Id: unit.cpp,v 1.128 2005/03/10 22:57:23 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -21,6 +21,7 @@
 #include "preferences.hpp"
 #include "replay.hpp"
 #include "unit.hpp"
+#include "unit_types.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.62 wesnoth/src/unit.hpp:1.63
--- wesnoth/src/unit.hpp:1.62   Thu Mar 10 20:59:20 2005
+++ wesnoth/src/unit.hpp        Thu Mar 10 22:57:23 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.hpp,v 1.62 2005/03/10 20:59:20 ydirson Exp $ */
+/* $Id: unit.hpp,v 1.63 2005/03/10 22:57:23 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -15,6 +15,7 @@
 
 #include "config.hpp"
 #include "map.hpp"
+#include "race.hpp"
 #include "team.hpp"
 #include "unit_types.hpp"
 
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.51 wesnoth/src/unit_display.cpp:1.52
--- wesnoth/src/unit_display.cpp:1.51   Wed Feb  9 23:32:01 2005
+++ wesnoth/src/unit_display.cpp        Thu Mar 10 22:57:23 2005
@@ -1,6 +1,7 @@
 #include "global.hpp"
 
 #include "actions.hpp"
+#include "display.hpp"
 #include "events.hpp"
 #include "game_config.hpp"
 #include "halo.hpp"
Index: wesnoth/src/unit_display.hpp
diff -u wesnoth/src/unit_display.hpp:1.4 wesnoth/src/unit_display.hpp:1.5
--- wesnoth/src/unit_display.hpp:1.4    Sat Aug  7 17:21:59 2004
+++ wesnoth/src/unit_display.hpp        Thu Mar 10 22:57:23 2005
@@ -1,7 +1,8 @@
 #ifndef UNIT_DISPLAY_HPP_INCLUDED
 #define UNIT_DISPLAY_HPP_INCLUDED
 
-#include "display.hpp"
+class display;
+
 #include "unit.hpp"
 
 ///the unit_display namespace contains a number of free functions
Index: wesnoth/src/variable.hpp
diff -u wesnoth/src/variable.hpp:1.1 wesnoth/src/variable.hpp:1.2
--- wesnoth/src/variable.hpp:1.1        Sun Mar  6 18:12:17 2005
+++ wesnoth/src/variable.hpp    Thu Mar 10 22:57:23 2005
@@ -1,4 +1,4 @@
-/* $Id: variable.hpp,v 1.1 2005/03/06 18:12:17 ydirson Exp $ */
+/* $Id: variable.hpp,v 1.2 2005/03/10 22:57:23 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,7 +13,7 @@
 #ifndef VARIABLE_H_INCLUDED
 #define VARIABLE_H_INCLUDED
 
-#include "config.hpp"
+class config;
 
 namespace game_events {
 std::string& get_variable(const std::string& varname);