From cf8647d6aa0f65a51dc9366d407b2218f561970d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 18 Jun 2013 14:18:10 +0200
Subject: Remove unused member QFactoryLoaderPrivate::keyList.

Task-number: QTBUG-31476

Change-Id: Ife9b25ede67837152d94cd500a1d7c6dc6cd8ab8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/corelib/plugin/qfactoryloader.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
index 289fda7afc..943fb35ab6 100644
--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
@@ -72,7 +72,6 @@ public:
     QByteArray iid;
     QList<QLibraryPrivate*> libraryList;
     QMap<QString,QLibraryPrivate*> keyMap;
-    QStringList keyList;
     QString suffix;
     Qt::CaseSensitivity cs;
     QStringList loadedPaths;
@@ -172,10 +171,8 @@ void QFactoryLoader::update()
                 metaDataOk = true;
 
                 QJsonArray k = object.value(QLatin1String("Keys")).toArray();
-                for (int i = 0; i < k.size(); ++i) {
-                    QString s = k.at(i).toString();
-                    keys += s;
-                }
+                for (int i = 0; i < k.size(); ++i)
+                    keys += d->cs ? k.at(i).toString() : k.at(i).toString().toLower();
             }
             if (qt_debug_component())
                 qDebug() << "Got keys from plugin meta data" << keys;
@@ -192,9 +189,7 @@ void QFactoryLoader::update()
                 // library was built with a future Qt version,
                 // whereas the new one has a Qt version that fits
                 // better
-                QString key = keys.at(k);
-                if (!d->cs)
-                    key = key.toLower();
+                const QString &key = keys.at(k);
                 QLibraryPrivate *previous = d->keyMap.value(key);
                 int prev_qt_version = 0;
                 if (previous) {
@@ -203,7 +198,6 @@ void QFactoryLoader::update()
                 int qt_version = (int)library->metaData.value(QLatin1String("version")).toDouble();
                 if (!previous || (prev_qt_version > QT_VERSION && qt_version <= QT_VERSION)) {
                     d->keyMap[key] = library;
-                    d->keyList += keys.at(k);
                 }
             }
         }
-- 
cgit v1.2.3