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,129 +21,132 @@
 #include "TextNode.h"


-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Default Constructor
-	///
-	TextNode::TextNode()
-		: mIsField(false), mData("")
+	namespace model
 	{
-		// empty
-	}

-
-	///
-	/// Constructor from Data
-	///
-	TextNode::TextNode( bool isField, const QString &data )
-		: mIsField(isField), mData(data)
-	{
-		// empty
-	}
-
-
-	///
-	/// == Operator
-	///
-	bool TextNode::operator==( const TextNode& other )
-	{
-		return (mIsField == other.mIsField) &&
-			(mData    == other.mData);
-	}
-
-
-	///
-	/// != Operator
-	///
-	bool TextNode::operator!=( const TextNode& other )
-	{
-		return (mIsField != other.mIsField) ||
-			(mData    != other.mData);
-	}
-
-
-	///
-	/// isField? Property Getter
-	///
-	bool TextNode::isField() const
-	{
-		return mIsField;
-	}
-
-
-	///
-	/// isField Flag Property Setter
-	///
-	void TextNode::setField( bool isField )
-	{
-		mIsField = isField;
-	}
-
-
-	///
-	/// Data Property Getter
-	///
-	const QString& TextNode::data() const
-	{
-		return mData;
-	}
-
-
-	///
-	/// Data Property Setter
-	///
-	void TextNode::setData( const QString& data )
-	{
-		mData = data;
-	}
-
-
-	///
-	/// Get text, expand if necessary
-	///
-	QString TextNode::text( merge::Record* record ) const
-	{
-		if ( mIsField )
+		///
+		/// Default Constructor
+		///
+		TextNode::TextNode()
+			: mIsField(false), mData("")
 		{
-			if ( !record )
-			{
-				return QString("${%1}").arg( mData );
-			}
-			else
-			{
-				if ( record->contains( mData ) )
-				{
-					return (*record)[ mData ];
-				}
-				else
-				{
-					return "";
-				}
-			}
+			// empty
 		}
-		else
+
+
+		///
+		/// Constructor from Data
+		///
+		TextNode::TextNode( bool isField, const QString &data )
+			: mIsField(isField), mData(data)
+		{
+			// empty
+		}
+
+
+		///
+		/// == Operator
+		///
+		bool TextNode::operator==( const TextNode& other )
+		{
+			return (mIsField == other.mIsField) &&
+				(mData    == other.mData);
+		}
+
+
+		///
+		/// != Operator
+		///
+		bool TextNode::operator!=( const TextNode& other )
+		{
+			return (mIsField != other.mIsField) ||
+				(mData    != other.mData);
+		}
+
+
+		///
+		/// isField? Property Getter
+		///
+		bool TextNode::isField() const
+		{
+			return mIsField;
+		}
+
+
+		///
+		/// isField Flag Property Setter
+		///
+		void TextNode::setField( bool isField )
+		{
+			mIsField = isField;
+		}
+
+
+		///
+		/// Data Property Getter
+		///
+		const QString& TextNode::data() const
 		{
 			return mData;
 		}
-	}


-	///
-	/// Is it an empty field
-	///
-	bool TextNode::isEmptyField( merge::Record* record ) const
-	{
-		if ( record && mIsField )
+		///
+		/// Data Property Setter
+		///
+		void TextNode::setData( const QString& data )
 		{
-			if ( record->contains( mData ) )
+			mData = data;
+		}
+
+
+		///
+		/// Get text, expand if necessary
+		///
+		QString TextNode::text( merge::Record* record ) const
+		{
+			if ( mIsField )
 			{
-				return (*record)[mData].isEmpty();
+				if ( !record )
+				{
+					return QString("${%1}").arg( mData );
+				}
+				else
+				{
+					if ( record->contains( mData ) )
+					{
+						return (*record)[ mData ];
+					}
+					else
+					{
+						return "";
+					}
+				}
+			}
+			else
+			{
+				return mData;
 			}
 		}

-		return false;
-	}

-} // namespace glabels::model
+		///
+		/// Is it an empty field
+		///
+		bool TextNode::isEmptyField( merge::Record* record ) const
+		{
+			if ( record && mIsField )
+			{
+				if ( record->contains( mData ) )
+				{
+					return (*record)[mData].isEmpty();
+				}
+			}
+
+			return false;
+		}
+
+	}
+}