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
@@ -26,78 +26,86 @@
 #include <QMap>


-namespace merge
+namespace glabels
 {
-	class Merge; // Forward reference
-	

-	///
-	/// Factory
-	///
-	class Factory
+	namespace merge
 	{
-		Q_DECLARE_TR_FUNCTIONS(Factory)
+
+		// Forward references
+		class Merge;
 	

-		/////////////////////////////////
-		// Source Type
-		/////////////////////////////////
-	public:
-		enum SourceType { NONE, FIXED, FILE };
-		
-		
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	protected:
-		Factory();
-
-
-		/////////////////////////////////
-		// Static methods
-		/////////////////////////////////
-	public:
-		static void init();
-	
-		static Merge* createMerge( const QString& id );
-
-		static QStringList nameList();
-		static QString idToName( const QString& id );
-		static QString nameToId( const QString& name );
-		static SourceType idToType( const QString& id );
-		static QString indexToId( int index );
-
-
-		/////////////////////////////////
-		// private methods
-		/////////////////////////////////
-	private:
-		typedef Merge* (*CreateFct)();
-	
-		static void registerBackend( const QString& id,
-		                             const QString& name,
-		                             SourceType     type,
-		                             CreateFct      create );
-
-
-		/////////////////////////////////
-		// private data
-		/////////////////////////////////
-		class BackendEntry
+		///
+		/// Factory
+		///
+		class Factory
 		{
-		public:
-			QString    id;
-			QString    name;
-			SourceType type;
-			CreateFct  create;
-		};
+			Q_DECLARE_TR_FUNCTIONS(Factory)
 	
-		static QMap<QString,BackendEntry> mBackendIdMap;
-		static QMap<QString,BackendEntry> mBackendNameMap;
+
+			/////////////////////////////////
+			// Source Type
+			/////////////////////////////////
+		public:
+			enum SourceType { NONE, FIXED, FILE };
 		
-		static QStringList mNameList;
-	};
+		
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		protected:
+			Factory();
+
+
+			/////////////////////////////////
+			// Static methods
+			/////////////////////////////////
+		public:
+			static void init();
+	
+			static Merge* createMerge( const QString& id );
+
+			static QStringList nameList();
+			static QString idToName( const QString& id );
+			static QString nameToId( const QString& name );
+			static SourceType idToType( const QString& id );
+			static QString indexToId( int index );
+
+
+			/////////////////////////////////
+			// private methods
+			/////////////////////////////////
+		private:
+			typedef Merge* (*CreateFct)();
+	
+			static void registerBackend( const QString& id,
+			                             const QString& name,
+			                             SourceType     type,
+			                             CreateFct      create );
+
+
+			/////////////////////////////////
+			// private data
+			/////////////////////////////////
+			class BackendEntry
+			{
+			public:
+				QString    id;
+				QString    name;
+				SourceType type;
+				CreateFct  create;
+			};
+	
+			static QMap<QString,BackendEntry> mBackendIdMap;
+			static QMap<QString,BackendEntry> mBackendNameMap;
+		
+			static QStringList mNameList;
+		};
+
+	}

 }

+
 #endif // merge_Factory_h