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


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

-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	private:
-		TextColon();
-		TextColon( const TextColon* merge );
-		virtual ~TextColon();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		private:
+			TextColon();
+			TextColon( const TextColon* merge );
+			virtual ~TextColon();


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


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

-	};
+		};
+
+	}

 }

+
 #endif // merge_TextColon_h