[Wesnoth-cvs-commits] wesnoth/src font.cpp font.hpp editor/editor_mai...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/09 23:30:28

Modified files:
        src            : font.cpp font.hpp 
        src/editor     : editor_main.cpp 
        src/widgets    : label.cpp progressbar.cpp 

Log message:
        include cleanup: font

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/label.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/progressbar.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.28 
wesnoth/src/editor/editor_main.cpp:1.29
--- wesnoth/src/editor/editor_main.cpp:1.28     Sat Mar  5 10:54:25 2005
+++ wesnoth/src/editor/editor_main.cpp  Wed Mar  9 23:30:28 2005
@@ -24,6 +24,7 @@
 #include "../preferences.hpp"
 #include "../team.hpp"
 #include "../util.hpp"
+#include "../video.hpp"
 #include "../wesconfig.h"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.118 wesnoth/src/font.cpp:1.119
--- wesnoth/src/font.cpp:1.118  Wed Mar  9 22:58:18 2005
+++ wesnoth/src/font.cpp        Wed Mar  9 23:30:27 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.118 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: font.cpp,v 1.119 2005/03/09 23:30:27 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -23,6 +23,7 @@
 #include "team.hpp"
 #include "tooltips.hpp"
 #include "util.hpp"
+#include "video.hpp"
 #include "wassert.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.50 wesnoth/src/font.hpp:1.51
--- wesnoth/src/font.hpp:1.50   Fri Mar  4 04:26:15 2005
+++ wesnoth/src/font.hpp        Wed Mar  9 23:30:27 2005
@@ -1,4 +1,4 @@
-/* $Id: font.hpp,v 1.50 2005/03/04 04:26:15 j_daniel Exp $ */
+/* $Id: font.hpp,v 1.51 2005/03/09 23:30:27 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,10 +16,12 @@
 #include "SDL.h"
 #include "SDL_ttf.h"
 
-#include "display.hpp"
-#include "video.hpp"
+class display;
+#include "sdl_utils.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <string>
+#include <vector>
 
 namespace font {
 
Index: wesnoth/src/widgets/label.cpp
diff -u wesnoth/src/widgets/label.cpp:1.5 wesnoth/src/widgets/label.cpp:1.6
--- wesnoth/src/widgets/label.cpp:1.5   Mon Nov 22 23:54:27 2004
+++ wesnoth/src/widgets/label.cpp       Wed Mar  9 23:30:28 2005
@@ -1,4 +1,4 @@
-/* $Id: label.cpp,v 1.5 2004/11/22 23:54:27 ydirson Exp $ */
+/* $Id: label.cpp,v 1.6 2005/03/09 23:30:28 ydirson Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -14,6 +14,7 @@
 #include "../global.hpp"
 
 #include "label.hpp"
+#include "../display.hpp"
 #include "../font.hpp"
 
 namespace gui {
Index: wesnoth/src/widgets/progressbar.cpp
diff -u wesnoth/src/widgets/progressbar.cpp:1.5 
wesnoth/src/widgets/progressbar.cpp:1.6
--- wesnoth/src/widgets/progressbar.cpp:1.5     Thu Nov 18 04:08:33 2004
+++ wesnoth/src/widgets/progressbar.cpp Wed Mar  9 23:30:28 2005
@@ -5,6 +5,7 @@
 #include "../display.hpp"
 #include "../font.hpp"
 #include "../util.hpp"
+#include "../video.hpp"
 
 namespace gui {