Removed C++17 nested namespace definitions. Should build on trusty again.

2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
@@ -32,85 +32,88 @@
 #include <QList>


-namespace glabels::model
+namespace glabels
 {
-
-	class Template
+	namespace model
 	{
-		Q_DECLARE_TR_FUNCTIONS(Template)

-	public:
+		class Template
+		{
+			Q_DECLARE_TR_FUNCTIONS(Template)

-		Template( const QString&  brand,
-			  const QString&  part,
-			  const QString&  description,
-			  const QString&  paperId,
-		          const Distance& pageWidth,
-		          const Distance& pageHeight );
+		public:

-		Template( const Template& other );
+			Template( const QString&  brand,
+			          const QString&  part,
+			          const QString&  description,
+			          const QString&  paperId,
+			          const Distance& pageWidth,
+			          const Distance& pageHeight );

-		Template* dup() const;
+			Template( const Template& other );

-		// Generic full page template
-		static Template* fullPage( const QString& paperId );
+			Template* dup() const;

-		// From equivalent part number
-		static Template* fromEquiv( const QString& brand,
-					    const QString& part,
-					    const QString& equivPart );
+			// Generic full page template
+			static Template* fullPage( const QString& paperId );
+
+			// From equivalent part number
+			static Template* fromEquiv( const QString& brand,
+			                            const QString& part,
+			                            const QString& equivPart );


-		QString brand() const;
-		QString part() const;
-		QString description() const;
+			QString brand() const;
+			QString part() const;
+			QString description() const;

-		QString paperId() const;
-		Distance pageWidth() const;
-		Distance pageHeight() const;
-		bool isSizeIso() const;
-		bool isSizeUs() const;
-		bool isSizeOther() const;
+			QString paperId() const;
+			Distance pageWidth() const;
+			Distance pageHeight() const;
+			bool isSizeIso() const;
+			bool isSizeUs() const;
+			bool isSizeOther() const;

-		QString equivPart() const;
-		void setEquivPart( const QString& value );
+			QString equivPart() const;
+			void setEquivPart( const QString& value );

-		QString productUrl() const;
-		void setProductUrl( const QString& value );
+			QString productUrl() const;
+			void setProductUrl( const QString& value );

-		QString name() const;
+			QString name() const;

-		void addCategory( const QString& categoryId );
-		void addFrame( Frame* frame );
+			void addCategory( const QString& categoryId );
+			void addFrame( Frame* frame );

-		const QList<Frame*>& frames() const;
+			const QList<Frame*>& frames() const;

-		bool operator==( const Template& other ) const;
+			bool operator==( const Template& other ) const;

-		bool hasCategory( const QString& categoryId ) const;
-		bool isSimilarTo( const Template* other ) const;
+			bool hasCategory( const QString& categoryId ) const;
+			bool isSimilarTo( const Template* other ) const;


-	private:
-		QString mBrand;
-		QString mPart;
-		QString mDescription;
+		private:
+			QString mBrand;
+			QString mPart;
+			QString mDescription;

-		QString  mPaperId;
-		Distance mPageWidth;
-		Distance mPageHeight;
-		bool     mIsSizeIso;
-		bool     mIsSizeUs;
+			QString  mPaperId;
+			Distance mPageWidth;
+			Distance mPageHeight;
+			bool     mIsSizeIso;
+			bool     mIsSizeUs;

-		QString mEquivPart;
-		QString mName;
+			QString mEquivPart;
+			QString mName;

-		QString        mProductUrl;
-		QStringList    mCategoryIds;
+			QString        mProductUrl;
+			QStringList    mCategoryIds;

-		QList<Frame*>  mFrames;
-	};
+			QList<Frame*>  mFrames;
+		};

+	}
 }