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
@@ -25,90 +25,93 @@
 #include <QString>


-namespace glabels::barcode
+namespace glabels
 {
-	
-	///
-	///  Style Type
-	///
-	class Style
+	namespace barcode
 	{
+	
+		///
+		///  Style Type
+		///
+		class Style
+		{

-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		Style ();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			Style ();

-		Style ( const QString& id,
-		        const QString& backendId,
-		        const QString& name,
-		        bool           canText,
-		        bool           textOptional,
-		        bool           canChecksum,
-		        bool           checksumOptional,
-		        const QString& defaultDigits,
-		        bool           canFreeform,
-		        int            preferedN );
+			Style ( const QString& id,
+			        const QString& backendId,
+			        const QString& name,
+			        bool           canText,
+			        bool           textOptional,
+			        bool           canChecksum,
+			        bool           checksumOptional,
+			        const QString& defaultDigits,
+			        bool           canFreeform,
+			        int            preferedN );


-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-		const QString& id() const;
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+			const QString& id() const;

-		QString fullId() const;
+			QString fullId() const;

-		const QString& backendId() const;
+			const QString& backendId() const;

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

-		bool canText() const;
+			bool canText() const;

-		bool textOptional() const;
+			bool textOptional() const;

-		bool canChecksum() const;
+			bool canChecksum() const;

-		bool checksumOptional() const;
+			bool checksumOptional() const;

-		const QString& defaultDigits() const;
+			const QString& defaultDigits() const;

-		bool canFreeform() const;
+			bool canFreeform() const;

-		int preferedN() const;
+			int preferedN() const;


-		/////////////////////////////////
-		// Methods
-		/////////////////////////////////
-	public:
-		QString exampleDigits( int n ) const;
+			/////////////////////////////////
+			// Methods
+			/////////////////////////////////
+		public:
+			QString exampleDigits( int n ) const;


-		/////////////////////////////////
-		// Operators
-		/////////////////////////////////
-	public:
-		bool operator!=( const Style& other ) const;
+			/////////////////////////////////
+			// Operators
+			/////////////////////////////////
+		public:
+			bool operator!=( const Style& other ) const;


-		/////////////////////////////////
-		// Private Data
-		/////////////////////////////////
-	private:
-		QString mId;
-		QString mBackendId;
-		QString mName;
-		bool    mCanText;
-		bool    mTextOptional;
-		bool    mCanChecksum;
-		bool    mChecksumOptional;
-		QString mDefaultDigits;
-		bool    mCanFreeform;
-		int     mPreferedN;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			QString mId;
+			QString mBackendId;
+			QString mName;
+			bool    mCanText;
+			bool    mTextOptional;
+			bool    mCanChecksum;
+			bool    mChecksumOptional;
+			QString mDefaultDigits;
+			bool    mCanFreeform;
+			int     mPreferedN;

-	};
+		};

+	}
 }