X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fdistance.h;h=7e686f4be6f5f72918fb1ede77a86671f83b9ced;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=44d88bc3677dce6d54336e088a191b0cc307d01d;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/distance.h b/synfig-core/trunk/src/synfig/distance.h
index 44d88bc..7e686f4 100644
--- a/synfig-core/trunk/src/synfig/distance.h
+++ b/synfig-core/trunk/src/synfig/distance.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file distance.h
 **	\brief Template Header
 **
-**	$Id: distance.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_DISTANCE_H
-#define __SINFG_DISTANCE_H
+#ifndef __SYNFIG_DISTANCE_H
+#define __SYNFIG_DISTANCE_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -35,7 +36,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class RendDesc;
 
@@ -43,12 +44,12 @@ class Distance
 {
 public:
 	typedef Real value_type;
-	
+
 	enum System
 	{
 		SYSTEM_UNITS,		//!<
 		SYSTEM_PIXELS,		//!<
-		
+
 		SYSTEM_POINTS,		//!<
 		SYSTEM_INCHES,		//!<
 		SYSTEM_METERS,		//!<
@@ -60,42 +61,42 @@ public:
 
 	class BadSystem { };
 
-private:	
+private:
 	value_type value_;
-		
+
 	System system_;
 
-	
+
 public:
 
 	Distance(){ }
 	Distance(const value_type& value, System system):value_(value),system_(system) { }
-	explicit Distance(const sinfg::String& string);
-	
+	explicit Distance(const synfig::String& string);
+
 	operator Real()const { return value_; }
 
 	Distance& operator=(const Real& rhs) { value_=rhs; return *this; }
 
-	Distance& operator=(const sinfg::String& rhs);
+	Distance& operator=(const synfig::String& rhs);
+
+	synfig::String get_string(int digits=4)const;
 
-	sinfg::String get_string(int digits=4)const;
-	
 	const System& get_system()const { return system_; }
 
 	const Real& get()const { return value_; }
 
 	Real get(System system, const RendDesc& rend_desc)const;
-	
+
 	void convert(System system, const RendDesc& rend_desc);
-	
+
 	Real meters()const;
 	Real meters(const RendDesc& rend_desc)const;
 	Real units(const RendDesc& rend_desc)const;
-	
+
 	static Real meters_to_system(Real x, System target_system);
-	static System ident_system(const sinfg::String& str);
-	static sinfg::String system_name(System system);
-	static sinfg::String system_local_name(System system);
+	static System ident_system(const synfig::String& str);
+	static synfig::String system_name(System system);
+	static synfig::String system_local_name(System system);
 
 	const Distance& operator+=(const Distance &rhs) { value_+=meters_to_system(rhs.meters(),system_); return *this; }
 	const Distance& operator-=(const Distance &rhs) { value_-=meters_to_system(rhs.meters(),system_); return *this; }
@@ -104,7 +105,7 @@ public:
 	const Distance& operator-=(const float &rhs) { value_-=rhs; return *this; }
 	const Distance& operator*=(const float &rhs) { value_*=rhs; return *this; }
 	const Distance& operator/=(const float &rhs) { value_/=rhs; return *this; }
-	
+
 /*
 	template<typename U> const Time& operator+=(const U &rhs) { value_+=rhs; return *this; }
 	template<typename U> const Time& operator-=(const U &rhs) { value_-=rhs; return *this; }
@@ -115,12 +116,12 @@ public:
 	template<typename U> Time operator-(const U &rhs)const { return value_-rhs; }
 	template<typename U> Time operator*(const U &rhs)const { return value_*rhs; }
 	template<typename U> Time operator/(const U &rhs)const { return value_/rhs; }
-	
+
 	Time operator-()const { return -value_; }
 */
 }; // END of class Distance
-	
-}; // END of namespace sinfg
+
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */