mail[Wesnoth-commits] r43177 - in /trunk/src/whiteboard: action.cpp manager.cpp manager.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by gabrielmorin on June 04, 2010 - 21:19:
Author: gabba
Date: Fri Jun  4 21:19:29 2010
New Revision: 43177

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43177&view=rev
Log:
a bit more refactoring

Modified:
    trunk/src/whiteboard/action.cpp
    trunk/src/whiteboard/manager.cpp
    trunk/src/whiteboard/manager.hpp

Modified: trunk/src/whiteboard/action.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/action.cpp?rev=43177&r1=43176&r2=43177&view=diff
==============================================================================
--- trunk/src/whiteboard/action.cpp (original)
+++ trunk/src/whiteboard/action.cpp Fri Jun  4 21:19:29 2010
@@ -20,7 +20,6 @@
 
 namespace wb {
 
-}
 // Pure virtual destructor needs to have implementation,
 // since derived classes call it
 action::~action()

Modified: trunk/src/whiteboard/manager.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.cpp?rev=43177&r1=43176&r2=43177&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.cpp (original)
+++ trunk/src/whiteboard/manager.cpp Fri Jun  4 21:19:29 2010
@@ -41,14 +41,14 @@
        return instance_;
 }
 
-const planned_action_set& manager::get_planned_actions() const
+const action_set& manager::get_planned_actions() const
 {
        return planned_actions_;
 }
 
 void manager::add_planned_move(unit& subject, const map_location& target_hex)
 {
-       planned_action_ptr ptr(new move(subject, target_hex));
+       action_ptr ptr(new move(subject, target_hex));
        planned_actions_.push_back(ptr);
 }
 

Modified: trunk/src/whiteboard/manager.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.hpp?rev=43177&r1=43176&r2=43177&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.hpp (original)
+++ trunk/src/whiteboard/manager.hpp Fri Jun  4 21:19:29 2010
@@ -29,8 +29,8 @@
 
 namespace wb {
 
-typedef boost::shared_ptr<action> planned_action_ptr;
-typedef std::deque<planned_action_ptr> planned_action_set;
+typedef boost::shared_ptr<action> action_ptr;
+typedef std::deque<action_ptr> action_set;
 
 class manager : private boost::noncopyable // Singleton -> Non-copyable
 {
@@ -40,7 +40,7 @@
 
        static manager* get_singleton();
 
-       const planned_action_set& get_planned_actions() const;
+       const action_set& get_planned_actions() const;
 
        void add_planned_move(unit& subject, const map_location& target_hex);
 
@@ -50,7 +50,7 @@
 
        static manager* instance_;
 
-       planned_action_set planned_actions_;
+       action_set planned_actions_;
 };
 
 } // end namespace wb




Related Messages


Powered by MHonArc, Updated Fri Jun 04 21:20:08 2010