From 52cfe2b17d6ee746bd128cffbff93e09a1e92292 Mon Sep 17 00:00:00 2001 From: JaMiT Date: Sat, 21 Sep 2013 11:33:35 -0500 Subject: [PATCH] Eliminate variable::manager. With the simplification of vconfig, this class no longer serves a purpose. --- src/game_events/handlers.cpp | 1 - src/game_events/handlers.hpp | 4 ---- src/variable.cpp | 7 ------- src/variable.hpp | 16 ---------------- 4 files changed, 28 deletions(-) diff --git a/src/game_events/handlers.cpp b/src/game_events/handlers.cpp index bb38a1f08c0..80149f8b142 100644 --- a/src/game_events/handlers.cpp +++ b/src/game_events/handlers.cpp @@ -330,7 +330,6 @@ void remove_event_handler(const std::string & id) manager::manager(const config& cfg) - : variable_manager() { BOOST_FOREACH(const config &ev, cfg.child_range("event")) { add_event_handler(ev); diff --git a/src/game_events/handlers.hpp b/src/game_events/handlers.hpp index 5de450c246c..2030b198aa5 100644 --- a/src/game_events/handlers.hpp +++ b/src/game_events/handlers.hpp @@ -25,7 +25,6 @@ #define GAME_EVENTS_HANDLERS_H_INCLUDED #include "../config.hpp" -#include "../variable.hpp" #include @@ -84,9 +83,6 @@ namespace game_events static void stop_buffering(); /// Commits the event handlers that were buffered. static void commit_buffer(); - - private: - variable::manager variable_manager; }; /// Create an event handler. diff --git a/src/variable.cpp b/src/variable.cpp index ff88a45f4ae..1319c4d3894 100644 --- a/src/variable.cpp +++ b/src/variable.cpp @@ -358,13 +358,6 @@ vconfig::all_children_iterator vconfig::ordered_end() const return all_children_iterator(cfg_->ordered_end(), cache_); } -namespace variable -{ - manager::~manager() - { - } -} - scoped_wml_variable::scoped_wml_variable(const std::string& var_name) : previous_val_(), var_name_(var_name), diff --git a/src/variable.hpp b/src/variable.hpp index 8053db0b169..bdbe4517794 100644 --- a/src/variable.hpp +++ b/src/variable.hpp @@ -22,7 +22,6 @@ #include -class game_state; class unit_map; /** @@ -161,21 +160,6 @@ struct vconfig::all_children_iterator::pointer_proxy const value_type *operator->() const { return &p; } }; -namespace variable -{ - -/** - * Used to clear the cache for variables. - */ -class manager -{ -public: - ~manager(); -}; - -} - - class scoped_wml_variable {