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,40 +25,43 @@
 #include "Text.h"


-namespace glabels::merge
+namespace glabels
 {
-
-	///
-	/// TextColon Merge Backend
-	///
-	struct TextColon : public Text
+	namespace merge
 	{

-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextColon();
-		TextColon( const TextColon* merge );
-		~TextColon() override;
+		///
+		/// TextColon Merge Backend
+		///
+		struct TextColon : public Text
+		{
+
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextColon();
+			TextColon( const TextColon* merge );
+			~TextColon() override;


-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-	public:
-		TextColon* clone() const override;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+		public:
+			TextColon* clone() const override;


-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static QString id();
-		static Merge* create();
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static QString id();
+			static Merge* create();

-	};
+		};

+	}
 }