AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFactoryLoader: remove the porting hack to complete the port to CBOR

Browse Source 
Change-Id: I3eb1bd30e0124f89a052fffd16a6f632c62bcef5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2021-09-21 15:16:52 -07:00
parent bcbc36b8bf
commit c0a8cfe167
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ bool QPluginParsedMetaData::parse(QByteArrayView raw)
return true; return true;
} }
#if QT_CONFIG(library)
QJsonObject QPluginParsedMetaData::toJson() const QJsonObject QPluginParsedMetaData::toJson() const
{ {
// convert from the internal CBOR representation to an external JSON one // convert from the internal CBOR representation to an external JSON one
@ -126,6 +127,7 @@ QJsonObject QPluginParsedMetaData::toJson() const
} }
return o; return o;
} }
#endif
class QFactoryLoaderPrivate : public QObjectPrivate class QFactoryLoaderPrivate : public QObjectPrivate
{ {

23
src/corelib/plugin/qfactoryloader_p.h
View File

@ -58,14 +58,13 @@
#include "QtCore/private/qplugin_p.h" #include "QtCore/private/qplugin_p.h"
#include "QtCore/qcbormap.h" #include "QtCore/qcbormap.h"
#include "QtCore/qcborvalue.h" #include "QtCore/qcborvalue.h"
#include "QtCore/qjsonobject.h"
#include "QtCore/qmap.h" #include "QtCore/qmap.h"
#include "QtCore/qobject.h" #include "QtCore/qobject.h"
#include "QtCore/qplugin.h" #include "QtCore/qplugin.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QJsonDocument; class QJsonObject;
class QLibraryPrivate; class QLibraryPrivate;
class QPluginParsedMetaData class QPluginParsedMetaData
@ -87,7 +86,7 @@ public:
bool parse(QPluginMetaData metaData) bool parse(QPluginMetaData metaData)
{ return parse(QByteArrayView(reinterpret_cast<const char *>(metaData.data), metaData.size)); } { return parse(QByteArrayView(reinterpret_cast<const char *>(metaData.data), metaData.size)); }
Q_CORE_EXPORT QJsonObject toJson() const; QJsonObject toJson() const; // only for QLibrary & QPluginLoader
// if data is not a map, toMap() returns empty, so shall these functions // if data is not a map, toMap() returns empty, so shall these functions
QCborMap toCbor() const { return data.toMap(); } QCborMap toCbor() const { return data.toMap(); }
@ -119,23 +118,7 @@ public:
QMultiMap<int, QString> keyMap() const; QMultiMap<int, QString> keyMap() const;
int indexOf(const QString &needle) const; int indexOf(const QString &needle) const;
// this is a temporary gimmick to convert other Qt modules using MetaDataList = QList<QPluginParsedMetaData>;
struct TemporaryHolder {
QList<QPluginParsedMetaData> metaData;
TemporaryHolder(QList<QPluginParsedMetaData> &&md) : metaData(std::move(md)) {}
operator QList<QPluginParsedMetaData>() const { return std::move(metaData); }
Q_DECL_DEPRECATED_X("Update caller to use QList<QPluginParsedMetaData>()")
operator QList<QJsonObject>() const
{
QList<QJsonObject> result;
result.reserve(metaData.size());
for (const QPluginParsedMetaData &pmd : metaData)
result.append(pmd.toJson());
return result;
}
};
using MetaDataList = TemporaryHolder;
MetaDataList metaData() const; MetaDataList metaData() const;
QObject *instance(int index) const; QObject *instance(int index) const;