Reconcile style accross all source files.

- All glabels code is in "glabels" top-level namespace.
- Other assorted cleanup.

glabels/Merge/TextColon.cpp

@@ -21,60 +21,65 @@
 #include "TextColon.h"
 
 
-namespace merge
+namespace glabels
 {
-	static const QString ID = "Text/Colon";
 
-
-	///
-	/// Constructor
-	///
-	TextColon::TextColon() : Text(':',false)
+	namespace merge
 	{
-		mId = ID;
-	}
+		static const QString ID = "Text/Colon";
 
 
-	///
-	/// Constructor
-	///
-	TextColon::TextColon( const TextColon* merge ) : Text( merge )
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextColon::TextColon() : Text(':',false)
+		{
+			mId = ID;
+		}
 
 
-	///
-	/// Destructor
-	///
-	TextColon::~TextColon()
-	{
-	}
+		///
+		/// Constructor
+		///
+		TextColon::TextColon( const TextColon* merge ) : Text( merge )
+		{
+		}
 
 
-	///
-	/// Clone
-	///
-	TextColon* TextColon::clone() const
-	{
-		return new TextColon( this );
-	}
+		///
+		/// Destructor
+		///
+		TextColon::~TextColon()
+		{
+		}
 
 
-	///
-	/// Get ID
-	///
-	QString TextColon::id()
-	{
-		return ID;
-	}
+		///
+		/// Clone
+		///
+		TextColon* TextColon::clone() const
+		{
+			return new TextColon( this );
+		}
 
 
-	///
-	/// Create
-	///
-	Merge* TextColon::create()
-	{
-		return new TextColon();
+		///
+		/// Get ID
+		///
+		QString TextColon::id()
+		{
+			return ID;
+		}
+
+
+		///
+		/// Create
+		///
+		Merge* TextColon::create()
+		{
+			return new TextColon();
+		}
+
 	}
 
 }