X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction_system.cpp;h=33f71f987e5a82536cb375bf3b2c6f35cc9aa6c7;hb=dd3cfb8a9541bcd485836b75bc47ef032d0e65dc;hp=48579b55c55af6c62f2d8722b09913e913ca0ab2;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp
index 48579b5..33f71f9 100644
--- a/synfig-studio/trunk/src/synfigapp/action_system.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp
@@ -33,6 +33,8 @@
 #include "instance.h"
 #include "canvasinterface.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -64,7 +66,7 @@ Action::System::~System()
 }
 
 bool
-Action::System::perform_action(handle<Action::Base> action)
+Action::System::perform_action(etl::handle<Action::Base> action)
 {
 	handle<UIInterface> uim(get_ui_interface());
 
@@ -207,7 +209,7 @@ Action::System::perform_action(handle<Action::Base> action)
 }
 
 bool
-synfigapp::Action::System::undo_(handle<UIInterface> uim)
+synfigapp::Action::System::undo_(etl::handle<UIInterface> uim)
 {
 	handle<Action::Undoable> action(undo_action_stack().front());
 	most_recent_action_=action;
@@ -306,7 +308,7 @@ synfigapp::Action::System::undo()
 }
 
 bool
-Action::System::redo_(handle<UIInterface> uim)
+Action::System::redo_(etl::handle<UIInterface> uim)
 {
 	handle<Action::Undoable> action(redo_action_stack().front());
 	most_recent_action_=action;
@@ -540,7 +542,7 @@ Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
 	return false;
 }
 
-Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instance_,synfig::String name_):
+Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<System> instance_,synfig::String name_):
 	instance_(instance_),
 	name_(name_),
 	redraw_requested_(false),
@@ -551,7 +553,7 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle<Action::System> instanc
 }
 
 void
-Action::PassiveGrouper::request_redraw(handle<CanvasInterface> x)
+Action::PassiveGrouper::request_redraw(etl::handle<CanvasInterface> x)
 {
 /*	DEBUGPOINT();
 	if(instance_->group_stack_.empty())