[Wesnoth-cvs-commits] wesnoth/src halo.hpp hotkeys.hpp intro.hpp lead...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/10 01:24:31

Modified files:
        src            : halo.hpp hotkeys.hpp intro.hpp leader_list.cpp 
                         leader_list.hpp 

Log message:
        include cleanup: halo, hotkeys, intro, leader_list

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/halo.hpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.hpp.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.hpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/leader_list.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/leader_list.hpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/src/halo.hpp
diff -u wesnoth/src/halo.hpp:1.7 wesnoth/src/halo.hpp:1.8
--- wesnoth/src/halo.hpp:1.7    Sun Jul 18 19:02:22 2004
+++ wesnoth/src/halo.hpp        Thu Mar 10 01:24:31 2005
@@ -1,7 +1,7 @@
 #ifndef HALO_HPP_INCLUDED
 #define HALO_HPP_INCLUDED
 
-#include "display.hpp"
+class display;
 #include "animated.hpp"
 
 #include <string>
Index: wesnoth/src/hotkeys.hpp
diff -u wesnoth/src/hotkeys.hpp:1.56 wesnoth/src/hotkeys.hpp:1.57
--- wesnoth/src/hotkeys.hpp:1.56        Sat Mar  5 19:03:56 2005
+++ wesnoth/src/hotkeys.hpp     Thu Mar 10 01:24:31 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.hpp,v 1.56 2005/03/05 19:03:56 j_daniel Exp $ */
+/* $Id: hotkeys.hpp,v 1.57 2005/03/10 01:24:31 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,10 +13,9 @@
 #ifndef HOTKEYS_HPP_INCLUDED
 #define HOTKEYS_HPP_INCLUDED
 
-#include "config.hpp"
-#include "display.hpp"
-#include "events.hpp"
-#include "key.hpp"
+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/intro.hpp
diff -u wesnoth/src/intro.hpp:1.17 wesnoth/src/intro.hpp:1.18
--- wesnoth/src/intro.hpp:1.17  Sat Aug 28 23:00:13 2004
+++ wesnoth/src/intro.hpp       Thu Mar 10 01:24:31 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.hpp,v 1.17 2004/08/28 23:00:13 Sirp Exp $ */
+/* $Id: intro.hpp,v 1.18 2005/03/10 01:24:31 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,10 +13,9 @@
 #ifndef INTRO_HPP_INCLUDED
 #define INTRO_HPP_INCLUDED
 
+class config;
+class display;
 #include "SDL.h"
-#include "config.hpp"
-#include "display.hpp"
-#include "gamestatus.hpp"
 
 #include <string>
 
Index: wesnoth/src/leader_list.cpp
diff -u wesnoth/src/leader_list.cpp:1.7 wesnoth/src/leader_list.cpp:1.8
--- wesnoth/src/leader_list.cpp:1.7     Thu Mar  3 21:52:39 2005
+++ wesnoth/src/leader_list.cpp Thu Mar 10 01:24:31 2005
@@ -1,4 +1,4 @@
-/* $Id: leader_list.cpp,v 1.7 2005/03/03 21:52:39 gruikya Exp $ */
+/* $Id: leader_list.cpp,v 1.8 2005/03/10 01:24:31 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,6 +16,7 @@
 #include "leader_list.hpp"
 #include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
+#include "widgets/combo.hpp"
 #include "widgets/menu.hpp"
 
 const std::string 
leader_list_manager::random_enemy_picture("random-enemy.png");
Index: wesnoth/src/leader_list.hpp
diff -u wesnoth/src/leader_list.hpp:1.2 wesnoth/src/leader_list.hpp:1.3
--- wesnoth/src/leader_list.hpp:1.2     Sat Feb 26 21:18:14 2005
+++ wesnoth/src/leader_list.hpp Thu Mar 10 01:24:31 2005
@@ -1,4 +1,4 @@
-/* $Id: leader_list.hpp,v 1.2 2005/02/26 21:18:14 gruikya Exp $ */
+/* $Id: leader_list.hpp,v 1.3 2005/03/10 01:24:31 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -14,9 +14,10 @@
 #ifndef LEADER_LIST_HPP_INCLUDED
 #define LEADER_LIST_HPP_INCLUDED
 
-#include "config.hpp"
-#include "widgets/combo.hpp"
-#include "gamestatus.hpp"
+class config;
+namespace gui { class combo; }
+
+#include "unit_types.hpp"
 #include <string>
 
 class leader_list_manager