[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp dialogs.cpp d...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src about.cpp actions.cpp dialogs.cpp d... |
|
Date: |
Thu, 10 Mar 2005 16:42:10 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 05/03/10 21:42:10
Modified files:
src : about.cpp actions.cpp dialogs.cpp display.cpp
filechooser.cpp help.cpp mapgen_dialog.cpp
multiplayer.cpp multiplayer_create.cpp
multiplayer_wait.cpp playlevel.cpp
preferences.cpp replay.hpp show_dialog.cpp
show_dialog.hpp
src/editor : editor_dialogs.cpp editor_palettes.cpp
Log message:
include cleanup: replay, show_dialog
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/about.cpp.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.195&tr2=1.196&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.294&tr2=1.295&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filechooser.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen_dialog.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.146&tr2=1.147&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.182&tr2=1.183&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/replay.hpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.hpp.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_dialogs.cpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_palettes.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: wesnoth/src/about.cpp
diff -u wesnoth/src/about.cpp:1.101 wesnoth/src/about.cpp:1.102
--- wesnoth/src/about.cpp:1.101 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/about.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: about.cpp,v 1.101 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: about.cpp,v 1.102 2005/03/10 21:42:04 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 "display.hpp"
#include "show_dialog.hpp"
#include "sdl_utils.hpp"
+#include "video.hpp"
#include "widgets/button.hpp"
#include <sstream>
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.195 wesnoth/src/actions.cpp:1.196
--- wesnoth/src/actions.cpp:1.195 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/actions.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.195 2005/03/09 22:58:18 ydirson Exp $ */
+/* $Id: actions.cpp,v 1.196 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -31,6 +31,7 @@
#include "statistics.hpp"
#include "unit_display.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wassert.hpp"
#include "wml_separators.hpp"
#include "serialization/string_utils.hpp"
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.86 wesnoth/src/dialogs.cpp:1.87
--- wesnoth/src/dialogs.cpp:1.86 Thu Mar 10 01:47:57 2005
+++ wesnoth/src/dialogs.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.86 2005/03/10 01:47:57 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.87 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -28,6 +28,7 @@
#include "replay.hpp"
#include "show_dialog.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wassert.hpp"
#include "wml_separators.hpp"
#include "serialization/string_utils.hpp"
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.294 wesnoth/src/display.cpp:1.295
--- wesnoth/src/display.cpp:1.294 Thu Mar 10 20:59:19 2005
+++ wesnoth/src/display.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.294 2005/03/10 20:59:19 ydirson Exp $ */
+/* $Id: display.cpp,v 1.295 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -32,6 +32,7 @@
#include "tooltips.hpp"
#include "unit_display.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wassert.hpp"
#include "SDL_image.h"
Index: wesnoth/src/editor/editor_dialogs.cpp
diff -u wesnoth/src/editor/editor_dialogs.cpp:1.23
wesnoth/src/editor/editor_dialogs.cpp:1.24
--- wesnoth/src/editor/editor_dialogs.cpp:1.23 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/editor/editor_dialogs.cpp Thu Mar 10 21:42:10 2005
@@ -28,6 +28,7 @@
#include "../language.hpp"
#include "../map.hpp"
#include "../preferences.hpp"
+#include "../video.hpp"
#include "editor_dialogs.hpp"
Index: wesnoth/src/editor/editor_palettes.cpp
diff -u wesnoth/src/editor/editor_palettes.cpp:1.24
wesnoth/src/editor/editor_palettes.cpp:1.25
--- wesnoth/src/editor/editor_palettes.cpp:1.24 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/editor/editor_palettes.cpp Thu Mar 10 21:42:10 2005
@@ -21,6 +21,7 @@
#include "../reports.hpp"
#include "../gettext.hpp"
#include "../util.hpp"
+#include "../video.hpp"
#include "../wassert.hpp"
Index: wesnoth/src/filechooser.cpp
diff -u wesnoth/src/filechooser.cpp:1.4 wesnoth/src/filechooser.cpp:1.5
--- wesnoth/src/filechooser.cpp:1.4 Thu Mar 3 21:52:39 2005
+++ wesnoth/src/filechooser.cpp Thu Mar 10 21:42:04 2005
@@ -1,10 +1,11 @@
#include "global.hpp"
+#include "gettext.hpp"
#include "show_dialog.hpp"
+#include "video.hpp"
#include "widgets/file_chooser.hpp"
-#include "gettext.hpp"
-#include <vector>
+#include <vector>
#include <string>
namespace dialogs
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.72 wesnoth/src/help.cpp:1.73
--- wesnoth/src/help.cpp:1.72 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/help.cpp Thu Mar 10 21:42:04 2005
@@ -25,6 +25,7 @@
#include "show_dialog.hpp"
#include "unit.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wassert.hpp"
#include "wml_separators.hpp"
#include "serialization/parser.hpp"
Index: wesnoth/src/mapgen_dialog.cpp
diff -u wesnoth/src/mapgen_dialog.cpp:1.31 wesnoth/src/mapgen_dialog.cpp:1.32
--- wesnoth/src/mapgen_dialog.cpp:1.31 Wed Mar 9 22:58:18 2005
+++ wesnoth/src/mapgen_dialog.cpp Thu Mar 10 21:42:04 2005
@@ -8,6 +8,7 @@
#include "mapgen.hpp"
#include "show_dialog.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "widgets/button.hpp"
#include "widgets/slider.hpp"
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.146 wesnoth/src/multiplayer.cpp:1.147
--- wesnoth/src/multiplayer.cpp:1.146 Wed Mar 9 20:48:42 2005
+++ wesnoth/src/multiplayer.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.146 2005/03/09 20:48:42 ydirson Exp $ */
+/* $Id: multiplayer.cpp,v 1.147 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -26,6 +26,7 @@
#include "playlevel.hpp"
#include "preferences.hpp"
#include "replay.hpp"
+#include "video.hpp"
#define LOG_NW lg::info(lg::network)
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.10
wesnoth/src/multiplayer_create.cpp:1.11
--- wesnoth/src/multiplayer_create.cpp:1.10 Sat Mar 5 16:07:54 2005
+++ wesnoth/src/multiplayer_create.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.10 2005/03/05 16:07:54 ydirson Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.11 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -11,13 +11,14 @@
See the COPYING file for more details.
*/
+#include "gettext.hpp"
#include "global.hpp"
#include "show_dialog.hpp"
#include "map_create.hpp"
#include "multiplayer_create.hpp"
#include "filesystem.hpp"
#include "preferences.hpp"
-#include "gettext.hpp"
+#include "video.hpp"
namespace {
const SDL_Rect null_rect = {0, 0, 0, 0};
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.9
wesnoth/src/multiplayer_wait.cpp:1.10
--- wesnoth/src/multiplayer_wait.cpp:1.9 Sat Mar 5 10:54:25 2005
+++ wesnoth/src/multiplayer_wait.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.9 2005/03/05 10:54:25 silene Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.10 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -19,6 +19,7 @@
#include "preferences.hpp"
#include "replay.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wassert.hpp"
#include "wml_separators.hpp"
#include "serialization/string_utils.hpp"
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.182 wesnoth/src/playlevel.cpp:1.183
--- wesnoth/src/playlevel.cpp:1.182 Thu Mar 10 20:43:48 2005
+++ wesnoth/src/playlevel.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.182 2005/03/10 20:43:48 ydirson Exp $ */
+/* $Id: playlevel.cpp,v 1.183 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -39,6 +39,7 @@
#include "unit_display.hpp"
#include "util.hpp"
#include "variable.hpp"
+#include "video.hpp"
#include <iostream>
#include <iterator>
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.140 wesnoth/src/preferences.cpp:1.141
--- wesnoth/src/preferences.cpp:1.140 Thu Mar 10 20:59:20 2005
+++ wesnoth/src/preferences.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.140 2005/03/10 20:59:20 ydirson Exp $ */
+/* $Id: preferences.cpp,v 1.141 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -26,6 +26,7 @@
#include "show_dialog.hpp"
#include "sound.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "wesconfig.h"
#include "wml_separators.hpp"
#include "serialization/parser.hpp"
Index: wesnoth/src/replay.hpp
diff -u wesnoth/src/replay.hpp:1.28 wesnoth/src/replay.hpp:1.29
--- wesnoth/src/replay.hpp:1.28 Sun Nov 21 22:00:06 2004
+++ wesnoth/src/replay.hpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: replay.hpp,v 1.28 2004/11/21 22:00:06 silene Exp $ */
+/* $Id: replay.hpp,v 1.29 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -13,8 +13,10 @@
#ifndef REPLAY_H_INCLUDED
#define REPLAY_H_INCLUDED
+class display;
+
#include "config.hpp"
-#include "display.hpp"
+#include "gamestatus.hpp"
#include "map.hpp"
#include "unit.hpp"
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.111 wesnoth/src/show_dialog.cpp:1.112
--- wesnoth/src/show_dialog.cpp:1.111 Thu Mar 10 13:46:21 2005
+++ wesnoth/src/show_dialog.cpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.111 2005/03/10 13:46:21 silene Exp $ */
+/* $Id: show_dialog.cpp,v 1.112 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -30,6 +30,7 @@
#include "sdl_utils.hpp"
#include "tooltips.hpp"
#include "util.hpp"
+#include "video.hpp"
#include "widgets/button.hpp"
#include "widgets/menu.hpp"
#include "widgets/textbox.hpp"
Index: wesnoth/src/show_dialog.hpp
diff -u wesnoth/src/show_dialog.hpp:1.42 wesnoth/src/show_dialog.hpp:1.43
--- wesnoth/src/show_dialog.hpp:1.42 Sun Dec 19 22:06:33 2004
+++ wesnoth/src/show_dialog.hpp Thu Mar 10 21:42:04 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.hpp,v 1.42 2004/12/19 22:06:33 silene Exp $ */
+/* $Id: show_dialog.hpp,v 1.43 2005/03/10 21:42:04 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,15 +14,14 @@
#ifndef SHOW_DIALOG_HPP_INCLUDED
#define SHOW_DIALOG_HPP_INCLUDED
-#include "config.hpp"
+class config;
+class display;
+
#include "cursor.hpp"
-#include "display.hpp"
#include "font.hpp"
#include "halo.hpp"
#include "network.hpp"
#include "tooltips.hpp"
-#include "unit.hpp"
-#include "video.hpp"
#include "widgets/button.hpp"