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,65 +25,69 @@
 #include <qrencode.h>


-namespace glabels::barcode
+namespace glabels
 {
-	namespace QrEncode
+	namespace barcode
 	{
-
-		/*
-		 * Static QrCode barcode creation method
-		 */
-		glbarcode::Barcode* QrCode::create()
+		namespace QrEncode
 		{
-			return new QrCode();
-		}

-
-		/*
-		 * QrCode data validation, implements glbarcode::Barcode2dBase::validate()
-		 */
-		bool QrCode::validate( const std::string& rawData )
-		{
-			if ( rawData.size() == 0 )
+			/*
+			 * Static QrCode barcode creation method
+			 */
+			glbarcode::Barcode* QrCode::create()
 			{
-				return false;
-			}
-			return true;
-		}
-
-
-		/*
-		 * QrCode data encoding, implements glbarcode::Barcode2dBase::encode()
-		 */
-		bool QrCode::encode( const std::string& cookedData, glbarcode::Matrix<bool>& encodedData )
-		{
-			QRcode *qrcode = QRcode_encodeString( cookedData.c_str(), 0, QR_ECLEVEL_M, QR_MODE_8, 1 );
-			if ( qrcode == NULL )
-			{
-				return false;
+				return new QrCode();
 			}


-			int w = qrcode->width;
-			encodedData.resize( w, w );
-		
-		
-			for ( int iy = 0; iy < w; iy++ )
+			/*
+			 * QrCode data validation, implements glbarcode::Barcode2dBase::validate()
+			 */
+			bool QrCode::validate( const std::string& rawData )
 			{
-				for ( int ix = 0; ix < w; ix++ )
+				if ( rawData.size() == 0 )
 				{
-					encodedData[iy][ix] = qrcode->data[ iy*w + ix ] & 0x01;
+					return false;
 				}
+				return true;
 			}


-			QRcode_free( qrcode );
-			QRcode_clearCache();
+			/*
+			 * QrCode data encoding, implements glbarcode::Barcode2dBase::encode()
+			 */
+			bool QrCode::encode( const std::string& cookedData, glbarcode::Matrix<bool>& encodedData )
+			{
+				QRcode *qrcode = QRcode_encodeString( cookedData.c_str(), 0, QR_ECLEVEL_M, QR_MODE_8, 1 );
+				if ( qrcode == NULL )
+				{
+					return false;
+				}
+
+
+				int w = qrcode->width;
+				encodedData.resize( w, w );
+		
+		
+				for ( int iy = 0; iy < w; iy++ )
+				{
+					for ( int ix = 0; ix < w; ix++ )
+					{
+						encodedData[iy][ix] = qrcode->data[ iy*w + ix ] & 0x01;
+					}
+				}
+
+
+				QRcode_free( qrcode );
+				QRcode_clearCache();
+
+				return true;
+			}

-			return true;
 		}
-
 	}
 }

+
 #endif // HAVE_QRENCODE