Some style cleanup to libglabels.

libglabels/FrameEllipse.h

@@ -29,33 +29,23 @@ namespace libglabels
 
 	class FrameEllipse : public Frame
 	{
+		
 	public:
-		FrameEllipse( double  w,
-			      double  h,
-			      double  waste,
-			      QString id = "0" )
-			: mW(w), mH(h), mWaste(waste), Frame(id)
-		{
-			mPath.addEllipse( 0, 0, mW, mH );
-			mRotatedPath.addEllipse( 0, 0, mH, mW );
-		}
+		FrameEllipse( double w, double h, double waste, QString id = "0" );
 
-		FrameEllipse( const FrameEllipse &other )
-			: mW(other.mW), mH(other.mH), mWaste(other.mWaste), mPath(other.mPath), Frame(other)
-		{
-		}
+		FrameEllipse( const FrameEllipse& other );
 
-		Frame *dup() const { return new FrameEllipse( *this ); }
+		Frame* dup() const;
 
-		inline double waste() const { return mWaste; }
+		double waste() const;
 
-		double w() const { return mW; }
-		double h() const { return mH; }
+		double w() const;
+		double h() const;
 
-		const QString sizeDescription( const Units *units ) const;
-		bool isSimilarTo( Frame *other ) const;
+		const QString sizeDescription( const Units* units ) const;
+		bool isSimilarTo( Frame* other ) const;
 
-		const QPainterPath &path( bool isRotated ) const { return isRotated ? mRotatedPath : mPath; }
+		const QPainterPath& path( bool isRotated ) const;
 		QGraphicsItem* createMarginGraphicsItem( double size, const QPen& pen ) const;
 
 
@@ -71,4 +61,8 @@ namespace libglabels
 
 }
 
+
+#include "FrameEllipse.inl"
+
+
 #endif // libglabels_FrameEllipse_h