diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-09-11 20:00:08 -0500 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-20 22:04:03 -0700 |
commit | a0d66b60b75cfe3d7580c7016959890693b2a132 (patch) | |
tree | 63734889c4f98bb767162051018cb304a7b208f2 /src/gui/image | |
parent | 2bea9b74ba4894c372b0587c0c5433b713b53e3a (diff) |
QFactoryLoader: continue the port from JSON to CBOR
This continues the effort from the previous commit, by not passing
through the JSON conversion at all, and simply using CBOR directly.
The port in qtbase is complete, but in order to support the conversion
in other modules without introducing breakages, there's a temporary
class used for converting to QPluginParsedMetaData from
QJsonObject. It'll be removed once all other modules have finished
converting.
Change-Id: I2de1b4dfacd443148279fffd16a3ed4ddaf34afc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qimagereaderwriterhelpers.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/image/qimagereaderwriterhelpers.cpp b/src/gui/image/qimagereaderwriterhelpers.cpp index dd56d887a7..dd4886b412 100644 --- a/src/gui/image/qimagereaderwriterhelpers.cpp +++ b/src/gui/image/qimagereaderwriterhelpers.cpp @@ -39,7 +39,7 @@ #include "private/qimagereaderwriterhelpers_p.h" -#include <qjsonarray.h> +#include <qcborarray.h> #include <qmutex.h> #include <private/qfactoryloader_p.h> @@ -81,13 +81,12 @@ static void appendImagePluginMimeTypes(QFactoryLoader *loader, QList<QByteArray> *result, QList<QByteArray> *resultKeys = nullptr) { - QList<QJsonObject> metaDataList = loader->metaData(); - + QList<QPluginParsedMetaData> metaDataList = loader->metaData(); const int pluginCount = metaDataList.size(); for (int i = 0; i < pluginCount; ++i) { - const QJsonObject metaData = metaDataList.at(i).value(QLatin1String("MetaData")).toObject(); - const QJsonArray keys = metaData.value(QLatin1String("Keys")).toArray(); - const QJsonArray mimeTypes = metaData.value(QLatin1String("MimeTypes")).toArray(); + const QCborMap metaData = metaDataList.at(i).value(QtPluginMetaDataKeys::MetaData).toMap(); + const QCborArray keys = metaData.value(QLatin1String("Keys")).toArray(); + const QCborArray mimeTypes = metaData.value(QLatin1String("MimeTypes")).toArray(); QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(loader->instance(i)); const int keyCount = keys.size(); for (int k = 0; k < keyCount; ++k) { |