Removed C++17 nested namespace definitions. Should build on trusty again.

2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
@@ -27,80 +27,83 @@
 #include <QMap>


-namespace glabels::merge
+namespace glabels
 {
-
-	// Forward references
-	class Merge;
-	
-
-	///
-	/// 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;
-		
-		static QStringList mNameList;
-	};

+			/////////////////////////////////
+			// 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
+			{
+			public:
+				QString    id;
+				QString    name;
+				SourceType type;
+				CreateFct  create;
+			};
+	
+			static QMap<QString,BackendEntry> mBackendIdMap;
+			static QMap<QString,BackendEntry> mBackendNameMap;
+		
+			static QStringList mNameList;
+		};
+
+	}
 }