Fixed id of semicolon delimeter backend. Sort names by insertion order.

glabels/Merge/Factory.cpp

@@ -40,6 +40,8 @@ namespace merge
 	QMap<QString,Factory::BackendEntry> Factory::mBackendIdMap;
 	QMap<QString,Factory::BackendEntry> Factory::mBackendNameMap;
 
+	QStringList Factory::mNameList;
+
 
 	///
 	/// Constructor
@@ -126,14 +128,7 @@ namespace merge
 	///
 	QStringList Factory::nameList()
 	{
-		QStringList list;
-	
-		foreach ( BackendEntry backend, mBackendIdMap )
-		{
-			list << backend.name;
-		}
-
-		return list;
+		return mNameList;
 	}
 
 
@@ -215,7 +210,10 @@ namespace merge
 		backend.type   = type;
 		backend.create = create;
 	
-		mBackendIdMap[ id ] = backend;
+		mBackendIdMap[ id ]     = backend;
+		mBackendNameMap[ name ] = backend;
+
+		mNameList << name;
 	}
 
 }

glabels/Merge/Factory.h

@@ -95,6 +95,7 @@ namespace merge
 		static QMap<QString,BackendEntry> mBackendIdMap;
 		static QMap<QString,BackendEntry> mBackendNameMap;
 		
+		static QStringList mNameList;
 	};
 
 }

glabels/Merge/TextSemicolonKeys.cpp

@@ -23,7 +23,7 @@
 
 namespace merge
 {
-	static const QString ID = "Text/Colon";
+	static const QString ID = "Text/Semicolon/Keys";
 
 
 	///