Reconcile style accross all source files.

- All glabels code is in "glabels" top-level namespace. - Other assorted cleanup.
2017-01-15 22:58:53 -05:00
parent 44aa31d074
commit b797d13e40
153 changed files with 17673 additions and 16841 deletions
@@ -21,122 +21,129 @@
 #include "TextNode.h"


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

-
-///
-/// Constructor from Data
-///
-TextNode::TextNode( bool isField, const QString &data )
-	: mIsField(isField), mData(data)
-{
-}
-
-
-///
-/// == 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;
+
+	///
+	/// 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;
+	}
+
 }