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
@@ -21,59 +21,62 @@
 #include "Paper.h"


-namespace glabels::model
+namespace glabels
 {
+	namespace model
+	{
 	
-	Paper::Paper( const QString&  id,
-		      const QString&  name,
-		      const Distance& width,
-		      const Distance& height,
-		      const QString&  pwgSize )
-		: mId(id), mName(name), mWidth(width), mHeight(height), mPwgSize(pwgSize)
-	{
-		// empty
-	}
+		Paper::Paper( const QString&  id,
+		              const QString&  name,
+		              const Distance& width,
+		              const Distance& height,
+		              const QString&  pwgSize )
+			: mId(id), mName(name), mWidth(width), mHeight(height), mPwgSize(pwgSize)
+		{
+			// empty
+		}


-	QString Paper::id() const
-	{
-		return mId;
-	}
+		QString Paper::id() const
+		{
+			return mId;
+		}

 	
-	QString Paper::name() const
-	{
-		return mName;
-	}
+		QString Paper::name() const
+		{
+			return mName;
+		}

 	
-	Distance Paper::width() const
-	{
-		return mWidth;
-	}
+		Distance Paper::width() const
+		{
+			return mWidth;
+		}

 	
-	Distance Paper::height() const
-	{
-		return mHeight;
-	}
+		Distance Paper::height() const
+		{
+			return mHeight;
+		}

 	
-	QString Paper::pwgSize() const
-	{
-		return mPwgSize;
-	}
+		QString Paper::pwgSize() const
+		{
+			return mPwgSize;
+		}
 	

-	bool Paper::isSizeIso() const
-	{
-		return mPwgSize.startsWith( "iso_" );
-	}
+		bool Paper::isSizeIso() const
+		{
+			return mPwgSize.startsWith( "iso_" );
+		}

 	
-	bool Paper::isSizeUs() const
-	{
-		return mPwgSize.startsWith( "na_" );
-	}
+		bool Paper::isSizeUs() const
+		{
+			return mPwgSize.startsWith( "na_" );
+		}

-} // namespace glabels::model
+	}
+}