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,51 +24,57 @@
 #include "Merge.h"


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

-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		None();
-		None( const None* merge );
-		virtual ~None();
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			None();
+			None( const None* merge );
+			virtual ~None();


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


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


-		/////////////////////////////////
-		// Implementation of virtual methods
-		/////////////////////////////////
-	public:
-		QStringList keys() const;
-		QString primaryKey() const;
-	protected:
-		void open();
-		void close();
-		Record* readNextRecord();
+			/////////////////////////////////
+			// Implementation of virtual methods
+			/////////////////////////////////
+		public:
+			QStringList keys() const;
+			QString primaryKey() const;
+		protected:
+			void open();
+			void close();
+			Record* readNextRecord();
 		
-	};
+		};
+
+	}

 }

+
 #endif // merge_None_h