[Wesnoth-cvs-commits] wesnoth/src actions.cpp dialogs.cpp game.cpp he...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/02/25 01:07:20

Modified files:
        src            : actions.cpp dialogs.cpp game.cpp help.cpp 
                         leader_list.cpp multiplayer_lobby.cpp 
                         multiplayer_wait.cpp playturn.cpp 
                         preferences.cpp 
        src/editor     : editor.cpp 
        src/widgets    : button.cpp file_chooser.cpp menu.cpp menu.hpp 
Added files:
        src            : wml_separators.hpp 

Log message:
        moved wml/widget separators to their own header; drop widget/button 
dependency on wodget/menu

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/wml_separators.hpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.191&tr2=1.192&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.196&tr2=1.197&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/leader_list.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.330&tr2=1.331&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.134&tr2=1.135&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor.cpp.diff?tr1=1.92&tr2=1.93&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/button.cpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/file_chooser.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.cpp.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.hpp.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.191 wesnoth/src/actions.cpp:1.192
--- wesnoth/src/actions.cpp:1.191       Sun Feb 20 20:46:47 2005
+++ wesnoth/src/actions.cpp     Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.191 2005/02/20 20:46:47 silene Exp $ */
+/* $Id: actions.cpp,v 1.192 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -33,6 +33,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.82 wesnoth/src/dialogs.cpp:1.83
--- wesnoth/src/dialogs.cpp:1.82        Mon Feb 21 09:05:51 2005
+++ wesnoth/src/dialogs.cpp     Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.82 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: dialogs.cpp,v 1.83 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -27,6 +27,7 @@
 #include "show_dialog.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/progressbar.hpp"
Index: wesnoth/src/editor/editor.cpp
diff -u wesnoth/src/editor/editor.cpp:1.92 wesnoth/src/editor/editor.cpp:1.93
--- wesnoth/src/editor/editor.cpp:1.92  Mon Feb 21 09:05:51 2005
+++ wesnoth/src/editor/editor.cpp       Fri Feb 25 01:07:20 2005
@@ -31,6 +31,7 @@
 #include "../team.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #include "editor.hpp"
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.196 wesnoth/src/game.cpp:1.197
--- wesnoth/src/game.cpp:1.196  Mon Feb 21 09:05:51 2005
+++ wesnoth/src/game.cpp        Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.196 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: game.cpp,v 1.197 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -51,6 +51,7 @@
 #include "unit.hpp"
 #include "video.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.68 wesnoth/src/help.cpp:1.69
--- wesnoth/src/help.cpp:1.68   Mon Feb 21 09:05:51 2005
+++ wesnoth/src/help.cpp        Fri Feb 25 01:07:19 2005
@@ -25,6 +25,7 @@
 #include "unit.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/menu.hpp"
Index: wesnoth/src/leader_list.cpp
diff -u wesnoth/src/leader_list.cpp:1.2 wesnoth/src/leader_list.cpp:1.3
--- wesnoth/src/leader_list.cpp:1.2     Mon Feb 21 09:05:51 2005
+++ wesnoth/src/leader_list.cpp Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: leader_list.cpp,v 1.2 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: leader_list.cpp,v 1.3 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -12,6 +12,7 @@
 */
 
 #include "leader_list.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.61 
wesnoth/src/multiplayer_lobby.cpp:1.62
--- wesnoth/src/multiplayer_lobby.cpp:1.61      Thu Feb 24 21:16:25 2005
+++ wesnoth/src/multiplayer_lobby.cpp   Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.61 2005/02/24 21:16:25 gruikya Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.62 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,6 +16,7 @@
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 
 namespace mp {
 
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.3 
wesnoth/src/multiplayer_wait.cpp:1.4
--- wesnoth/src/multiplayer_wait.cpp:1.3        Tue Feb 22 23:07:19 2005
+++ wesnoth/src/multiplayer_wait.cpp    Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.3 2005/02/22 23:07:19 gruikya Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.4 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -11,12 +11,13 @@
    See the COPYING file for more details.
 */
 
+#include "log.hpp"
 #include "multiplayer_wait.hpp"
 #include "preferences.hpp"
-#include "log.hpp"
-#include "wassert.hpp"
-#include "util.hpp"
 #include "replay.hpp"
+#include "util.hpp"
+#include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #define LOG_NW lg::info(lg::network)
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.330 wesnoth/src/playturn.cpp:1.331
--- wesnoth/src/playturn.cpp:1.330      Mon Feb 21 09:05:51 2005
+++ wesnoth/src/playturn.cpp    Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.330 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: playturn.cpp,v 1.331 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -34,6 +34,7 @@
 #include "unit_display.hpp"
 #include "util.hpp"
 #include "wassert.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/menu.hpp"
 
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.134 wesnoth/src/preferences.cpp:1.135
--- wesnoth/src/preferences.cpp:1.134   Mon Feb 21 09:05:51 2005
+++ wesnoth/src/preferences.cpp Fri Feb 25 01:07:19 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.134 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: preferences.cpp,v 1.135 2005/02/25 01:07:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -26,12 +26,13 @@
 #include "show_dialog.hpp"
 #include "sound.hpp"
 #include "util.hpp"
+#include "wesconfig.h"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 #include "widgets/button.hpp"
 #include "widgets/label.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/slider.hpp"
-#include "wesconfig.h"
 
 #include <cstdlib>
 #include <iostream>
Index: wesnoth/src/widgets/button.cpp
diff -u wesnoth/src/widgets/button.cpp:1.55 wesnoth/src/widgets/button.cpp:1.56
--- wesnoth/src/widgets/button.cpp:1.55 Mon Feb 21 09:05:51 2005
+++ wesnoth/src/widgets/button.cpp      Fri Feb 25 01:07:20 2005
@@ -1,4 +1,4 @@
-/* $Id: button.cpp,v 1.55 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: button.cpp,v 1.56 2005/02/25 01:07:20 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -14,7 +14,6 @@
 #include "../global.hpp"
 
 #include "button.hpp"
-#include "menu.hpp"
 #include "../display.hpp"
 #include "../game.hpp"
 #include "../font.hpp"
@@ -22,6 +21,7 @@
 #include "../log.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 namespace gui {
Index: wesnoth/src/widgets/file_chooser.cpp
diff -u wesnoth/src/widgets/file_chooser.cpp:1.22 
wesnoth/src/widgets/file_chooser.cpp:1.23
--- wesnoth/src/widgets/file_chooser.cpp:1.22   Sat Feb 12 15:05:25 2005
+++ wesnoth/src/widgets/file_chooser.cpp        Fri Feb 25 01:07:20 2005
@@ -20,6 +20,7 @@
 #include "../font.hpp"
 #include "../language.hpp"
 #include "../show_dialog.hpp"
+#include "../wml_separators.hpp"
 #include "file_chooser.hpp"
 
 #include <sstream>
Index: wesnoth/src/widgets/menu.cpp
diff -u wesnoth/src/widgets/menu.cpp:1.78 wesnoth/src/widgets/menu.cpp:1.79
--- wesnoth/src/widgets/menu.cpp:1.78   Mon Feb 21 09:05:51 2005
+++ wesnoth/src/widgets/menu.cpp        Fri Feb 25 01:07:20 2005
@@ -7,6 +7,7 @@
 #include "../show_dialog.hpp"
 #include "../util.hpp"
 #include "../video.hpp"
+#include "../wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #include <numeric>
Index: wesnoth/src/widgets/menu.hpp
diff -u wesnoth/src/widgets/menu.hpp:1.32 wesnoth/src/widgets/menu.hpp:1.33
--- wesnoth/src/widgets/menu.hpp:1.32   Mon Dec 13 05:40:44 2004
+++ wesnoth/src/widgets/menu.hpp        Fri Feb 25 01:07:20 2005
@@ -12,9 +12,6 @@
 
 #include "SDL.h"
 
-char const HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*', COLUMN_SEPARATOR = 
'=',
-           IMAGE_PREFIX = '&', IMG_TEXT_SEPARATOR = 1;
-
 namespace gui {
 
 class menu : public scrollarea