diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-26 10:25:00 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-26 14:35:27 +0200 |
| commit | 16222defb0e653c0fa432dc95fb0c3f2e9c7c905 (patch) | |
| tree | 73ba917a3ad3f1b3d61c65614fdf549e6624adb1 /src/knx/ssl/qknxkeyring_p.h | |
| parent | 6ae295c3bc4f0c16c4f0ffad995e416117abf377 (diff) | |
Qt6: Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Id66666566358282eae6e3b9349fd86d03c960453
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/knx/ssl/qknxkeyring_p.h')
| -rw-r--r-- | src/knx/ssl/qknxkeyring_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/knx/ssl/qknxkeyring_p.h b/src/knx/ssl/qknxkeyring_p.h index 752131b..84c0491 100644 --- a/src/knx/ssl/qknxkeyring_p.h +++ b/src/knx/ssl/qknxkeyring_p.h @@ -42,7 +42,7 @@ // #include <QtCore/qcoreapplication.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qxmlstream.h> #include <QtKnx/qtknxglobal.h> @@ -82,11 +82,11 @@ public: public: quint16 Address; // mandatory - QVector<QString> Senders; // mandatory + QList<QString> Senders; // mandatory bool parseElement(QXmlStreamReader *reader, bool pedantic); }; - QVector<QKnxGroup> Group; // 0..n + QList<QKnxGroup> Group; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -106,7 +106,7 @@ public: bool parseElement(QXmlStreamReader *reader, bool pedantic); }; - QVector<QKnxGroup> Group; // 1..n + QList<QKnxGroup> Group; // 1..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -130,7 +130,7 @@ struct Q_KNX_EXPORT QKnxDevices Q_DECLARE_TR_FUNCTIONS(QKnxDevices) public: - QVector<QKnxDevice> Device; // 0..n + QList<QKnxDevice> Device; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -144,10 +144,10 @@ public: QString CreatedBy; // mandatory QByteArray Signature; // mandatory, Base64 encoded, pattern [A-Za-z0-9\+/]{21}[AQgw]== - QVector<QKnxBackbone> Backbone; // 0..1 - QVector<QKnxInterface> Interface; // 0..n - QVector<QKnxGroupAddresses> GroupAddresses; // 0..1 - QVector<QKnxDevices> Devices; // 0..1 + QList<QKnxBackbone> Backbone; // 0..1 + QList<QKnxInterface> Interface; // 0..n + QList<QKnxGroupAddresses> GroupAddresses; // 0..1 + QList<QKnxDevices> Devices; // 0..1 bool parseElement(QXmlStreamReader *reader, bool pedantic); bool validate(QXmlStreamReader *reader, const QKnxByteArray &pwHash) const; |