diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-11-05 15:10:13 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-11-09 10:28:19 +0100 |
| commit | 9121d0e4b45fb3a1401554bc48c77f17ce40a7f9 (patch) | |
| tree | 7ef9b314a7c116e75b176034fd71cf2bd3091c24 /src/location/maps/qgeoserviceprovider_p.h | |
| parent | 052a247133fe98a5941a570134b48a7b97853092 (diff) | |
| download | qtlocation-9121d0e4b45fb3a1401554bc48c77f17ce40a7f9.tar.gz | |
Plugins: port to QPluginParsedMetaData and CBOR
QFactoryLoader now no longer converts its internal metadata to JSON, so
we may as well not do it here either. All of this is internal API, so we
can change.
Task-number: QTBUG-97769
Change-Id: I91f9fd5a3a843befff2fb29be7659b7520be16bc
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/location/maps/qgeoserviceprovider_p.h')
| -rw-r--r-- | src/location/maps/qgeoserviceprovider_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index 22dcedd6..de44054a 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -51,8 +51,7 @@ #include "qgeoserviceprovider.h" #include <QHash> -#include <QJsonObject> -#include <QJsonArray> +#include <QCborMap> #include <QLocale> QT_BEGIN_NAMESPACE @@ -87,7 +86,7 @@ public: QGeoServiceProviderFactory *factory; QGeoServiceProviderFactoryV2 *factoryV2 = nullptr; QGeoServiceProviderFactoryV3 *factoryV3 = nullptr; - QJsonObject metaData; + QCborMap metaData; QVariantMap parameterMap; QVariantMap cleanedParameterMap; @@ -121,8 +120,8 @@ public: QLocale locale; bool localeSet; - static QMultiHash<QString, QJsonObject> plugins(bool reload = false); - static void loadPluginMetadata(QMultiHash<QString, QJsonObject> &list); + static QMultiHash<QString, QCborMap> plugins(bool reload = false); + static void loadPluginMetadata(QMultiHash<QString, QCborMap> &list); }; QT_END_NAMESPACE |