Removed most inline functions and assorted cleanup to libglabels source.

libglabels/Category.cpp

@@ -29,6 +29,18 @@ namespace glabels
 	{
 	}
 
+
+	QString Category::id() const
+	{
+		return mId;
+	}
+
+
+	QString Category::name() const
+	{
+		return mName;
+	}
+
 }
 
 

libglabels/Category.h

@@ -34,8 +34,8 @@ namespace glabels
 	public:
 		Category( const QString& id, const QString& name );
 
-		const QString& id() const;
+		QString id() const;
-		const QString& name() const;
+		QString name() const;
 
 
 	private:
@@ -47,7 +47,4 @@ namespace glabels
 }
 
 
-#include "Category.inl"
-
-
 #endif // glabels_Category_h

libglabels/Category.inl

@@ -1,37 +0,0 @@
-/*  Category.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QString& Category::id() const
-	{
-		return mId;
-	}
-
-
-	inline const QString& Category::name() const
-	{
-		return mName;
-	}
-
-}
-

libglabels/Db.cpp

@@ -81,6 +81,60 @@ namespace glabels
 	}
 
 
+	const QList<Paper*>& Db::papers()
+	{
+		return mPapers;
+	}
+
+
+	const QStringList& Db::paperIds()
+	{
+		return mPaperIds;
+	}
+
+
+	const QStringList& Db::paperNames()
+	{
+		return mPaperNames;
+	}
+
+
+	const QList<Category*>& Db::categories()
+	{
+		return mCategories;
+	}
+
+
+	const QStringList& Db::categoryIds()
+	{
+		return mCategoryIds;
+	}
+
+
+	const QStringList& Db::categoryNames()
+	{
+		return mCategoryNames;
+	}
+
+
+	const QList<Vendor*>& Db::vendors()
+	{
+		return mVendors;
+	}
+
+
+	const QStringList& Db::vendorNames()
+	{
+		return mVendorNames;
+	}
+
+
+	const QList<Template*>& Db::templates()
+	{
+		return mTemplates;
+	}
+
+
 	void Db::registerPaper( Paper *paper )
 	{
 		if ( !isPaperIdKnown( paper->id() ) )
@@ -96,7 +150,7 @@ namespace glabels
 	}
 
 
-	const Paper *Db::lookupPaperFromName( const QString &name )
+	const Paper *Db::lookupPaperFromName( const QString& name )
 	{
 		if ( name.isNull() || name.isEmpty() )
 		{
@@ -117,7 +171,7 @@ namespace glabels
 	}
 
 
-	const Paper *Db::lookupPaperFromId( const QString &id )
+	const Paper *Db::lookupPaperFromId( const QString& id )
 	{
 		if ( id.isNull() || id.isEmpty() )
 		{
@@ -138,7 +192,7 @@ namespace glabels
 	}
 
 
-	const QString &Db::lookupPaperIdFromName( const QString &name )
+	QString Db::lookupPaperIdFromName( const QString& name )
 	{
 		if ( !name.isNull() && !name.isEmpty() )
 		{
@@ -154,7 +208,7 @@ namespace glabels
 	}
 
 
-	const QString &Db::lookupPaperNameFromId( const QString &id )
+	QString Db::lookupPaperNameFromId( const QString& id )
 	{
 		if ( !id.isNull() && !id.isEmpty() )
 		{
@@ -175,7 +229,7 @@ namespace glabels
 	}
 
 
-	bool Db::isPaperIdKnown( const QString &id )
+	bool Db::isPaperIdKnown( const QString& id )
 	{
 		foreach ( Paper *paper, mPapers )
 		{
@@ -189,7 +243,7 @@ namespace glabels
 	}
 
 
-	bool Db::isPaperIdOther( const QString &id )
+	bool Db::isPaperIdOther( const QString& id )
 	{
 		return ( id == "Other" );
 	}
@@ -210,7 +264,7 @@ namespace glabels
 	}
 
 
-	const Category *Db::lookupCategoryFromName( const QString &name )
+	const Category *Db::lookupCategoryFromName( const QString& name )
 	{
 		if ( name.isNull() || name.isEmpty() )
 		{
@@ -231,7 +285,7 @@ namespace glabels
 	}
 
 
-	const Category *Db::lookupCategoryFromId( const QString &id )
+	const Category *Db::lookupCategoryFromId( const QString& id )
 	{
 		if ( id.isNull() || id.isEmpty() )
 		{
@@ -252,7 +306,7 @@ namespace glabels
 	}
 
 
-	const QString &Db::lookupCategoryIdFromName( const QString &name )
+	QString Db::lookupCategoryIdFromName( const QString& name )
 	{
 		if ( !name.isNull() && !name.isEmpty() )
 		{
@@ -268,7 +322,7 @@ namespace glabels
 	}
 
 
-	const QString &Db::lookupCategoryNameFromId( const QString &id )
+	QString Db::lookupCategoryNameFromId( const QString& id )
 	{
 		if ( !id.isNull() && !id.isEmpty() )
 		{
@@ -284,7 +338,7 @@ namespace glabels
 	}
 
 
-	bool Db::isCategoryIdKnown( const QString &id )
+	bool Db::isCategoryIdKnown( const QString& id )
 	{
 		foreach ( Category *category, mCategories )
 		{
@@ -312,7 +366,7 @@ namespace glabels
 	}
 
 
-	const Vendor *Db::lookupVendorFromName( const QString &name )
+	const Vendor *Db::lookupVendorFromName( const QString& name )
 	{
 		if ( name.isNull() || name.isEmpty() )
 		{
@@ -333,7 +387,7 @@ namespace glabels
 	}
 
 
-	const QString &Db::lookupVendorUrlFromName( const QString &name )
+	QString Db::lookupVendorUrlFromName( const QString& name )
 	{
 		if ( !name.isNull() && !name.isEmpty() )
 		{
@@ -349,7 +403,7 @@ namespace glabels
 	}
 
 
-	bool Db::isVendorNameKnown( const QString &name )
+	bool Db::isVendorNameKnown( const QString& name )
 	{
 		foreach ( Vendor *vendor, mVendors )
 		{
@@ -377,7 +431,7 @@ namespace glabels
 	}
 
 
-	const Template *Db::lookupTemplateFromName( const QString &name )
+	const Template *Db::lookupTemplateFromName( const QString& name )
 	{
 		if ( name.isNull() || name.isEmpty() )
 		{
@@ -398,7 +452,7 @@ namespace glabels
 	}
 
 
-	const Template *Db::lookupTemplateFromBrandPart( const QString &brand, const QString &part )
+	const Template *Db::lookupTemplateFromBrandPart( const QString& brand, const QString& part )
 	{
 		if ( brand.isNull() || brand.isEmpty() || part.isNull() || part.isEmpty() )
 		{
@@ -419,7 +473,7 @@ namespace glabels
 	}
 
 
-	bool Db::isTemplateKnown( const QString &brand, const QString &part )
+	bool Db::isTemplateKnown( const QString& brand, const QString& part )
 	{
 		foreach ( Template *tmplate, mTemplates )
 		{
@@ -433,7 +487,7 @@ namespace glabels
 	}
 
 
-	QStringList Db::getNameListOfSimilarTemplates( const QString &name )
+	QStringList Db::getNameListOfSimilarTemplates( const QString& name )
 	{
 		QStringList list;
 
@@ -465,13 +519,13 @@ namespace glabels
 	}
 
 
-	void Db::deleteUserTemplateByName( const QString &name )
+	void Db::deleteUserTemplateByName( const QString& name )
 	{
 		// TODO
 	}
 
 
-	void Db::deleteUserTemplateByBrandPart( const QString &brand, const QString &part )
+	void Db::deleteUserTemplateByBrandPart( const QString& brand, const QString& part )
 	{
 		// TODO
 	}
@@ -568,7 +622,7 @@ namespace glabels
 	}
 
 
-	void Db::readPapersFromDir( const QDir &dir )
+	void Db::readPapersFromDir( const QDir& dir )
 	{
 		XmlPaperParser parser;
 
@@ -588,7 +642,7 @@ namespace glabels
 	}
 
 
-	void Db::readCategoriesFromDir( const QDir &dir )
+	void Db::readCategoriesFromDir( const QDir& dir )
 	{
 		XmlCategoryParser parser;
 
@@ -608,7 +662,7 @@ namespace glabels
 	}
 
 
-	void Db::readVendorsFromDir( const QDir &dir )
+	void Db::readVendorsFromDir( const QDir& dir )
 	{
 		XmlVendorParser parser;
 
@@ -632,7 +686,7 @@ namespace glabels
 	}
 
 
-	void Db::readTemplatesFromDir( const QDir &dir )
+	void Db::readTemplatesFromDir( const QDir& dir )
 	{
 		QStringList filters;
 		filters << "*-templates.xml" << "*.template";

libglabels/Db.h

@@ -43,6 +43,7 @@ namespace glabels
 	private:
 		Db();
 
+		
 	public:
 		static void init();
 		static Db* instance();
@@ -63,36 +64,36 @@ namespace glabels
 
 
 		static void registerPaper( Paper *paper );
-		static const Paper *lookupPaperFromName( const QString &name );
+		static const Paper *lookupPaperFromName( const QString& name );
-		static const Paper *lookupPaperFromId( const QString &id );
+		static const Paper *lookupPaperFromId( const QString& id );
-		static const QString &lookupPaperIdFromName( const QString &name );
+		static QString lookupPaperIdFromName( const QString& name );
-		static const QString &lookupPaperNameFromId( const QString &id );
+		static QString lookupPaperNameFromId( const QString& id );
-		static bool isPaperIdKnown( const QString &id );
+		static bool isPaperIdKnown( const QString& id );
-		static bool isPaperIdOther( const QString &id );
+		static bool isPaperIdOther( const QString& id );
 
 		static void registerCategory( Category *category );
-		static const Category *lookupCategoryFromName( const QString &name );
+		static const Category *lookupCategoryFromName( const QString& name );
-		static const Category *lookupCategoryFromId( const QString &id );
+		static const Category *lookupCategoryFromId( const QString& id );
-		static const QString &lookupCategoryIdFromName( const QString &name );
+		static QString lookupCategoryIdFromName( const QString& name );
-		static const QString &lookupCategoryNameFromId( const QString &id );
+		static QString lookupCategoryNameFromId( const QString& id );
-		static bool isCategoryIdKnown( const QString &id );
+		static bool isCategoryIdKnown( const QString& id );
 
 		static void registerVendor( Vendor *vendor );
-		static const Vendor *lookupVendorFromName( const QString &name );
+		static const Vendor *lookupVendorFromName( const QString& name );
-		static const QString &lookupVendorUrlFromName( const QString &name );
+		static QString lookupVendorUrlFromName( const QString& name );
-		static bool isVendorNameKnown( const QString &id );
+		static bool isVendorNameKnown( const QString& id );
 
 		static void registerTemplate( Template *tmplate );
-		static const Template *lookupTemplateFromName( const QString &name );
+		static const Template *lookupTemplateFromName( const QString& name );
-		static const Template *lookupTemplateFromBrandPart( const QString &brand,
+		static const Template *lookupTemplateFromBrandPart( const QString& brand,
-		                                                    const QString &part );
+		                                                    const QString& part );
-		static bool isTemplateKnown( const QString &brand, const QString &part );
+		static bool isTemplateKnown( const QString& brand, const QString& part );
-		static QStringList getNameListOfSimilarTemplates( const QString &name );
+		static QStringList getNameListOfSimilarTemplates( const QString& name );
 
 		static void registerUserTemplate( Template *tmplate );
-		static void deleteUserTemplateByName( const QString &name );
+		static void deleteUserTemplateByName( const QString& name );
-		static void deleteUserTemplateByBrandPart( const QString &brand,
+		static void deleteUserTemplateByBrandPart( const QString& brand,
-		                                           const QString &part );
+		                                           const QString& part );
 
 		static void printKnownPapers();
 		static void printKnownCategories();
@@ -104,16 +105,16 @@ namespace glabels
 		static QDir systemTemplatesDir();
 
 		static void readPapers();
-		static void readPapersFromDir( const QDir &dir );
+		static void readPapersFromDir( const QDir& dir );
 
 		static void readCategories();
-		static void readCategoriesFromDir( const QDir &dir );
+		static void readCategoriesFromDir( const QDir& dir );
 
 		static void readVendors();
-		static void readVendorsFromDir( const QDir &dir );
+		static void readVendorsFromDir( const QDir& dir );
 
 		static void readTemplates();
-		static void readTemplatesFromDir( const QDir &dir );
+		static void readTemplatesFromDir( const QDir& dir );
 
 
 	private:
@@ -137,7 +138,4 @@ namespace glabels
 }
 
 
-#include "Db.inl"
-
-
 #endif // glabels_Db_h

libglabels/Db.inl

@@ -1,77 +0,0 @@
-/*  Db.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QList<Paper*>& Db::papers()
-	{
-		return mPapers;
-	}
-
-
-	inline const QStringList& Db::paperIds()
-	{
-		return mPaperIds;
-	}
-
-
-	inline const QStringList& Db::paperNames()
-	{
-		return mPaperNames;
-	}
-
-
-	inline const QList<Category*>& Db::categories()
-	{
-		return mCategories;
-	}
-
-
-	inline const QStringList& Db::categoryIds()
-	{
-		return mCategoryIds;
-	}
-
-
-	inline const QStringList& Db::categoryNames()
-	{
-		return mCategoryNames;
-	}
-
-
-	inline const QList<Vendor*>& Db::vendors()
-	{
-		return mVendors;
-	}
-
-
-	inline const QStringList& Db::vendorNames()
-	{
-		return mVendorNames;
-	}
-
-	inline const QList<Template*>& Db::templates()
-	{
-		return mTemplates;
-	}
-
-}

libglabels/Frame.cpp

@@ -50,6 +50,36 @@ namespace glabels
 	}
 
 
+	QString Frame::id() const
+	{
+		return mId;
+	}
+
+	
+	int Frame::nLabels() const
+	{
+		return mNLabels;
+	}
+
+	
+	QString Frame::layoutDescription() const
+	{
+		return mLayoutDescription;
+	}
+
+	
+	const QList<Layout*>& Frame::layouts() const
+	{
+		return mLayouts;
+	}
+
+	
+	const QList<Markup*>& Frame::markups() const
+	{
+		return mMarkups;
+	}
+	
+
 	QVector<Point> Frame::getOrigins() const
 	{
 		QVector<Point> origins( nLabels() );

libglabels/Frame.h

@@ -51,9 +51,9 @@ namespace glabels
 	public:
 		virtual Frame* dup() const = 0;
 
-		const QString& id() const;
+		QString id() const;
 		int nLabels() const;
-		const QString& layoutDescription() const;
+		QString layoutDescription() const;
 		const QList<Layout*>& layouts() const;
 		const QList<Markup*>& markups() const;
 
@@ -65,7 +65,7 @@ namespace glabels
 		virtual Distance w() const = 0;
 		virtual Distance h() const = 0;
 
-		virtual const QString sizeDescription( const Units& units ) const = 0;
+		virtual QString sizeDescription( const Units& units ) const = 0;
 		virtual bool isSimilarTo( Frame* other ) const = 0;
 
 		virtual const QPainterPath& path() const = 0;
@@ -85,7 +85,4 @@ namespace glabels
 }
 
 
-#include "Frame.inl"
-
-
 #endif // glabels_Frame_h

libglabels/Frame.inl

@@ -1,54 +0,0 @@
-/*  Frame.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QString& Frame::id() const
-	{
-		return mId;
-	}
-
-	
-	inline int Frame::nLabels() const
-	{
-		return mNLabels;
-	}
-
-	
-	inline const QString& Frame::layoutDescription() const
-	{
-		return mLayoutDescription;
-	}
-
-	
-	inline const QList<Layout*>& Frame::layouts() const
-	{
-		return mLayouts;
-	}
-
-	
-	inline const QList<Markup*>& Frame::markups() const
-	{
-		return mMarkups;
-	}
-	
-}

libglabels/FrameCd.cpp

@@ -117,7 +117,25 @@ namespace glabels
 	}
 
 
-	const QString FrameCd::sizeDescription( const Units& units ) const
+	Distance FrameCd::r1() const
+	{
+		return mR1;
+	}
+
+	
+	Distance FrameCd::r2() const
+	{
+		return mR2;
+	}
+
+	
+	Distance FrameCd::waste() const
+	{
+		return mWaste;
+	}
+	
+
+	QString FrameCd::sizeDescription( const Units& units ) const
 	{
 		if ( units.toEnum() == Units::IN )
 		{

libglabels/FrameCd.h

@@ -49,7 +49,7 @@ namespace glabels
 		Distance w() const;
 		Distance h() const;
 
-		const QString sizeDescription( const Units& units ) const;
+		QString sizeDescription( const Units& units ) const;
 		bool isSimilarTo( Frame* other ) const;
 
 		const QPainterPath& path() const;
@@ -72,7 +72,4 @@ namespace glabels
 }
 
 
-#include "FrameCd.inl"
-
-
 #endif // glabels_FrameCd_h

libglabels/FrameCd.inl

@@ -1,42 +0,0 @@
-/*  FrameCd.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance FrameCd::r1() const
-	{
-		return mR1;
-	}
-
-	
-	inline Distance FrameCd::r2() const
-	{
-		return mR2;
-	}
-
-	
-	inline Distance FrameCd::waste() const
-	{
-		return mWaste;
-	}
-	
-}

libglabels/FrameEllipse.cpp

@@ -62,7 +62,13 @@ namespace glabels
 	}
 	
 
-	const QString FrameEllipse::sizeDescription( const Units& units ) const
+	Distance FrameEllipse::waste() const
+	{
+		return mWaste;
+	}
+
+
+	QString FrameEllipse::sizeDescription( const Units& units ) const
 	{
 		if ( units.toEnum() == Units::IN )
 		{

libglabels/FrameEllipse.h

@@ -46,7 +46,7 @@ namespace glabels
 		Distance w() const;
 		Distance h() const;
 
-		const QString sizeDescription( const Units& units ) const;
+		QString sizeDescription( const Units& units ) const;
 		bool isSimilarTo( Frame* other ) const;
 
 		const QPainterPath& path() const;
@@ -67,7 +67,4 @@ namespace glabels
 }
 
 
-#include "FrameEllipse.inl"
-
-
 #endif // glabels_FrameEllipse_h

libglabels/FrameEllipse.inl

@@ -1,30 +0,0 @@
-/*  FrameEllipse.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance FrameEllipse::waste() const
-	{
-		return mWaste;
-	}
-
-}

libglabels/FrameRect.cpp

@@ -69,7 +69,25 @@ namespace glabels
 	}
 
 
-	const QString FrameRect::sizeDescription( const Units& units ) const
+	Distance FrameRect::r() const
+	{
+		return mR;
+	}
+
+		
+	Distance FrameRect::xWaste() const
+	{
+		return mXWaste;
+	}
+
+		
+	Distance FrameRect::yWaste() const
+	{
+		return mYWaste;
+	}
+
+
+	QString FrameRect::sizeDescription( const Units& units ) const
 	{
 		if ( units.toEnum() == Units::IN )
 		{

libglabels/FrameRect.h

@@ -49,7 +49,7 @@ namespace glabels
 		Distance w() const;
 		Distance h() const;
 
-		const QString sizeDescription( const Units& units ) const;
+		QString sizeDescription( const Units& units ) const;
 
 		bool isSimilarTo( Frame* other ) const;
 
@@ -73,7 +73,4 @@ namespace glabels
 }
 
 
-#include "FrameRect.inl"
-
-
 #endif // glabels_FrameRect_h

libglabels/FrameRect.inl

@@ -1,42 +0,0 @@
-/*  FrameRect.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance FrameRect::r() const
-	{
-		return mR;
-	}
-
-		
-	inline Distance FrameRect::xWaste() const
-	{
-		return mXWaste;
-	}
-
-		
-	inline Distance FrameRect::yWaste() const
-	{
-		return mYWaste;
-	}
-
-}

libglabels/FrameRound.cpp

@@ -62,7 +62,19 @@ namespace glabels
 	}
 
 	
-	const QString FrameRound::sizeDescription( const Units& units ) const
+	Distance FrameRound::r() const
+	{
+		return mR;
+	}
+
+
+	Distance FrameRound::waste() const
+	{
+		return mWaste;
+	}
+
+
+	QString FrameRound::sizeDescription( const Units& units ) const
 	{
 		if ( units.toEnum() == Units::IN )
 		{

libglabels/FrameRound.h

@@ -46,7 +46,7 @@ namespace glabels
 		Distance w() const;
 		Distance h() const;
 
-		const QString sizeDescription( const Units& units ) const;
+		QString sizeDescription( const Units& units ) const;
 		bool isSimilarTo( Frame* other ) const;
 
 		const QPainterPath& path() const;
@@ -66,7 +66,4 @@ namespace glabels
 }
 
 
-#include "FrameRound.inl"
-
-
 #endif // glabels_FrameRound_h

libglabels/FrameRound.inl

@@ -1,36 +0,0 @@
-/*  FrameRound.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance FrameRound::r() const
-	{
-		return mR;
-	}
-
-
-	inline Distance FrameRound::waste() const
-	{
-		return mWaste;
-	}
-
-}

libglabels/Layout.cpp

@@ -47,6 +47,42 @@ namespace glabels
 	}
 
 
+	int Layout::nx() const
+	{
+		return mNx;
+	}
+
+		
+	int Layout::ny() const
+	{
+		return mNy;
+	}
+		
+
+	Distance Layout::x0() const
+	{
+		return mX0;
+	}
+
+		
+	Distance Layout::y0() const
+	{
+		return mY0;
+	}
+		
+
+	Distance Layout::dx() const
+	{
+		return mDx;
+	}
+
+		
+	Distance Layout::dy() const
+	{
+		return mDy;
+	}
+
+
 	bool Layout::isSimilarTo( const Layout *other )
 	{
 		return ( (mNx == other->mNx)                           &&

libglabels/Layout.h

@@ -68,7 +68,4 @@ namespace glabels
 }
 
 
-#include "Layout.inl"
-
-
 #endif // glabels_Layout_h

libglabels/Layout.inl

@@ -1,60 +0,0 @@
-/*  Layout.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline int Layout::nx() const
-	{
-		return mNx;
-	}
-
-		
-	inline int Layout::ny() const
-	{
-		return mNy;
-	}
-		
-
-	inline Distance Layout::x0() const
-	{
-		return mX0;
-	}
-
-		
-	inline Distance Layout::y0() const
-	{
-		return mY0;
-	}
-		
-
-	inline Distance Layout::dx() const
-	{
-		return mDx;
-	}
-
-		
-	inline Distance Layout::dy() const
-	{
-		return mDy;
-	}
-
-}

libglabels/Markup.cpp

@@ -44,6 +44,12 @@ namespace glabels
 	}
 
 
+	Distance MarkupMargin::size() const
+	{
+		return mSize;
+	}
+
+
 	MarkupLine::MarkupLine( const Distance& x1,
 				const Distance& y1,
 				const Distance& x2,
@@ -61,6 +67,30 @@ namespace glabels
 	}
 
 	
+	Distance MarkupLine::x1() const
+	{
+		return mX1;
+	}
+
+	
+	Distance MarkupLine::y1() const
+	{
+		return mY1;
+	}
+
+	
+	Distance MarkupLine::x2() const
+	{
+		return mX2;
+	}
+
+	
+	Distance MarkupLine::y2() const
+	{
+		return mY2;
+	}
+
+
 	MarkupRect::MarkupRect( const Distance& x1,
 				const Distance& y1,
 				const Distance& w,
@@ -78,6 +108,36 @@ namespace glabels
 	}
 	
 
+	Distance MarkupRect::x1() const
+	{
+		return mX1;
+	}
+
+	
+	Distance MarkupRect::y1() const
+	{
+		return mY1;
+	}
+
+	
+	Distance MarkupRect::w() const
+	{
+		return mW;
+	}
+
+	
+	Distance MarkupRect::h() const
+	{
+		return mH;
+	}
+
+	
+	Distance MarkupRect::r() const
+	{
+		return mR;
+	}
+
+	
 	MarkupEllipse::MarkupEllipse( const Distance& x1,
 				      const Distance& y1,
 				      const Distance& w,
@@ -94,6 +154,30 @@ namespace glabels
 	}
 
 	
+	Distance MarkupEllipse::x1() const
+	{
+		return mX1;
+	}
+
+	
+	Distance MarkupEllipse::y1() const
+	{
+		return mY1;
+	}
+
+	
+	Distance MarkupEllipse::w() const
+	{
+		return mW;
+	}
+
+	
+	Distance MarkupEllipse::h() const
+	{
+		return mH;
+	}
+
+
 	MarkupCircle::MarkupCircle( const Distance& x0,
 				    const Distance& y0,
 				    const Distance& r )
@@ -107,4 +191,22 @@ namespace glabels
 		return new MarkupCircle( mX0, mY0, mR );
 	}
 
+
+	Distance MarkupCircle::x0() const
+	{
+		return mX0;
+	}
+
+	
+	Distance MarkupCircle::y0() const
+	{
+		return mY0;
+	}
+
+	
+	Distance MarkupCircle::r() const
+	{
+		return mR;
+	}
+
 }

libglabels/Markup.h

@@ -153,7 +153,4 @@ namespace glabels
 }
 
 
-#include "Markup.inl"
-
-
 #endif // glabels_Markup_h

libglabels/Markup.inl

@@ -1,47 +0,0 @@
-/*  Markup.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance MarkupMargin::size() const { return mSize; }
-
-	inline Distance MarkupLine::x1() const { return mX1; }
-	inline Distance MarkupLine::y1() const { return mY1; }
-	inline Distance MarkupLine::x2() const { return mX2; }
-	inline Distance MarkupLine::y2() const { return mY2; }
-
-	inline Distance MarkupRect::x1() const { return mX1; }
-	inline Distance MarkupRect::y1() const { return mY1; }
-	inline Distance MarkupRect::w() const { return mW; }
-	inline Distance MarkupRect::h() const { return mH; }
-	inline Distance MarkupRect::r() const { return mR; }
-
-	inline Distance MarkupEllipse::x1() const { return mX1; }
-	inline Distance MarkupEllipse::y1() const { return mY1; }
-	inline Distance MarkupEllipse::w() const { return mW; }
-	inline Distance MarkupEllipse::h() const { return mH; }
-
-	inline Distance MarkupCircle::x0() const { return mX0; }
-	inline Distance MarkupCircle::y0() const { return mY0; }
-	inline Distance MarkupCircle::r() const { return mR; }
-
-}

libglabels/MiniPreviewPixmap.h

@@ -55,4 +55,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_MiniPreviewPixmap_h

libglabels/Paper.cpp

@@ -33,4 +33,46 @@ namespace glabels
 	{
 	}
 
+
+	QString Paper::id() const
+	{
+		return mId;
+	}
+
+	
+	QString Paper::name() const
+	{
+		return mName;
+	}
+
+	
+	Distance Paper::width() const
+	{
+		return mWidth;
+	}
+
+	
+	Distance Paper::height() const
+	{
+		return mHeight;
+	}
+
+	
+	QString Paper::pwgSize() const
+	{
+		return mPwgSize;
+	}
+	
+
+	bool Paper::isSizeIso() const
+	{
+		return mPwgSize.startsWith( "iso_" );
+	}
+
+	
+	bool Paper::isSizeUs() const
+	{
+		return mPwgSize.startsWith( "na_" );
+	}
+
 }

libglabels/Paper.h

@@ -39,20 +39,20 @@ namespace glabels
 		       const Distance& height,
 		       const QString&  pwgSize );
 
-		inline const QString& id() const;
+		QString id() const;
-		inline const QString& name() const;
+		QString name() const;
 
 		/* Width */
-		inline Distance width() const;
+		Distance width() const;
 
 		/* Height */
-		inline Distance height() const;
+		Distance height() const;
 
 		/* PWG 5101.1-2002 size name */
-		inline QString pwgSize() const;
+		QString pwgSize() const;
 
-		inline bool isSizeIso() const;
+		bool isSizeIso() const;
-		inline bool isSizeUs() const;
+		bool isSizeUs() const;
 
 	private:
 		QString  mId;
@@ -65,7 +65,4 @@ namespace glabels
 }
 
 
-#include "Paper.inl"
-
-
 #endif // glabels_Paper_h

libglabels/Paper.inl

@@ -1,36 +0,0 @@
-/*  Paper.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QString& Paper::id() const { return mId; }
-	inline const QString& Paper::name() const { return mName; }
-
-	inline Distance Paper::width() const { return mWidth; }
-	inline Distance Paper::height() const { return mHeight; }
-
-	inline QString Paper::pwgSize() const { return mPwgSize; }
-
-	inline bool Paper::isSizeIso() const { return mPwgSize.startsWith( "iso_" ); }
-	inline bool Paper::isSizeUs() const { return mPwgSize.startsWith( "na_" ); }
-
-}

libglabels/Point.cpp

@@ -34,6 +34,18 @@ namespace glabels
 	}
 
 
+	Distance Point::x() const
+	{
+		return mX;
+	}
+
+	
+	Distance Point::y() const
+	{
+		return mY;
+	}
+
+
 	bool Point::operator<( const Point &other ) const
 	{
 		if ( mY < other.mY )

libglabels/Point.h

@@ -49,7 +49,4 @@ namespace glabels
 }
 
 
-#include "Point.inl"
-
-
 #endif // glabels_Point_h

libglabels/Point.inl

@@ -1,36 +0,0 @@
-/*  Point.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline Distance Point::x() const
-	{
-		return mX;
-	}
-
-	
-	inline Distance Point::y() const
-	{
-		return mY;
-	}
-
-}

libglabels/StrUtil.h

@@ -39,4 +39,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_StrUtil_h

libglabels/Template.cpp

@@ -124,6 +124,102 @@ namespace glabels
 	}
 
 
+	QString Template::brand() const
+	{
+		return mBrand;
+	}
+
+	
+	QString Template::part() const
+	{
+		return mPart;
+	}
+
+	
+	QString Template::description() const
+	{
+		return mDescription;
+	}
+	
+
+	QString Template::paperId() const
+	{
+		return mPaperId;
+	}
+
+	
+	Distance Template::pageWidth() const
+	{
+		return mPageWidth;
+	}
+
+	
+	Distance Template::pageHeight() const
+	{
+		return mPageHeight;
+	}
+
+	
+	bool Template::isSizeIso() const
+	{
+		return mIsSizeIso;
+	}
+
+	
+	bool Template::isSizeUs() const
+	{
+		return mIsSizeUs;
+	}
+
+	
+	bool Template::isSizeOther() const
+	{
+		return !mIsSizeIso && !mIsSizeUs;
+	}
+	
+
+	QString Template::equivPart() const
+	{
+		return mEquivPart;
+	}
+
+	
+	void Template::setEquivPart( const QString& value )
+	{
+		mEquivPart = value;
+	}
+	
+
+	QString Template::productUrl() const
+	{
+		return mProductUrl;
+	}
+
+	
+	void Template::setProductUrl( const QString& value )
+	{
+		mProductUrl = value;
+	}
+	
+
+	QString Template::name() const
+	{
+		return mName;
+	}
+	
+
+	const MiniPreviewPixmap& Template::preview() const
+	{
+		return mPreview;
+	}
+	
+
+	const QList<Frame*>& Template::frames() const
+	{
+		return mFrames;
+	}
+
+
 	void Template::addCategory( const QString& categoryId )
 	{
 		mCategoryIds << categoryId;

libglabels/Template.h

@@ -65,24 +65,24 @@ namespace glabels
 					    const QString& equivPart );
 
 
-		const QString& brand() const;
+		QString brand() const;
-		const QString& part() const;
+		QString part() const;
-		const QString& description() const;
+		QString description() const;
 
-		const QString& paperId() const;
+		QString paperId() const;
 		Distance pageWidth() const;
 		Distance pageHeight() const;
 		bool isSizeIso() const;
 		bool isSizeUs() const;
 		bool isSizeOther() const;
 
-		const QString& equivPart() const;
+		QString equivPart() const;
 		void setEquivPart( const QString& value );
 
-		const QString& productUrl() const;
+		QString productUrl() const;
 		void setProductUrl( const QString& value );
 
-		const QString& name() const;
+		QString name() const;
 
 		void addCategory( const QString& categoryId );
 		void addFrame( Frame* frame );
@@ -123,7 +123,4 @@ namespace glabels
 }
 
 
-#include "Template.inl"
-
-
 #endif // glabels_Template_h

libglabels/Template.inl

@@ -1,48 +0,0 @@
-/*  Template.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QString& Template::brand() const { return mBrand; }
-	inline const QString& Template::part() const { return mPart; }
-	inline const QString& Template::description() const { return mDescription; }
-
-	inline const QString& Template::paperId() const { return mPaperId; }
-	inline Distance Template::pageWidth() const { return mPageWidth; }
-	inline Distance Template::pageHeight() const { return mPageHeight; }
-	inline bool Template::isSizeIso() const { return mIsSizeIso; }
-	inline bool Template::isSizeUs() const { return mIsSizeUs; }
-	inline bool Template::isSizeOther() const { return !mIsSizeIso && !mIsSizeUs; }
-
-	inline const QString& Template::equivPart() const { return mEquivPart; }
-	inline void Template::setEquivPart( const QString& value ) { mEquivPart = value; }
-
-	inline const QString& Template::productUrl() const { return mProductUrl; }
-	inline void Template::setProductUrl( const QString& value ) { mProductUrl = value; }
-
-	inline const QString& Template::name() const { return mName; }
-
-	inline const MiniPreviewPixmap& Template::preview() const { return mPreview; }
-
-	inline const QList<Frame*>& Template::frames() const { return mFrames; }
-
-}

libglabels/Vendor.cpp

@@ -28,4 +28,16 @@ namespace glabels
 	{
 	}
 
+
+	QString Vendor::name() const
+	{
+		return mName;
+	}
+
+	
+	QString Vendor::url() const
+	{
+		return mUrl;
+	}
+
 }

libglabels/Vendor.h

@@ -33,8 +33,8 @@ namespace glabels
 	public:
 		Vendor( const QString &name, const QString &url );
 
-		const QString& name() const;
+		QString name() const;
-		const QString& url() const;
+		QString url() const;
 
 	private:
 		QString mName;
@@ -44,7 +44,4 @@ namespace glabels
 }
 
 
-#include "Vendor.inl"
-
-
 #endif // glabels_Vendor_h

libglabels/Vendor.inl

@@ -1,28 +0,0 @@
-/*  Vendor.inl
- *
- *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-namespace glabels
-{
-
-	inline const QString& Vendor::name() const { return mName; }
-	inline const QString& Vendor::url() const { return mUrl; }
-
-}

libglabels/XmlCategoryParser.h

@@ -43,4 +43,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlCategoryParser_h

libglabels/XmlPaperParser.h

@@ -43,4 +43,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlPaperParser_h

libglabels/XmlTemplateCreator.h

@@ -65,4 +65,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlTemplateCreator_h

libglabels/XmlTemplateParser.h

@@ -58,4 +58,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlTemplateParser_h

libglabels/XmlUtil.h

@@ -104,4 +104,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlUtil_h

libglabels/XmlVendorParser.h

@@ -43,4 +43,5 @@ namespace glabels
 
 }
 
+
 #endif // glabels_XmlVendorParser_h