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,61 +21,64 @@
 #include "TextCsv.h"


-namespace glabels::merge
+namespace glabels
 {
+	namespace merge
+	{

-	static const QString ID = "Text/Comma";
+		static const QString ID = "Text/Comma";
 	
 	
-	///
-	/// Constructor
-	///
-	TextCsv::TextCsv() : Text(',',false)
-	{
-		mId = ID;
-	}
+		///
+		/// Constructor
+		///
+		TextCsv::TextCsv() : Text(',',false)
+		{
+			mId = ID;
+		}


-	///
-	/// Constructor
-	///
-	TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextCsv::TextCsv( const TextCsv* merge ) : Text( merge )
+		{
+		}


-	///
-	/// Destructor
-	///
-	TextCsv::~TextCsv()
-	{
-	}
+		///
+		/// Destructor
+		///
+		TextCsv::~TextCsv()
+		{
+		}


-	///
-	/// Clone
-	///
-	TextCsv* TextCsv::clone() const
-	{
-		return new TextCsv( this );
-	}
+		///
+		/// Clone
+		///
+		TextCsv* TextCsv::clone() const
+		{
+			return new TextCsv( this );
+		}


-	///
-	/// Get ID
-	///
-	QString TextCsv::id()
-	{
-		return ID;
-	}
+		///
+		/// Get ID
+		///
+		QString TextCsv::id()
+		{
+			return ID;
+		}


-	///
-	/// Create
-	///
-	Merge* TextCsv::create()
-	{
-		return new TextCsv();
-	}
+		///
+		/// Create
+		///
+		Merge* TextCsv::create()
+		{
+			return new TextCsv();
+		}

-} // namespace glabels::merge
+	} // namespace merge
+} // namespace glabels