[Wesnoth-cvs-commits] wesnoth/src Makefile.am config.cpp game_events....

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/06 18:12:19

Modified files:
        src            : Makefile.am config.cpp game_events.cpp 
                         game_events.hpp playlevel.cpp 
        src/serialization: string_utils.cpp 
Added files:
        src            : variable.hpp 

Log message:
        first step towards making variable handling independant of game_events: 
put the relevant prototypes into their own header and use it where applicable

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/variable.hpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/config.cpp.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.cpp.diff?tr1=1.122&tr2=1.123&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game_events.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.179&tr2=1.180&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.79 wesnoth/src/Makefile.am:1.80
--- wesnoth/src/Makefile.am:1.79        Sat Mar  5 16:07:54 2005
+++ wesnoth/src/Makefile.am     Sun Mar  6 18:12:16 2005
@@ -192,6 +192,7 @@
        unit_display.hpp \
        unit_types.hpp \
        util.hpp \
+       variable.hpp \
        video.hpp \
        wassert.hpp \
        serialization/binary_wml.hpp \
@@ -402,7 +403,7 @@
        serialization/string_utils.cpp \
        zipios++/xcoll.cpp \
        server/game.hpp \
-       game_events.hpp \
+       variable.hpp \
        server/input_stream.hpp \
        server/metrics.hpp \
        server/player.hpp \
@@ -440,7 +441,7 @@
        serialization/parser.cpp \
        serialization/string_utils.cpp \
        zipios++/xcoll.cpp \
-       game_events.hpp \
+       variable.hpp \
        config.hpp \
        filesystem.hpp \
        game_config.hpp \
@@ -478,6 +479,7 @@
        serialization/preprocessor.cpp \
        serialization/string_utils.cpp \
        zipios++/xcoll.cpp \
+       variable.hpp \
        tools/exploder_composer.hpp \
        tools/exploder_cutter.hpp \
        tools/exploder_utils.hpp \
@@ -502,6 +504,7 @@
        serialization/preprocessor.cpp \
        serialization/string_utils.cpp \
        zipios++/xcoll.cpp \
+       variable.hpp \
        tools/exploder_composer.hpp \
        tools/exploder_cutter.hpp \
        tools/exploder_utils.hpp \
@@ -526,7 +529,7 @@
        gettext.cpp \
        log.cpp \
        network.cpp \
-       game_events.hpp \
+       variable.hpp \
        config.hpp \
        gettext.hpp \
        filesystem.hpp \
Index: wesnoth/src/config.cpp
diff -u wesnoth/src/config.cpp:1.130 wesnoth/src/config.cpp:1.131
--- wesnoth/src/config.cpp:1.130        Sat Mar  5 10:54:25 2005
+++ wesnoth/src/config.cpp      Sun Mar  6 18:12:16 2005
@@ -1,4 +1,4 @@
-/* $Id: config.cpp,v 1.130 2005/03/05 10:54:25 silene Exp $ */
+/* $Id: config.cpp,v 1.131 2005/03/06 18:12:16 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -17,7 +17,7 @@
 #include <sstream>
 
 #include "config.hpp"
-#include "game_events.hpp"
+#include "variable.hpp"
 #include "wassert.hpp"
 
 config::config(const config& cfg)
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.122 wesnoth/src/game_events.cpp:1.123
--- wesnoth/src/game_events.cpp:1.122   Sun Feb 27 18:15:21 2005
+++ wesnoth/src/game_events.cpp Sun Mar  6 18:12:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.122 2005/02/27 18:15:21 ydirson Exp $ */
+/* $Id: game_events.cpp,v 1.123 2005/03/06 18:12:16 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -24,6 +24,7 @@
 #include "sound.hpp"
 #include "unit_display.hpp"
 #include "util.hpp"
+#include "variable.hpp"
 #include "wassert.hpp"
 #include "serialization/string_utils.hpp"
 
Index: wesnoth/src/game_events.hpp
diff -u wesnoth/src/game_events.hpp:1.23 wesnoth/src/game_events.hpp:1.24
--- wesnoth/src/game_events.hpp:1.23    Sun Sep 12 21:55:20 2004
+++ wesnoth/src/game_events.hpp Sun Mar  6 18:12:16 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.hpp,v 1.23 2004/09/12 21:55:20 Sirp Exp $ */
+/* $Id: game_events.hpp,v 1.24 2005/03/06 18:12:16 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -34,12 +34,6 @@
 namespace game_events
 {
 
-std::string& get_variable(const std::string& varname);
-const std::string& get_variable_const(const std::string& varname);
-config& get_variable_cfg(const std::string& varname);
-
-void set_variable(const std::string& varname, const std::string& value);
-
 //the game event manager loads the scenario configuration object, and
 //ensures that events are handled according to the scenario configuration
 //for its lifetime.
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.179 wesnoth/src/playlevel.cpp:1.180
--- wesnoth/src/playlevel.cpp:1.179     Sat Mar  5 16:07:54 2005
+++ wesnoth/src/playlevel.cpp   Sun Mar  6 18:12:17 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.179 2005/03/05 16:07:54 ydirson Exp $ */
+/* $Id: playlevel.cpp,v 1.180 2005/03/06 18:12:17 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -16,7 +16,6 @@
 #include "cursor.hpp"
 #include "events.hpp"
 #include "filesystem.hpp"
-#include "game_events.hpp"
 #include "halo.hpp"
 #include "help.hpp"
 #include "hotkeys.hpp"
@@ -36,6 +35,7 @@
 #include "tooltips.hpp"
 #include "unit_display.hpp"
 #include "util.hpp"
+#include "variable.hpp"
 
 #include <iostream>
 #include <iterator>
Index: wesnoth/src/serialization/string_utils.cpp
diff -u wesnoth/src/serialization/string_utils.cpp:1.6 
wesnoth/src/serialization/string_utils.cpp:1.7
--- wesnoth/src/serialization/string_utils.cpp:1.6      Sun Mar  6 10:46:27 2005
+++ wesnoth/src/serialization/string_utils.cpp  Sun Mar  6 18:12:19 2005
@@ -1,4 +1,4 @@
-/* $Id: string_utils.cpp,v 1.6 2005/03/06 10:46:27 gruikya Exp $ */
+/* $Id: string_utils.cpp,v 1.7 2005/03/06 18:12:19 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -20,14 +20,11 @@
 #include "serialization/string_utils.hpp"
 #include "util.hpp"
 #include "log.hpp"
+#include "variable.hpp"
 #include "SDL_types.h"
 
 #define ERR_GENERAL lg::err(lg::general)
 
-namespace game_events {
-std::string const &get_variable_const(std::string const &varname);
-}
-
 namespace {
 
 bool two_dots(char a, char b) { return a == '.' && b == '.'; }