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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/23 08:52:10

Modified files:
        src            : builder.cpp builder.hpp game_errors.hpp 
                         hotkeys.hpp image.hpp replay.hpp tooltips.hpp 
                         variable.hpp 
        src/widgets    : file_chooser.hpp 

Log message:
        Please verify that the headers are still self-contained after removing 
a dependency.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.cpp.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/builder.hpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_errors.hpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.hpp.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/image.hpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.hpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.hpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: wesnoth/src/builder.cpp
diff -u wesnoth/src/builder.cpp:1.47 wesnoth/src/builder.cpp:1.48
--- wesnoth/src/builder.cpp:1.47        Sun Mar 20 16:20:28 2005
+++ wesnoth/src/builder.cpp     Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.cpp,v 1.47 2005/03/20 16:20:28 ydirson Exp $ */
+/* $Id: builder.cpp,v 1.48 2005/03/23 08:52:10 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -15,6 +15,7 @@
 
 #include "array.hpp"
 #include "builder.hpp"
+#include "config.hpp"
 #include "log.hpp"
 #include "pathutils.hpp"
 #include "terrain.hpp"
Index: wesnoth/src/builder.hpp
diff -u wesnoth/src/builder.hpp:1.29 wesnoth/src/builder.hpp:1.30
--- wesnoth/src/builder.hpp:1.29        Sun Mar 20 16:20:28 2005
+++ wesnoth/src/builder.hpp     Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: builder.hpp,v 1.29 2005/03/20 16:20:28 ydirson Exp $ */
+/* $Id: builder.hpp,v 1.30 2005/03/23 08:52:10 silene Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -13,14 +13,16 @@
 #ifndef BUILDER_H_INCLUDED
 #define BUILDER_H_INCLUDED
 
-class config;
+#include "animated.hpp"
 #include "image.hpp"
 #include "map.hpp"
-#include "animated.hpp"
 #include "SDL.h"
 
-#include <string>
 #include <map>
+#include <set>
+#include <string>
+
+class config;
 
 /**
  * The class terrain_builder is constructed from a config object, and a gamemap
Index: wesnoth/src/game_errors.hpp
diff -u wesnoth/src/game_errors.hpp:1.1 wesnoth/src/game_errors.hpp:1.2
--- wesnoth/src/game_errors.hpp:1.1     Tue Mar 22 23:42:36 2005
+++ wesnoth/src/game_errors.hpp Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: game_errors.hpp,v 1.1 2005/03/22 23:42:36 ydirson Exp $ */
+/* $Id: game_errors.hpp,v 1.2 2005/03/23 08:52:10 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Yann Dirson <address@hidden>
@@ -14,6 +14,8 @@
 #ifndef GAME_ERRORS_HPP_INCLUDED
 #define GAME_ERRORS_HPP_INCLUDED
 
+#include <string>
+
 namespace game {
 struct error {
        error() {}
Index: wesnoth/src/hotkeys.hpp
diff -u wesnoth/src/hotkeys.hpp:1.57 wesnoth/src/hotkeys.hpp:1.58
--- wesnoth/src/hotkeys.hpp:1.57        Thu Mar 10 01:24:31 2005
+++ wesnoth/src/hotkeys.hpp     Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.hpp,v 1.57 2005/03/10 01:24:31 ydirson Exp $ */
+/* $Id: hotkeys.hpp,v 1.58 2005/03/23 08:52:10 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,9 +13,14 @@
 #ifndef HOTKEYS_HPP_INCLUDED
 #define HOTKEYS_HPP_INCLUDED
 
+#include "events.hpp"
+#include "SDL.h"
+
+#include <string>
+#include <vector>
+
 class config;
 class display;
-#include "SDL.h"
 
 //the hotkey system allows hotkey definitions to be loaded from
 //configuration objects, and then detect if a keyboard event
Index: wesnoth/src/image.hpp
diff -u wesnoth/src/image.hpp:1.33 wesnoth/src/image.hpp:1.34
--- wesnoth/src/image.hpp:1.33  Thu Mar 10 01:47:57 2005
+++ wesnoth/src/image.hpp       Wed Mar 23 08:52:10 2005
@@ -2,7 +2,6 @@
 #define IMAGE_HPP_INCLUDED
 
 #include "map.hpp"
-#include "unit.hpp"
 #include "sdl_utils.hpp"
 
 #include "SDL.h"
Index: wesnoth/src/replay.hpp
diff -u wesnoth/src/replay.hpp:1.31 wesnoth/src/replay.hpp:1.32
--- wesnoth/src/replay.hpp:1.31 Tue Mar 22 23:42:37 2005
+++ wesnoth/src/replay.hpp      Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: replay.hpp,v 1.31 2005/03/22 23:42:37 ydirson Exp $ */
+/* $Id: replay.hpp,v 1.32 2005/03/23 08:52:10 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,14 +13,14 @@
 #ifndef REPLAY_H_INCLUDED
 #define REPLAY_H_INCLUDED
 
-class display;
-class gamestatus;
-
 #include "config.hpp"
+#include "gamestatus.hpp"
 #include "map.hpp"
 #include "random.hpp"
 #include "unit.hpp"
 
+class display;
+
 struct verification_manager
 {
        verification_manager(const unit_map& units);
Index: wesnoth/src/tooltips.hpp
diff -u wesnoth/src/tooltips.hpp:1.10 wesnoth/src/tooltips.hpp:1.11
--- wesnoth/src/tooltips.hpp:1.10       Tue Mar 15 20:01:31 2005
+++ wesnoth/src/tooltips.hpp    Wed Mar 23 08:52:10 2005
@@ -1,10 +1,12 @@
 #ifndef TOOLTIPS_HPP_INCLUDED
 #define TOOLTIPS_HPP_INCLUDED
 
-class CVideo;
-
 #include "SDL.h"
 
+#include <string>
+
+class CVideo;
+
 namespace tooltips {
 
 struct manager
Index: wesnoth/src/variable.hpp
diff -u wesnoth/src/variable.hpp:1.2 wesnoth/src/variable.hpp:1.3
--- wesnoth/src/variable.hpp:1.2        Thu Mar 10 22:57:23 2005
+++ wesnoth/src/variable.hpp    Wed Mar 23 08:52:10 2005
@@ -1,4 +1,4 @@
-/* $Id: variable.hpp,v 1.2 2005/03/10 22:57:23 ydirson Exp $ */
+/* $Id: variable.hpp,v 1.3 2005/03/23 08:52:10 silene 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 VARIABLE_H_INCLUDED
 #define VARIABLE_H_INCLUDED
 
+#include <string>
+
 class config;
 
 namespace game_events {
Index: wesnoth/src/widgets/file_chooser.hpp
diff -u wesnoth/src/widgets/file_chooser.hpp:1.11 
wesnoth/src/widgets/file_chooser.hpp:1.12
--- wesnoth/src/widgets/file_chooser.hpp:1.11   Fri Mar 18 21:21:48 2005
+++ wesnoth/src/widgets/file_chooser.hpp        Wed Mar 23 08:52:10 2005
@@ -18,6 +18,8 @@
 #include "textbox.hpp"
 #include "widget.hpp"
 
+class display;
+
 namespace gui {
 
 /// A widget where the user may navigate through directories and choose