diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/corelib/plugin | |
parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 411d1dfdd5..bd5032dcc0 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -290,11 +290,15 @@ void QFactoryLoader::refreshAll() } } +// avoid duplicate QStringLiteral data: +static inline QString metaDataKeyLiteral() { return QStringLiteral("MetaData"); } +static inline QString keysKeyLiteral() { return QStringLiteral("Keys"); } + QMultiMap<int, QString> QFactoryLoader::keyMap() const { QMultiMap<int, QString> result; - const QString metaDataKey = QStringLiteral("MetaData"); - const QString keysKey = QStringLiteral("Keys"); + const QString metaDataKey = metaDataKeyLiteral(); + const QString keysKey = keysKeyLiteral(); const QList<QJsonObject> metaDataList = metaData(); for (int i = 0; i < metaDataList.size(); ++i) { const QJsonObject metaData = metaDataList.at(i).value(metaDataKey).toObject(); @@ -308,8 +312,8 @@ QMultiMap<int, QString> QFactoryLoader::keyMap() const int QFactoryLoader::indexOf(const QString &needle) const { - const QString metaDataKey = QStringLiteral("MetaData"); - const QString keysKey = QStringLiteral("Keys"); + const QString metaDataKey = metaDataKeyLiteral(); + const QString keysKey = keysKeyLiteral(); const QList<QJsonObject> metaDataList = metaData(); for (int i = 0; i < metaDataList.size(); ++i) { const QJsonObject metaData = metaDataList.at(i).value(metaDataKey).toObject(); |