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

backends/barcode/GnuBarcode.h

@@ -26,392 +26,395 @@
 #include "glbarcode/Barcode1dBase.h"
 
 
-namespace glabels::barcode
+namespace glabels
 {
-	namespace GnuBarcode
+	namespace barcode
 	{
-
-		/**
-		 * GnuBarcode::Base base class for all GNU Barcodes
-		 *
-		 * Implements glbarcode::Barcode1dBase.
-		 */
-		class Base : public glbarcode::Barcode1dBase
+		namespace GnuBarcode
 		{
-		protected:
-			int flags;
+
+			/**
+			 * GnuBarcode::Base base class for all GNU Barcodes
+			 *
+			 * Implements glbarcode::Barcode1dBase.
+			 */
+			class Base : public glbarcode::Barcode1dBase
+			{
+			protected:
+				int flags;
 			
-			bool isAscii( const std::string& data ) const;
+				bool isAscii( const std::string& data ) const;
 			
-			bool isNumericLengthValid( const std::string& data,
-			                           unsigned int       nMin,
-			                           unsigned int       nMax ) const;
+				bool isNumericLengthValid( const std::string& data,
+				                           unsigned int       nMin,
+				                           unsigned int       nMax ) const;
 
-			bool isNumericLength1Valid( const std::string& data,
-			                            unsigned int       nMin,
-			                            unsigned int       nMax ) const;
+				bool isNumericLength1Valid( const std::string& data,
+				                            unsigned int       nMin,
+				                            unsigned int       nMax ) const;
 
-			bool isNumericLength2Valid( const std::string& data,
-			                            unsigned int       nMin,
-			                            unsigned int       nMax ) const;
+				bool isNumericLength2Valid( const std::string& data,
+				                            unsigned int       nMin,
+				                            unsigned int       nMax ) const;
 			
-			void vectorize( const std::string& encodedData,
-			                const std::string& displayText,
-			                const std::string& cookedData,
-			                double&            w,
-			                double&            h ) override;
-		};
+				void vectorize( const std::string& encodedData,
+				                const std::string& displayText,
+				                const std::string& cookedData,
+				                double&            w,
+				                double&            h ) override;
+			};
 
 
-		/**
-		 * EAN Barcode (Any)
-		 */
-		class Ean : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN Barcode (Any)
+			 */
+			class Ean : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8 Barcode
-		 */
-		class Ean8 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8 Barcode
+			 */
+			class Ean8 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8+2 Barcode
-		 */
-		class Ean8_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8+2 Barcode
+			 */
+			class Ean8_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-8+5 Barcode
-		 */
-		class Ean8_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-8+5 Barcode
+			 */
+			class Ean8_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13 Barcode
-		 */
-		class Ean13 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13 Barcode
+			 */
+			class Ean13 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13+2 Barcode
-		 */
-		class Ean13_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13+2 Barcode
+			 */
+			class Ean13_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * EAN-13+5 Barcode
-		 */
-		class Ean13_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * EAN-13+5 Barcode
+			 */
+			class Ean13_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC Barcode (Any)
-		 */
-		class Upc : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC Barcode (Any)
+			 */
+			class Upc : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A Barcode
-		 */
-		class UpcA : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A Barcode
+			 */
+			class UpcA : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A+2 Barcode
-		 */
-		class UpcA_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A+2 Barcode
+			 */
+			class UpcA_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-A+5 Barcode
-		 */
-		class UpcA_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-A+5 Barcode
+			 */
+			class UpcA_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E Barcode
-		 */
-		class UpcE : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E Barcode
+			 */
+			class UpcE : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E+2 Barcode
-		 */
-		class UpcE_2 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E+2 Barcode
+			 */
+			class UpcE_2 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * UPC-E+5 Barcode
-		 */
-		class UpcE_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * UPC-E+5 Barcode
+			 */
+			class UpcE_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * ISBN Barcode
-		 */
-		class Isbn : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * ISBN Barcode
+			 */
+			class Isbn : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * ISBN+5 Barcode
-		 */
-		class Isbn_5 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * ISBN+5 Barcode
+			 */
+			class Isbn_5 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code39 Barcode
-		 */
-		class Code39 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code39 Barcode
+			 */
+			class Code39 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128 Barcode
-		 */
-		class Code128 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128 Barcode
+			 */
+			class Code128 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128C Barcode
-		 */
-		class Code128C : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128C Barcode
+			 */
+			class Code128C : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code128B Barcode
-		 */
-		class Code128B : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code128B Barcode
+			 */
+			class Code128B : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * I25 Barcode
-		 */
-		class I25 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * I25 Barcode
+			 */
+			class I25 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * CBR Barcode
-		 */
-		class Cbr : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * CBR Barcode
+			 */
+			class Cbr : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * MSI Barcode
-		 */
-		class Msi : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * MSI Barcode
+			 */
+			class Msi : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * PLS Barcode
-		 */
-		class Pls : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * PLS Barcode
+			 */
+			class Pls : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
 
-		/**
-		 * Code93 Barcode
-		 */
-		class Code93 : public Base
-		{
-		public:
-			static Barcode* create();
+			/**
+			 * Code93 Barcode
+			 */
+			class Code93 : public Base
+			{
+			public:
+				static Barcode* create();
 			
-		protected:
-			bool validate( const std::string& rawData ) override;
-			std::string encode( const std::string& cookedData ) override;
-		};
+			protected:
+				bool validate( const std::string& rawData ) override;
+				std::string encode( const std::string& cookedData ) override;
+			};
 
+		}
 	}
 }