Some cleanup/restructuring of Frame and its subclasses.

2013-10-31 18:59:23 -04:00
parent a11b498e9a
commit be55bebc50
10 changed files with 99 additions and 146 deletions
@@ -38,14 +38,13 @@ namespace libglabels
 		{
 		}

-		inline double w() const { return mW; }
-		inline double h() const { return mH; }
 		inline double waste() const { return mWaste; }

+		double w() const { return mW; }
+		double h() const { return mH; }

-		void getSize( double *w, double *h ) const;
+		const QString &sizeDescription( Units *units );
 		bool isSimilar( Frame *b ) const;
-		QString &getSizeDescription( Units *units ) const;


 	private:
@@ -53,6 +52,8 @@ namespace libglabels
 		double mH;
 		double mWaste;

+		QString mSizeDescription;
+
 	};

 }