diff --git a/glabels/Merge/Factory.cpp b/glabels/Merge/Factory.cpp index ca6fa98..8f8d331 100644 --- a/glabels/Merge/Factory.cpp +++ b/glabels/Merge/Factory.cpp @@ -40,6 +40,8 @@ namespace merge QMap Factory::mBackendIdMap; QMap 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; } } diff --git a/glabels/Merge/Factory.h b/glabels/Merge/Factory.h index be84869..91ee8c0 100644 --- a/glabels/Merge/Factory.h +++ b/glabels/Merge/Factory.h @@ -95,6 +95,7 @@ namespace merge static QMap mBackendIdMap; static QMap mBackendNameMap; + static QStringList mNameList; }; } diff --git a/glabels/Merge/TextSemicolonKeys.cpp b/glabels/Merge/TextSemicolonKeys.cpp index 4abd6fc..270b9ea 100644 --- a/glabels/Merge/TextSemicolonKeys.cpp +++ b/glabels/Merge/TextSemicolonKeys.cpp @@ -23,7 +23,7 @@ namespace merge { - static const QString ID = "Text/Colon"; + static const QString ID = "Text/Semicolon/Keys"; ///