X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fdistance.cpp;h=0e2d7d606d6cfae71ffbf1df2a8e11dbd71329fa;hb=28f28705612902c15cd0702cc891fba35bf2d2df;hp=c1a7e65d15dd5816ab1e0d65cefb45731b3109f6;hpb=2c43cbfff01496919316f600ee76112be551392d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/distance.cpp b/synfig-core/trunk/src/synfig/distance.cpp
index c1a7e65..0e2d7d6 100644
--- a/synfig-core/trunk/src/synfig/distance.cpp
+++ b/synfig-core/trunk/src/synfig/distance.cpp
@@ -1,4 +1,4 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file distance.cpp
 **	\brief Template File
 **
@@ -38,7 +38,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -52,53 +52,53 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-Distance::Distance(const sinfg::String& str)
+Distance::Distance(const synfig::String& str)
 {
 	(*this)=str;
 /*	int i(0);
 	float val;
 	int ret(strscanf(str,"%f%n",&val,&i));
-	sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val);
+	synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
 	
 	if(ret<=0)
 	{
 		// Error
-		sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
+		synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
 		value_=0;
 	}
 	else
 		value_=val;
 	
-	sinfg::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str());
+	synfig::info("Distance::Distance(): system=\"%s\"",String(str.begin()+i,str.end()).c_str());
 	system_=ident_system(String(str.begin()+i,str.end()));
 */
 }
 
 Distance&
-Distance::operator=(const sinfg::String& str)
+Distance::operator=(const synfig::String& str)
 {
 	int i(0);
 	float val;
 	int ret(strscanf(str,"%f%n",&val,&i));
-	sinfg::info("Distance::Distance(): ret=%d, val=%f",ret,val);
+	synfig::info("Distance::Distance(): ret=%d, val=%f",ret,val);
 	
 	if(ret<=0)
 	{
 		// Error
-		sinfg::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
+		synfig::error("Distance::Distance(): Bad value \"%s\"",str.c_str());
 		return *this;
 	}
 	else
 		value_=val;
 
-	sinfg::String sys(str.begin()+i,str.end());
+	synfig::String sys(str.begin()+i,str.end());
 
 	if(sys.size())
 		system_=ident_system(sys);
 	return *this;
 }
 
-sinfg::String
+synfig::String
 Distance::get_string(int digits)const
 {
 	digits=min(9,max(0,digits));
@@ -183,16 +183,16 @@ Distance::meters_to_system(Real x,System target_system)
 }
 
 Distance::System // (static)
-Distance::ident_system(const sinfg::String& x)
+Distance::ident_system(const synfig::String& x)
 {
-	sinfg::String str;
+	synfig::String str;
 
 	// Make it all upper case, and remove white space
 	for(unsigned int i=0;i<x.size();i++)if(x[i]!=' ' && x[i]!='\t')str+=toupper(x[i]);
 
 	// If it is plural, make it singular
 	if(str[str.size()-1]=='S')
-		str=sinfg::String(str.begin(),str.end()-1);
+		str=synfig::String(str.begin(),str.end()-1);
 	
 	if(str.empty() || str=="U" || str=="UNIT")
 		return SYSTEM_UNITS;
@@ -209,12 +209,12 @@ Distance::ident_system(const sinfg::String& x)
 	if(str=="MM" || str=="MILLIMETER")
 		return SYSTEM_MILLIMETERS;
 	
-	sinfg::warning("Distance::ident_system(): Unknown distance system \"%s\"",x.c_str());
+	synfig::warning("Distance::ident_system(): Unknown distance system \"%s\"",x.c_str());
 	
 	return SYSTEM_UNITS;
 }
 
-sinfg::String  // (static)
+synfig::String  // (static)
 Distance::system_name(Distance::System system)
 {
 	switch(system)
@@ -229,10 +229,10 @@ Distance::system_name(Distance::System system)
 	
 		default:				throw BadSystem();
 	}
-	return sinfg::String();
+	return synfig::String();
 }
 
-sinfg::String  // (static)
+synfig::String  // (static)
 Distance::system_local_name(Distance::System system)
 {
 	switch(system)
@@ -247,5 +247,5 @@ Distance::system_local_name(Distance::System system)
 	
 		default:				throw BadSystem();
 	}
-	return sinfg::String();
+	return synfig::String();
 }