X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction.cpp;h=f8098b76d5f469e18dfff40cf7a59b96c24ead4a;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=a1fdd69621ea895a689c149d263c1c3cb9e23e9c;hpb=0348d0c0f02151293190a0db10ce92d7b112aa9e;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index a1fdd69..f8098b7 100644
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -232,7 +232,7 @@ Action::Book& Action::book() { return *book_; }
 
 
 Action::Handle
-Action::create(const String &name)
+Action::create(const synfig::String &name)
 {
 	if(!book().count(name))
 		return 0; //! \todo perhaps we should throw something instead?
@@ -266,7 +266,7 @@ Action::compile_candidate_list(const ParamList& param_list, Category category)
 }
 
 Action::CandidateList::iterator
-Action::CandidateList::find(const String& x)
+Action::CandidateList::find(const synfig::String& x)
 {
 	iterator iter;
 	for(iter=begin();iter!=end();++iter)
@@ -367,7 +367,7 @@ Super::add_action_front(etl::handle<Undoable> action)
 }
 
 
-Group::Group(const std::string &str):
+Group::Group(const synfig::String &str):
 	name_(str),
 	ready_(true)
 {