1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused member QFactoryLoaderPrivate::keyList.

Browse Source 
Task-number: QTBUG-31476

Change-Id: Ife9b25ede67837152d94cd500a1d7c6dc6cd8ab8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Friedemann Kleint 2013-06-18 14:18:10 +02:00 committed by The Qt Project
parent a5ecb0bcfd
commit cf8647d6aa
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/plugin/qfactoryloader.cpp
View File

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