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

diff --git a/synfig-core/trunk/src/synfig/distance.h b/synfig-core/trunk/src/synfig/distance.h
index dd9c314..7e686f4 100644
--- a/synfig-core/trunk/src/synfig/distance.h
+++ b/synfig-core/trunk/src/synfig/distance.h
@@ -2,7 +2,7 @@
 /*!	\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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -44,12 +44,12 @@ class Distance
 {
 public:
 	typedef Real value_type;
-	
+
 	enum System
 	{
 		SYSTEM_UNITS,		//!<
 		SYSTEM_PIXELS,		//!<
-		
+
 		SYSTEM_POINTS,		//!<
 		SYSTEM_INCHES,		//!<
 		SYSTEM_METERS,		//!<
@@ -61,18 +61,18 @@ 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 synfig::String& string);
-	
+
 	operator Real()const { return value_; }
 
 	Distance& operator=(const Real& rhs) { value_=rhs; return *this; }
@@ -80,19 +80,19 @@ public:
 	Distance& operator=(const synfig::String& rhs);
 
 	synfig::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 synfig::String& str);
 	static synfig::String system_name(System system);
@@ -105,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; }
@@ -116,11 +116,11 @@ 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 synfig
 
 /* === E N D =============================================================== */