[Wesnoth-cvs-commits] wesnoth/src/widgets combo.hpp file_chooser.cpp ...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/10 02:09:26

Modified files:
        src/widgets    : combo.hpp file_chooser.cpp menu.cpp menu.hpp 
                         scrollarea.cpp scrollpane.hpp textbox.hpp 
                         widget.hpp 

Log message:
        include cleanup: widgets/*

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/combo.hpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.hpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollarea.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollpane.hpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.hpp.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: wesnoth/src/widgets/combo.hpp
diff -u wesnoth/src/widgets/combo.hpp:1.20 wesnoth/src/widgets/combo.hpp:1.21
--- wesnoth/src/widgets/combo.hpp:1.20  Sun Feb 20 22:30:29 2005
+++ wesnoth/src/widgets/combo.hpp       Thu Mar 10 02:09:26 2005
@@ -1,4 +1,4 @@
-/* $Id: combo.hpp,v 1.20 2005/02/20 22:30:29 gruikya Exp $ */
+/* $Id: combo.hpp,v 1.21 2005/03/10 02:09:26 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,7 +16,7 @@
 #include "SDL.h"
 
 #include "button.hpp"
-#include "../display.hpp"
+class display;
 
 namespace gui {
 
Index: wesnoth/src/widgets/file_chooser.cpp
diff -u wesnoth/src/widgets/file_chooser.cpp:1.24 
wesnoth/src/widgets/file_chooser.cpp:1.25
--- wesnoth/src/widgets/file_chooser.cpp:1.24   Wed Mar  9 22:58:18 2005
+++ wesnoth/src/widgets/file_chooser.cpp        Thu Mar 10 02:09:26 2005
@@ -14,7 +14,8 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "../display.hpp"
+class display;
+
 #include "../events.hpp"
 #include "../filesystem.hpp"
 #include "../font.hpp"
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.79 wesnoth/src/widgets/menu.cpp:1.80
--- wesnoth/src/widgets/menu.cpp:1.79   Fri Feb 25 01:07:20 2005
+++ wesnoth/src/widgets/menu.cpp        Thu Mar 10 02:09:26 2005
@@ -2,6 +2,7 @@
 
 #include "menu.hpp"
 
+#include "../display.hpp"
 #include "../font.hpp"
 #include "../sdl_utils.hpp"
 #include "../show_dialog.hpp"
Index: wesnoth/src/widgets/menu.hpp
diff -u wesnoth/src/widgets/menu.hpp:1.33 wesnoth/src/widgets/menu.hpp:1.34
--- wesnoth/src/widgets/menu.hpp:1.33   Fri Feb 25 01:07:20 2005
+++ wesnoth/src/widgets/menu.hpp        Thu Mar 10 02:09:26 2005
@@ -4,7 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "../display.hpp"
+class display;
+
 #include "../events.hpp"
 #include "../sdl_utils.hpp"
 
Index: wesnoth/src/widgets/scrollarea.cpp
diff -u wesnoth/src/widgets/scrollarea.cpp:1.10 
wesnoth/src/widgets/scrollarea.cpp:1.11
--- wesnoth/src/widgets/scrollarea.cpp:1.10     Sat Feb 26 21:18:15 2005
+++ wesnoth/src/widgets/scrollarea.cpp  Thu Mar 10 02:09:26 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollarea.cpp,v 1.10 2005/02/26 21:18:15 gruikya Exp $*/
+/* $Id: scrollarea.cpp,v 1.11 2005/03/10 02:09:26 ydirson Exp $*/
 /*
    Copyright (C) 2004 by Guillaume Melquiond <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -13,10 +13,9 @@
 
 #include "../global.hpp"
 
+class display;
+
 #include "scrollarea.hpp"
-#include "../display.hpp"
-#include "../image.hpp"
-#include "../video.hpp"
 
 #include <algorithm>
 #include <iostream>
Index: wesnoth/src/widgets/scrollpane.hpp
diff -u wesnoth/src/widgets/scrollpane.hpp:1.6 
wesnoth/src/widgets/scrollpane.hpp:1.7
--- wesnoth/src/widgets/scrollpane.hpp:1.6      Sun Feb 27 18:15:21 2005
+++ wesnoth/src/widgets/scrollpane.hpp  Thu Mar 10 02:09:26 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollpane.hpp,v 1.6 2005/02/27 18:15:21 ydirson Exp $ */
+/* $Id: scrollpane.hpp,v 1.7 2005/03/10 02:09:26 ydirson Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -20,7 +20,6 @@
 #include "SDL.h"
 #include "../sdl_utils.hpp"
 #include "scrollarea.hpp"
-#include "widget.hpp"
 
 namespace gui {
 
Index: wesnoth/src/widgets/textbox.hpp
diff -u wesnoth/src/widgets/textbox.hpp:1.40 
wesnoth/src/widgets/textbox.hpp:1.41
--- wesnoth/src/widgets/textbox.hpp:1.40        Thu Mar  3 21:52:40 2005
+++ wesnoth/src/widgets/textbox.hpp     Thu Mar 10 02:09:26 2005
@@ -1,4 +1,4 @@
-/* $Id: textbox.hpp,v 1.40 2005/03/03 21:52:40 gruikya Exp $ */
+/* $Id: textbox.hpp,v 1.41 2005/03/10 02:09:26 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,8 +14,6 @@
 #ifndef TEXTBOX_HPP_INCLUDED
 #define TEXTBOX_HPP_INCLUDED
 
-#include "../events.hpp"
-#include "../key.hpp"
 #include "../serialization/string_utils.hpp"
 #include "../sdl_utils.hpp"
 
Index: wesnoth/src/widgets/widget.hpp
diff -u wesnoth/src/widgets/widget.hpp:1.23 wesnoth/src/widgets/widget.hpp:1.24
--- wesnoth/src/widgets/widget.hpp:1.23 Thu Feb 24 23:39:35 2005
+++ wesnoth/src/widgets/widget.hpp      Thu Mar 10 02:09:26 2005
@@ -6,6 +6,7 @@
 
 #include "SDL.h"
 
+#include <string>
 #include <vector>
 
 class display;