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
@@ -25,45 +25,51 @@
 #include <QMap>


-namespace merge
+namespace glabels
 {
-	
-	///
-	/// Merge Record
-	///
-	struct Record : public QMap<QString,QString>
+
+	namespace merge
 	{
+	
+		///
+		/// Merge Record
+		///
+		struct Record : public QMap<QString,QString>
+		{

-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		Record();
-		Record( const Record* record );
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			Record();
+			Record( const Record* record );


-		/////////////////////////////////
-		// Object duplication
-		/////////////////////////////////
-		Record* clone() const;
+			/////////////////////////////////
+			// Object duplication
+			/////////////////////////////////
+			Record* clone() const;


-		/////////////////////////////////
-		// Properties
-		/////////////////////////////////
-	public:
-		bool isSelected() const;
-		void setSelected( bool value );
+			/////////////////////////////////
+			// Properties
+			/////////////////////////////////
+		public:
+			bool isSelected() const;
+			void setSelected( bool value );


-		/////////////////////////////////
-		// Private data
-		/////////////////////////////////
-	private:
-		bool                  mSelected;
+			/////////////////////////////////
+			// Private data
+			/////////////////////////////////
+		private:
+			bool                  mSelected;

-	};
+		};
+
+	}

 }

+
 #endif // merge_Record_h