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/knxproj/qknxtopology_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/knxproj/qknxtopology_p.h')
| -rw-r--r-- | src/knx/knxproj/qknxtopology_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/knx/knxproj/qknxtopology_p.h b/src/knx/knxproj/qknxtopology_p.h index c4867d8..4bb1509 100644 --- a/src/knx/knxproj/qknxtopology_p.h +++ b/src/knx/knxproj/qknxtopology_p.h @@ -43,7 +43,7 @@ #include <QtCore/qdatetime.h> #include <QtCore/qstring.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/private/qknxdeviceinstance_p.h> #include <QtKnx/private/qknxprojectutils_p.h> @@ -89,9 +89,9 @@ public: QString Description; // optional qint32 Puid { 0 }; - QVector<QKnxDeviceInstance> DeviceInstance; // 0..n - QVector<QKnxBusAccess> BusAccess; // 0..1 - QVector<QKnxAdditionalGroupAddress> AdditionalGroupAddresses; // 0..1 + QList<QKnxDeviceInstance> DeviceInstance; // 0..n + QList<QKnxBusAccess> BusAccess; // 0..1 + QList<QKnxAdditionalGroupAddress> AdditionalGroupAddresses; // 0..1 bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -112,7 +112,7 @@ public: QString Description; // optional qint32 Puid { 0 }; - QVector<QKnxLine> Line; // 0..16 + QList<QKnxLine> Line; // 0..16 bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -122,8 +122,8 @@ struct Q_KNX_EXPORT QKnxTopology Q_DECLARE_TR_FUNCTIONS(QKnxTopology) public: - QVector<QKnxArea> Area; // 0..16 - QVector<QKnxDeviceInstance> UnassignedDevices; // 0..n + QList<QKnxArea> Area; // 0..16 + QList<QKnxDeviceInstance> UnassignedDevices; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; |