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 | |
| parent | 6ae295c3bc4f0c16c4f0ffad995e416117abf377 (diff) | |
Qt6: Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Id66666566358282eae6e3b9349fd86d03c960453
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
77 files changed, 265 insertions, 265 deletions
diff --git a/examples/knx/device/mainwindow.h b/examples/knx/device/mainwindow.h index 3676cc9..ad9ed46 100644 --- a/examples/knx/device/mainwindow.h +++ b/examples/knx/device/mainwindow.h @@ -100,7 +100,7 @@ private: QKnxNetIpDeviceManagement m_management; QKnxNetIpServerDiscoveryAgent m_discoveryAgent; - QVector<QKnxNetIpSecureConfiguration> m_secureConfigs; + QList<QKnxNetIpSecureConfiguration> m_secureConfigs; }; #endif // MAINWINDOW_H diff --git a/examples/knx/discoverer/main.cpp b/examples/knx/discoverer/main.cpp index 2a42634..4d9c293 100644 --- a/examples/knx/discoverer/main.cpp +++ b/examples/knx/discoverer/main.cpp @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) if (parser.isSet("filterMAC")) { agent.setDiscoveryMode(agent.discoveryMode() | QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV2); - agent.setExtendedSearchParameters(QVector<QKnxNetIpSrp>({ + agent.setExtendedSearchParameters(QList<QKnxNetIpSrp>({ QKnxNetIpSrpProxy::macAddressBuilder() .setMac(QKnxByteArray::fromHex(parser.value("filterMAC").toLatin1())) .create() @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) agent.setDiscoveryMode(agent.discoveryMode() | QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV2); - agent.setExtendedSearchParameters(QVector<QKnxNetIpSrp>({ + agent.setExtendedSearchParameters(QList<QKnxNetIpSrp>({ QKnxNetIpSrpProxy::supportedFamilyBuilder() .setServiceInfo({ QKnxNetIp::ServiceFamily(left), right }) .create() @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) agent.start(QKnxNetIpServerDiscoveryAgent::InterfaceType::Ethernet | QKnxNetIpServerDiscoveryAgent::InterfaceType::Wifi); } else { - agent.start(QVector<QHostAddress> { agent.localAddress() }); + agent.start(QList<QHostAddress> { agent.localAddress() }); } if (agent.error() == QKnxNetIpServerDiscoveryAgent::Error::None diff --git a/examples/knx/feature/mainwindow.h b/examples/knx/feature/mainwindow.h index 42d827b..6c86760 100644 --- a/examples/knx/feature/mainwindow.h +++ b/examples/knx/feature/mainwindow.h @@ -107,7 +107,7 @@ private: QKnxNetIpTunnel m_tunnel; QKnxNetIpServerDiscoveryAgent m_discoveryAgent; - QVector<QKnxNetIpSecureConfiguration> m_secureConfigs; + QList<QKnxNetIpSecureConfiguration> m_secureConfigs; }; #endif // MAINWINDOW_H diff --git a/examples/knx/group/mainwindow.h b/examples/knx/group/mainwindow.h index ceee2df..d4e006a 100644 --- a/examples/knx/group/mainwindow.h +++ b/examples/knx/group/mainwindow.h @@ -100,7 +100,7 @@ private: QKnxNetIpTunnel m_tunnel; QKnxNetIpServerDiscoveryAgent m_discoveryAgent; - QVector<QKnxNetIpSecureConfiguration> m_secureConfigs; + QList<QKnxNetIpSecureConfiguration> m_secureConfigs; }; #endif // MAINWINDOW_H diff --git a/examples/knx/knxeditor/localdevicemanagement.cpp b/examples/knx/knxeditor/localdevicemanagement.cpp index f0bdc10..e166560 100644 --- a/examples/knx/knxeditor/localdevicemanagement.cpp +++ b/examples/knx/knxeditor/localdevicemanagement.cpp @@ -292,7 +292,7 @@ void LocalDeviceManagement::on_manualInput_clicked(bool checked) } } -void LocalDeviceManagement::onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs) +void LocalDeviceManagement::onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs) { m_configs = configs; updateSecureConfigCombo(); diff --git a/examples/knx/knxeditor/localdevicemanagement.h b/examples/knx/knxeditor/localdevicemanagement.h index 195023f..2548f37 100644 --- a/examples/knx/knxeditor/localdevicemanagement.h +++ b/examples/knx/knxeditor/localdevicemanagement.h @@ -78,7 +78,7 @@ public: void setLocalAddress(const QHostAddress &address); void setKnxNetIpServer(const QKnxNetIpServerInfo &server); void setTcpEnable(bool value); - void onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs); + void onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs); public slots: void clearLogging(); @@ -112,7 +112,7 @@ private: QKnxNetIpServerInfo m_server; QKnxNetIpDeviceManagement m_management; QKnxNetIp::HostProtocol m_proto { QKnxNetIp::HostProtocol::UDP_IPv4 }; - QVector<QKnxNetIpSecureConfiguration> m_configs; + QList<QKnxNetIpSecureConfiguration> m_configs; }; #endif diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp index 604fe60..5b89b00 100644 --- a/examples/knx/knxeditor/tunneling.cpp +++ b/examples/knx/knxeditor/tunneling.cpp @@ -344,7 +344,7 @@ void Tunneling::on_manualInput_clicked(bool checked) ui->cemiFrame->setFocus(); } -void Tunneling::onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs) +void Tunneling::onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs) { m_configs = configs; updateSecureConfigCombo(); diff --git a/examples/knx/knxeditor/tunneling.h b/examples/knx/knxeditor/tunneling.h index c95e41b..4d25f97 100644 --- a/examples/knx/knxeditor/tunneling.h +++ b/examples/knx/knxeditor/tunneling.h @@ -94,7 +94,7 @@ public: void setLocalAddress(const QHostAddress &address); void setKnxNetIpServer(const QKnxNetIpServerInfo &server); void setTcpEnable(bool value); - void onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs); + void onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs); public slots: void clearLogging(); @@ -121,7 +121,7 @@ private: QKnxNetIpTunnel m_tunnel; QKnxNetIpServerInfo m_server; QKnxNetIp::HostProtocol m_proto { QKnxNetIp::HostProtocol::UDP_IPv4 }; - QVector<QKnxNetIpSecureConfiguration> m_configs; + QList<QKnxNetIpSecureConfiguration> m_configs; }; diff --git a/examples/knx/knxeditor/tunnelingfeatures.cpp b/examples/knx/knxeditor/tunnelingfeatures.cpp index dedec6d..ef233ee 100644 --- a/examples/knx/knxeditor/tunnelingfeatures.cpp +++ b/examples/knx/knxeditor/tunnelingfeatures.cpp @@ -279,7 +279,7 @@ void TunnelingFeatures::setTcpEnable(bool value) m_protocol = (value ? QKnxNetIp::HostProtocol::TCP_IPv4 : QKnxNetIp::HostProtocol::UDP_IPv4); } -void TunnelingFeatures::onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs) +void TunnelingFeatures::onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs) { m_configs = configs; updateSecureConfigCombo(); diff --git a/examples/knx/knxeditor/tunnelingfeatures.h b/examples/knx/knxeditor/tunnelingfeatures.h index 162497e..9e22f3a 100644 --- a/examples/knx/knxeditor/tunnelingfeatures.h +++ b/examples/knx/knxeditor/tunnelingfeatures.h @@ -53,7 +53,7 @@ public: void setLocalAddress(const QHostAddress &address); void setKnxNetIpServer(const QKnxNetIpServerInfo &server); void setTcpEnable(bool value); - void onKeyringChanged(const QVector<QKnxNetIpSecureConfiguration> &configs); + void onKeyringChanged(const QList<QKnxNetIpSecureConfiguration> &configs); private: void checkFeatureValue(); @@ -66,7 +66,7 @@ private: QKnxNetIpTunnel m_tunnel; QKnxNetIp::HostProtocol m_protocol = { QKnxNetIp::HostProtocol::UDP_IPv4 }; - QVector<QKnxNetIpSecureConfiguration> m_configs; + QList<QKnxNetIpSecureConfiguration> m_configs; }; #endif // TUNNELINGFEATURES_H diff --git a/examples/knx/knxproj/main.cpp b/examples/knx/knxproj/main.cpp index 3781a98..235c33e 100644 --- a/examples/knx/knxproj/main.cpp +++ b/examples/knx/knxproj/main.cpp @@ -29,7 +29,7 @@ #include <QtCore/QCommandLineParser> #include <QtCore/qdebug.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qversionnumber.h> #include <QtCore/qxmlstream.h> #include <QtKnx/qknxgroupaddressinfos.h> diff --git a/src/knx/dpt/qknx32bitset.cpp b/src/knx/dpt/qknx32bitset.cpp index 0681e61..8a7d4d2 100644 --- a/src/knx/dpt/qknx32bitset.cpp +++ b/src/knx/dpt/qknx32bitset.cpp @@ -184,7 +184,7 @@ QKnxCombinedInfoOnOff::QKnxCombinedInfoOnOff() /*! Creates a fixed size datapoint type with the output information \a infos. */ -QKnxCombinedInfoOnOff::QKnxCombinedInfoOnOff(const QVector<OutputInfo> &infos) +QKnxCombinedInfoOnOff::QKnxCombinedInfoOnOff(const QList<OutputInfo> &infos) : QKnx32BitSet(SubType, 0) { setDescription(tr("Bit-combined info On/Off")); @@ -252,7 +252,7 @@ bool QKnxCombinedInfoOnOff::setValidity(Output output, OutputValidity validity) Returns \c true if the value was set successfully; otherwise returns \c false. */ -bool QKnxCombinedInfoOnOff::setValue(const QVector<OutputInfo>& infos) +bool QKnxCombinedInfoOnOff::setValue(const QList<OutputInfo>& infos) { bool success = true; for (const auto &info : qAsConst(infos)) diff --git a/src/knx/dpt/qknx32bitset.h b/src/knx/dpt/qknx32bitset.h index 6a23207..c99d066 100644 --- a/src/knx/dpt/qknx32bitset.h +++ b/src/knx/dpt/qknx32bitset.h @@ -104,7 +104,7 @@ public: }; QKnxCombinedInfoOnOff(); - explicit QKnxCombinedInfoOnOff(const QVector<OutputInfo> &infos); + explicit QKnxCombinedInfoOnOff(const QList<OutputInfo> &infos); QKnxCombinedInfoOnOff(Output output, OutputState state, OutputValidity validity); static const constexpr int SubType = 0x01; @@ -115,7 +115,7 @@ public: OutputValidity validity(Output output) const; bool setValidity(Output output, OutputValidity validity); - bool setValue(const QVector<OutputInfo> &infos); + bool setValue(const QList<OutputInfo> &infos); bool setValue(Output output, OutputState state, OutputValidity validity); }; diff --git a/src/knx/ets/manufacturers.cpp b/src/knx/ets/manufacturers.cpp index 064675d..e2df8f6 100644 --- a/src/knx/ets/manufacturers.cpp +++ b/src/knx/ets/manufacturers.cpp @@ -29,7 +29,7 @@ #include "manufacturers.h" -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE @@ -46,9 +46,9 @@ struct Manufacturer QLatin1String manufacturerId; QString name; - static const QVector<Manufacturer> &manufacturers() + static const QList<Manufacturer> &manufacturers() { - static QVector<Manufacturer> sManufacturers { + static QList<Manufacturer> sManufacturers { { 1, "M-0001", "5369656d656e73" }, { 2, "M-0002", "414242" }, { 4, "M-0004", "416c627265636874204a756e67" }, diff --git a/src/knx/knxproj/qknxbuildings_p.h b/src/knx/knxproj/qknxbuildings_p.h index 8ea1027..f77c168 100644 --- a/src/knx/knxproj/qknxbuildings_p.h +++ b/src/knx/knxproj/qknxbuildings_p.h @@ -42,7 +42,7 @@ // #include <QtCore/qstring.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/private/qknxprojectutils_p.h> QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ public: QString DefaultGroupRange; // optional, non-colonized name, pattern [\i-[:]][\c-[:]]* qint32 Puid { 0 }; - QVector<QKnxGroupAddressRef> GroupAddressRef; // 0..n + QList<QKnxGroupAddressRef> GroupAddressRef; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -106,9 +106,9 @@ public: QString DefaultLine; // optional qint32 Puid { 0 }; - QVector<QKnxBuildingPart> BuildingPart; // 0..n - QVector<QString> DeviceInstanceRef; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* - QVector<QKnxFunction> Function; // 0..n + QList<QKnxBuildingPart> BuildingPart; // 0..n + QList<QString> DeviceInstanceRef; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* + QList<QKnxFunction> Function; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -118,7 +118,7 @@ struct Q_KNX_EXPORT QKnxBuildings Q_DECLARE_TR_FUNCTIONS(QKnxBuildings) public: - QVector<QKnxBuildingPart> BuildingPart; // 0..n + QList<QKnxBuildingPart> BuildingPart; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxdeviceinstance.cpp b/src/knx/knxproj/qknxdeviceinstance.cpp index f772fe6..208c64d 100644 --- a/src/knx/knxproj/qknxdeviceinstance.cpp +++ b/src/knx/knxproj/qknxdeviceinstance.cpp @@ -146,7 +146,7 @@ bool QKnxComObjectInstanceRef::parseElement(QXmlStreamReader *reader, bool pedan ReadOnInitFlag = attrs.value(QStringLiteral("ReadOnInitFlag")).toString(); // TODO: pedantic auto attr = attrs.value(QStringLiteral("DatapointType")).toString(); - DatapointType = attr.split(QLatin1Char(' ')).toVector(); // TODO: pedantic + DatapointType = attr.split(QLatin1Char(' ')).toList(); // TODO: pedantic Description = attrs.value(QStringLiteral("Description")).toString(); IsActive = fetchBool(attrs, QStringLiteral("IsActive")); diff --git a/src/knx/knxproj/qknxdeviceinstance_p.h b/src/knx/knxproj/qknxdeviceinstance_p.h index 6d94c68..a4f21b9 100644 --- a/src/knx/knxproj/qknxdeviceinstance_p.h +++ b/src/knx/knxproj/qknxdeviceinstance_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/qknxprojectutils_p.h> QT_BEGIN_NAMESPACE @@ -71,7 +71,7 @@ public: bool Acknowledge { false }; // optional } Send; - QVector<QKnxConnector> Receive; // 0..n + QList<QKnxConnector> Receive; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -92,12 +92,12 @@ public: QString TransmitFlag; // optional, Enabled, Disabled QString UpdateFlag; // optional, Enabled, Disabled QString ReadOnInitFlag; // optional, Enabled, Disabled - QVector<QString> DatapointType; // optional, non-colonized name, pattern [\i-[:]][\c-[:]]* + QList<QString> DatapointType; // optional, non-colonized name, pattern [\i-[:]][\c-[:]]* QString Description; // optional bool IsActive; // optional QString ChannelId; // optional, non-colonized name, pattern [\i-[:]][\c-[:]]* - QVector<QKnxConnectors> Connectors; // 0..1 + QList<QKnxConnectors> Connectors; // 0..1 bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -184,7 +184,7 @@ public: QString Comment; // optional QString Password; // optional, 20 character max. - QVector<QString> Connectors; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* + QList<QString> Connectors; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -225,14 +225,14 @@ public: bool IsRFRetransmitter { false }; // optional qint32 Puid { 0 }; - QVector<QKnxParameterInstanceRef> ParameterInstanceRefs; // 0..n - QVector<QKnxComObjectInstanceRef> ComObjectInstanceRefs; // 0..n - QVector<QKnxChannelInstance> ChannelInstances; // 0..n - QVector<QKnxAdditionalAddress> AdditionalAddresses; // 1..254 - QVector<QKnxBinaryData> BinaryData; // 1..n + QList<QKnxParameterInstanceRef> ParameterInstanceRefs; // 0..n + QList<QKnxComObjectInstanceRef> ComObjectInstanceRefs; // 0..n + QList<QKnxChannelInstance> ChannelInstances; // 0..n + QList<QKnxAdditionalAddress> AdditionalAddresses; // 1..254 + QList<QKnxBinaryData> BinaryData; // 1..n QKnxIpConfig IpConfig; QKnxSecurity Security; - QVector<QKnxBusInterface> BusInterfaces; // 1..n + QList<QKnxBusInterface> BusInterfaces; // 1..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxgroupaddresses_p.h b/src/knx/knxproj/qknxgroupaddresses_p.h index 5e99364..9f55147 100644 --- a/src/knx/knxproj/qknxgroupaddresses_p.h +++ b/src/knx/knxproj/qknxgroupaddresses_p.h @@ -42,7 +42,7 @@ // #include <QtCore/qstring.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/private/qknxprojectutils_p.h> QT_BEGIN_NAMESPACE @@ -110,8 +110,8 @@ public: qint32 Puid { 0 }; QString Security { QLatin1String("Auto") }; // optional, Auto, On, Off - QVector<QKnxGroupRange> GroupRange; // 0..65535 - QVector<QKnxGroupAddress> GroupAddress; // 0..65535 + QList<QKnxGroupRange> GroupRange; // 0..65535 + QList<QKnxGroupAddress> GroupAddress; // 0..65535 bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -121,7 +121,7 @@ struct Q_KNX_EXPORT QKnxGroupAddresses Q_DECLARE_TR_FUNCTIONS(QKnxGroupAddresses) public: - QVector<QKnxGroupRange> GroupRanges; // 0..65535 + QList<QKnxGroupRange> GroupRanges; // 0..65535 bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxgroupaddressinfos.cpp b/src/knx/knxproj/qknxgroupaddressinfos.cpp index b82c06f..b260d45 100644 --- a/src/knx/knxproj/qknxgroupaddressinfos.cpp +++ b/src/knx/knxproj/qknxgroupaddressinfos.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE struct KnxProjectInfo final { QString name; - QHash<QString, QVector<QKnxGroupAddressInfo>> installations; + QHash<QString, QList<QKnxGroupAddressInfo>> installations; bool operator==(const KnxProjectInfo &other) const { @@ -57,7 +57,7 @@ class QKnxGroupAddressInfosPrivate final : public QSharedData public: bool parseData(const QByteArray &data); bool readProject(const QKnxProject &project); - QVector<QKnxGroupAddressInfo> readRange(const QKnxGroupRange &range, const QString &install); + QList<QKnxGroupAddressInfo> readRange(const QKnxGroupRange &range, const QString &install); QString projectFile; QString errorString; @@ -133,7 +133,7 @@ bool QKnxGroupAddressInfosPrivate::readProject(const QKnxProject &project) .arg(install.Name.isEmpty() ? QStringLiteral("<empty>") : install.Name); return false; } - QVector<QKnxGroupAddressInfo> addressInfos; + QList<QKnxGroupAddressInfo> addressInfos; for (const auto &addresses : qAsConst(install.GroupAddresses)) { for (const auto &range : qAsConst(addresses.GroupRanges)) addressInfos.append(readRange(range, install.Name)); @@ -151,10 +151,10 @@ bool QKnxGroupAddressInfosPrivate::readProject(const QKnxProject &project) /*! \internal */ -QVector<QKnxGroupAddressInfo> +QList<QKnxGroupAddressInfo> QKnxGroupAddressInfosPrivate::readRange(const QKnxGroupRange &range, const QString &install) { - QVector<QKnxGroupAddressInfo> addressInfos; + QList<QKnxGroupAddressInfo> addressInfos; for (const auto &groupRange : qAsConst(range.GroupRange)) addressInfos.append(readRange(groupRange, install)); @@ -355,11 +355,11 @@ QString QKnxGroupAddressInfos::errorString() const } /*! - Returns a vector of all KNX project ids found in the KNX project file. + Returns a list of all KNX project ids found in the KNX project file. */ -QVector<QString> QKnxGroupAddressInfos::projectIds() const +QList<QString> QKnxGroupAddressInfos::projectIds() const { - return d_ptr->projects.keys().toVector(); + return d_ptr->projects.keys().toList(); } /*! @@ -373,11 +373,11 @@ QString QKnxGroupAddressInfos::projectName(const QString &projectId) const } /*! - Returns a vector of all installation ids for the given KNX \a projectId ID. + Returns a list of all installation ids for the given KNX \a projectId ID. */ -QVector<QString> QKnxGroupAddressInfos::installations(const QString &projectId) const +QList<QString> QKnxGroupAddressInfos::installations(const QString &projectId) const { - return d_ptr->projects.value(projectId, { QString(), {} }).installations.keys().toVector(); + return d_ptr->projects.value(projectId, { QString(), {} }).installations.keys().toList(); } /*! @@ -396,10 +396,10 @@ qint32 QKnxGroupAddressInfos::infoCount(const QString &projectId, const QString } /*! - Returns a vector of all available group address infos from a KNX project + Returns a list of all available group address infos from a KNX project identified by \a projectId and \a installation. */ -QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QString &projectId, +QList<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QString &projectId, const QString &installation) const { if (projectId.isEmpty()) @@ -408,17 +408,17 @@ QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QString } /*! - Returns a vector of all available group address infos from a KNX project + Returns a list of all available group address infos from a KNX project identified by \a address, \a projectId, and \a installation. */ -QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QKnxAddress &address, +QList<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QKnxAddress &address, const QString &projectId, const QString &installation) const { const auto infos = addressInfos(projectId, installation); if (infos.isEmpty()) return {}; - QVector<QKnxGroupAddressInfo> results; + QList<QKnxGroupAddressInfo> results; for (const auto &info : qAsConst(infos)) { if (info.address() == address) results.append(info); @@ -427,17 +427,17 @@ QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QKnxAddr } /*! - Returns a vector of all available group address infos from a KNX project + Returns a list of all available group address infos from a KNX project identified by datapoint \a type, \a projectId and \a installation. */ -QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(QKnxDatapointType::Type type, +QList<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(QKnxDatapointType::Type type, const QString &projectId, const QString &installation) const { const auto infos = addressInfos(projectId, installation); if (infos.isEmpty()) return {}; - QVector<QKnxGroupAddressInfo> results; + QList<QKnxGroupAddressInfo> results; for (const auto &info : qAsConst(infos)) { if (info.datapointType() == type) results.append(info); diff --git a/src/knx/knxproj/qknxgroupaddressinfos.h b/src/knx/knxproj/qknxgroupaddressinfos.h index e1c0fb9..db045d6 100644 --- a/src/knx/knxproj/qknxgroupaddressinfos.h +++ b/src/knx/knxproj/qknxgroupaddressinfos.h @@ -64,18 +64,18 @@ public: Status status() const; QString errorString() const; - QVector<QString> projectIds() const; + QList<QString> projectIds() const; QString projectName(const QString &projectId) const; - QVector<QString> installations(const QString &projectId) const; + QList<QString> installations(const QString &projectId) const; qint32 infoCount(const QString &projectId, const QString &installation = {}) const; - QVector<QKnxGroupAddressInfo> addressInfos(const QString &projectId, + QList<QKnxGroupAddressInfo> addressInfos(const QString &projectId, const QString &installation = {}) const; - QVector<QKnxGroupAddressInfo> addressInfos(const QKnxAddress &address, + QList<QKnxGroupAddressInfo> addressInfos(const QKnxAddress &address, const QString &projectId, const QString &installation = {}) const; - QVector<QKnxGroupAddressInfo> addressInfos(QKnxDatapointType::Type type, + QList<QKnxGroupAddressInfo> addressInfos(QKnxDatapointType::Type type, const QString &projectId, const QString &installation = {}) const; void add(const QKnxGroupAddressInfo &info, const QString &projectId); diff --git a/src/knx/knxproj/qknxinstallation_p.h b/src/knx/knxproj/qknxinstallation_p.h index 7ce9faf..93ac6d9 100644 --- a/src/knx/knxproj/qknxinstallation_p.h +++ b/src/knx/knxproj/qknxinstallation_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/qknxbuildings_p.h> #include <QtKnx/private/qknxgroupaddresses_p.h> #include <QtKnx/private/qknxprojectutils_p.h> @@ -69,8 +69,8 @@ public: QString Description; // optional qint32 Puid { 0 }; - QVector<QKnxTrade> Trade; // 0..n - QVector<QString> DeviceInstanceRef; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* + QList<QKnxTrade> Trade; // 0..n + QList<QString> DeviceInstanceRef; // 0..n, non-colonized name, pattern [\i-[:]][\c-[:]]* bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -110,13 +110,13 @@ public: QString IPRoutingBackboneSecurity { QLatin1String("Auto") }; // optional, Auto, On, Off QString SplitType; // optional, None, Master, Split - QVector<QKnxTopology> Topology; // 1 - QVector<QKnxBuildings> Buildings; // 0..n - QVector<QKnxGroupAddresses> GroupAddresses; // 1 + QList<QKnxTopology> Topology; // 1 + QList<QKnxBuildings> Buildings; // 0..n + QList<QKnxGroupAddresses> GroupAddresses; // 1 - QVector<QKnxTrade> Trades; // 0..n - QVector<QKnxBusAccess> BusAccess; // 0..1 - QVector<QKnxSplitInfo> SplitInfos; // 0..n + QList<QKnxTrade> Trades; // 0..n + QList<QKnxBusAccess> BusAccess; // 0..1 + QList<QKnxSplitInfo> SplitInfos; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxprojectinformation_p.h b/src/knx/knxproj/qknxprojectinformation_p.h index 8a14ae2..2f598c3 100644 --- a/src/knx/knxproj/qknxprojectinformation_p.h +++ b/src/knx/knxproj/qknxprojectinformation_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/qknxprojectutils_p.h> QT_BEGIN_NAMESPACE @@ -137,11 +137,11 @@ public: quint32 LastUsedPuid { 0 }; quint32 DeviceCount { 0 }; // (optional) not declared inside the knx_project.xsd - QVector<QKnxHistoryEntry> HistoryEntries; // 0..n - QVector<QKnxToDoItem> ToDoItems; // 0..n - QVector<QKnxProjectTrace> ProjectTraces; // 0..n - QVector<QKnxDeviceCertificate> DeviceCertificates; // 0..n - QVector<QKnxUserFile> UserFiles; // 0..n, (optional) not declared inside the knx_project.xsd + QList<QKnxHistoryEntry> HistoryEntries; // 0..n + QList<QKnxToDoItem> ToDoItems; // 0..n + QList<QKnxProjectTrace> ProjectTraces; // 0..n + QList<QKnxDeviceCertificate> DeviceCertificates; // 0..n + QList<QKnxUserFile> UserFiles; // 0..n, (optional) not declared inside the knx_project.xsd bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxprojectroot_p.h b/src/knx/knxproj/qknxprojectroot_p.h index 46508cb..8ef6a89 100644 --- a/src/knx/knxproj/qknxprojectroot_p.h +++ b/src/knx/knxproj/qknxprojectroot_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/qknxinstallation_p.h> #include <QtKnx/private/qknxprojectinformation_p.h> #include <QtKnx/private/qknxprojectutils_p.h> @@ -68,10 +68,10 @@ struct Q_KNX_EXPORT QKnxProject public: QString Id; // non-colonized name, pattern [\i-[:]][\c-[:]]* - QVector<QKnxProjectInformation> ProjectInformation; // 0..1 - QVector<QKnxInstallation> Installations; // 1..16 - QVector<QKnxUserFile> UserFiles; // 0..n - QVector<QKnxAddinData> AddinData; // 0..n + QList<QKnxProjectInformation> ProjectInformation; // 0..1 + QList<QKnxInstallation> Installations; // 1..16 + QList<QKnxUserFile> UserFiles; // 0..n + QList<QKnxAddinData> AddinData; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; @@ -84,7 +84,7 @@ public: QString CreatedBy; // optional QString ToolVersion; // optional - QVector<QKnxProject> Project; // 0..n + QList<QKnxProject> Project; // 0..n bool parseElement(QXmlStreamReader *reader, bool pedantic); }; diff --git a/src/knx/knxproj/qknxprojectutils_p.h b/src/knx/knxproj/qknxprojectutils_p.h index e18c7d0..091cfca 100644 --- a/src/knx/knxproj/qknxprojectutils_p.h +++ b/src/knx/knxproj/qknxprojectutils_p.h @@ -82,7 +82,7 @@ public: } template<typename T> - static bool parseChildElement(QXmlStreamReader *reader, bool pedantic, QVector<T> *container) + static bool parseChildElement(QXmlStreamReader *reader, bool pedantic, QList<T> *container) { while (!reader->atEnd() && reader->readNextStartElement()) { T element; 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); }; diff --git a/src/knx/knxproj/qzip.cpp b/src/knx/knxproj/qzip.cpp index bab9178..4d8bd62 100644 --- a/src/knx/knxproj/qzip.cpp +++ b/src/knx/knxproj/qzip.cpp @@ -437,7 +437,7 @@ public: QIODevice *device; bool ownDevice; bool dirtyFileTree; - QVector<FileHeader> fileHeaders; + QList<FileHeader> fileHeaders; QByteArray comment; uint start_of_directory; }; @@ -894,10 +894,10 @@ bool QZipReader::exists() const /*! Returns the list of files the archive contains. */ -QVector<QZipReader::FileInfo> QZipReader::fileInfoList() const +QList<QZipReader::FileInfo> QZipReader::fileInfoList() const { d->scanFiles(); - QVector<FileInfo> files; + QList<FileInfo> files; const int numFileHeaders = d->fileHeaders.size(); files.reserve(numFileHeaders); for (int i = 0; i < numFileHeaders; ++i) @@ -1023,7 +1023,7 @@ bool QZipReader::extractAll(const QString &destinationDir) const QDir baseDir(destinationDir); // create directories first - const QVector<FileInfo> allFiles = fileInfoList(); + const QList<FileInfo> allFiles = fileInfoList(); for (const FileInfo &fi : allFiles) { const QString absPath = destinationDir + QDir::separator() + fi.filePath; if (fi.isDir) { diff --git a/src/knx/knxproj/qzipreader_p.h b/src/knx/knxproj/qzipreader_p.h index 9ba1aa8..1cddc0e 100644 --- a/src/knx/knxproj/qzipreader_p.h +++ b/src/knx/knxproj/qzipreader_p.h @@ -93,7 +93,7 @@ public: QDateTime lastModified; }; - QVector<FileInfo> fileInfoList() const; + QList<FileInfo> fileInfoList() const; int count() const; FileInfo entryInfoAt(int index) const; diff --git a/src/knx/netip/qknxbuilderdata_p.h b/src/knx/netip/qknxbuilderdata_p.h index a449535..c399ec3 100644 --- a/src/knx/netip/qknxbuilderdata_p.h +++ b/src/knx/netip/qknxbuilderdata_p.h @@ -87,7 +87,7 @@ public: class QKnxNetIpSrpProxy::RequestDibsPrivate : public QSharedData { public: - QVector<QKnxNetIp::DescriptionType> m_types; + QList<QKnxNetIp::DescriptionType> m_types; bool m_mandatory { true }; }; @@ -98,7 +98,7 @@ public: ~QKnxNetIpSearchRequestExtendedBuilderPrivate() = default; QKnxNetIpHpai m_hpai = { QKnxNetIp::HostProtocol::Unknown}; - QVector<QKnxNetIpSrp> m_srps; + QList<QKnxNetIpSrp> m_srps; }; class QKnxNetIpSearchResponseExtendedBuilderPrivate : public QSharedData diff --git a/src/knx/netip/qknxnetipdescriptionresponse.cpp b/src/knx/netip/qknxnetipdescriptionresponse.cpp index 5e5b785..12642fd 100644 --- a/src/knx/netip/qknxnetipdescriptionresponse.cpp +++ b/src/knx/netip/qknxnetipdescriptionresponse.cpp @@ -146,14 +146,14 @@ QKnxNetIpDib QKnxNetIpDescriptionResponseProxy::supportedFamilies() const } /*! - Returns a vector of optional KNXnet/IP server device information - block (DIB) structures. The vector can be empty if no such structures + Returns a list of optional KNXnet/IP server device information + block (DIB) structures. The list can be empty if no such structures are present or in case of an error while extracting the optional DIBs. \note The function does not perform validity checks on the \l QKnxNetIpFrame used to create the description response proxy object. */ -QVector<QKnxNetIpDib> QKnxNetIpDescriptionResponseProxy::optionalDibs() const +QList<QKnxNetIpDib> QKnxNetIpDescriptionResponseProxy::optionalDibs() const { const auto &data = m_frame.constData(); @@ -163,7 +163,7 @@ QVector<QKnxNetIpDib> QKnxNetIpDescriptionResponseProxy::optionalDibs() const header = QKnxNetIpStructHeader<QKnxNetIp::DescriptionType>::fromBytes(data, index); index += header.totalSize(); // advance of total size of families DIB - QVector<QKnxNetIpDib> dibs; + QList<QKnxNetIpDib> dibs; while (index < data.size()) { auto dib = QKnxNetIpDib::fromBytes(data, index); if (!dib.isValid()) @@ -255,7 +255,7 @@ QKnxNetIpDescriptionResponseProxy::Builder & to \a dibs and returns a reference to the builder. */ QKnxNetIpDescriptionResponseProxy::Builder & - QKnxNetIpDescriptionResponseProxy::Builder::setOptionalDibs(const QVector<QKnxNetIpDib> &dibs) + QKnxNetIpDescriptionResponseProxy::Builder::setOptionalDibs(const QList<QKnxNetIpDib> &dibs) { m_optionalDibs = dibs; return *this; diff --git a/src/knx/netip/qknxnetipdescriptionresponse.h b/src/knx/netip/qknxnetipdescriptionresponse.h index 7e6ceed..ed4cd5b 100644 --- a/src/knx/netip/qknxnetipdescriptionresponse.h +++ b/src/knx/netip/qknxnetipdescriptionresponse.h @@ -30,7 +30,7 @@ #ifndef QKNXNETIPDESCRIPTIONRESPONSE_H #define QKNXNETIPDESCRIPTIONRESPONSE_H -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/qknxnetipframe.h> #include <QtKnx/qtknxglobal.h> @@ -51,21 +51,21 @@ public: QKnxNetIpDib deviceHardware() const; QKnxNetIpDib supportedFamilies() const; - QVector<QKnxNetIpDib> optionalDibs() const; + QList<QKnxNetIpDib> optionalDibs() const; class Q_KNX_EXPORT Builder final { public: Builder &setDeviceHardware(const QKnxNetIpDib &ddib); Builder &setSupportedFamilies(const QKnxNetIpDib &sdib); - Builder &setOptionalDibs(const QVector<QKnxNetIpDib> &dibs); + Builder &setOptionalDibs(const QList<QKnxNetIpDib> &dibs); QKnxNetIpFrame create() const; private: QKnxNetIpDib m_ddib; QKnxNetIpDib m_sdib; - QVector<QKnxNetIpDib> m_optionalDibs; + QList<QKnxNetIpDib> m_optionalDibs; }; static QKnxNetIpDescriptionResponseProxy::Builder builder(); diff --git a/src/knx/netip/qknxnetipknxaddressesdib.cpp b/src/knx/netip/qknxnetipknxaddressesdib.cpp index 2d52c75..c44bc2e 100644 --- a/src/knx/netip/qknxnetipknxaddressesdib.cpp +++ b/src/knx/netip/qknxnetipknxaddressesdib.cpp @@ -107,13 +107,13 @@ QKnxNetIp::DescriptionType QKnxNetIpKnxAddressesDibProxy::descriptionType() cons } /*! - Returns a vector of the individual \l {QKnxAddress} {QKnxAddresses} + Returns a list of the individual \l {QKnxAddress} {QKnxAddresses} carried by this KNXnet/IP DIB structure if the object that was passed - during construction was valid; otherwise returns an empty vector. + during construction was valid; otherwise returns an empty list. */ -QVector<QKnxAddress> QKnxNetIpKnxAddressesDibProxy::individualAddresses() const +QList<QKnxAddress> QKnxNetIpKnxAddressesDibProxy::individualAddresses() const { - QVector<QKnxAddress> addresses; + QList<QKnxAddress> addresses; if (!isValid()) return addresses; @@ -161,7 +161,7 @@ QKnxNetIpKnxAddressesDibProxy::Builder QKnxNetIpKnxAddressesDibProxy::builder() and returns a reference to the builder. */ QKnxNetIpKnxAddressesDibProxy::Builder & - QKnxNetIpKnxAddressesDibProxy::Builder::setIndividualAddresses(const QVector<QKnxAddress> &addresses) + QKnxNetIpKnxAddressesDibProxy::Builder::setIndividualAddresses(const QList<QKnxAddress> &addresses) { m_addresses = addresses; diff --git a/src/knx/netip/qknxnetipknxaddressesdib.h b/src/knx/netip/qknxnetipknxaddressesdib.h index 4592910..177997a 100644 --- a/src/knx/netip/qknxnetipknxaddressesdib.h +++ b/src/knx/netip/qknxnetipknxaddressesdib.h @@ -48,16 +48,16 @@ public: bool isValid() const; QKnxNetIp::DescriptionType descriptionType() const; - QVector<QKnxAddress> individualAddresses() const; + QList<QKnxAddress> individualAddresses() const; class Q_KNX_EXPORT Builder final { public: - Builder &setIndividualAddresses(const QVector<QKnxAddress> &addresses); + Builder &setIndividualAddresses(const QList<QKnxAddress> &addresses); QKnxNetIpDib create() const; private: - QVector<QKnxAddress> m_addresses; + QList<QKnxAddress> m_addresses; }; static QKnxNetIpKnxAddressesDibProxy::Builder builder(); diff --git a/src/knx/netip/qknxnetipsearchrequest.cpp b/src/knx/netip/qknxnetipsearchrequest.cpp index 9adbd9b..da9e06e 100644 --- a/src/knx/netip/qknxnetipsearchrequest.cpp +++ b/src/knx/netip/qknxnetipsearchrequest.cpp @@ -153,21 +153,21 @@ QKnxNetIpHpai QKnxNetIpSearchRequestProxy::discoveryEndpoint() const /*! \since 5.12 - Returns a vector of extended search request parameter (SRP) structures. - The vector can be empty if no such structures are present or in case of + Returns a list of extended search request parameter (SRP) structures. + The list can be empty if no such structures are present or in case of an error while extracting the SRPs. \note The function does not perform validity checks on the \l QKnxNetIpFrame used to create the search request proxy object. */ -QVector<QKnxNetIpSrp> QKnxNetIpSearchRequestProxy::extendedSearchParameters() const +QList<QKnxNetIpSrp> QKnxNetIpSearchRequestProxy::extendedSearchParameters() const { const auto &data = m_frame.constData(); auto hpai = QKnxNetIpStructHeader<QKnxNetIp::HostProtocol>::fromBytes(data, 0); quint16 index = hpai.totalSize(); // total size of discovery endpoint HPAI - QVector<QKnxNetIpSrp> srps; + QList<QKnxNetIpSrp> srps; while (index < data.size()) { auto srp = QKnxNetIpSrp::fromBytes(data, index); if (!srp.isValid()) @@ -334,11 +334,11 @@ QKnxNetIpSearchRequestProxy::ExtendedBuilder::setDiscoveryEndpoint(const QKnxNet } /*! - Adds the QVector of extended parameters \a srps to the KNXnet/IP extended + Adds the list of extended parameters \a srps to the KNXnet/IP extended search request. */ QKnxNetIpSearchRequestProxy::ExtendedBuilder & -QKnxNetIpSearchRequestProxy::ExtendedBuilder::setExtendedParameters(const QVector<QKnxNetIpSrp> &srps) +QKnxNetIpSearchRequestProxy::ExtendedBuilder::setExtendedParameters(const QList<QKnxNetIpSrp> &srps) { d_ptr->m_srps = srps; return *this; diff --git a/src/knx/netip/qknxnetipsearchrequest.h b/src/knx/netip/qknxnetipsearchrequest.h index e831564..1099735 100644 --- a/src/knx/netip/qknxnetipsearchrequest.h +++ b/src/knx/netip/qknxnetipsearchrequest.h @@ -35,7 +35,7 @@ #include <QtKnx/qtknxglobal.h> #include <QtCore/qshareddata.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ public: bool isExtended() const; QKnxNetIpHpai discoveryEndpoint() const; - QVector<QKnxNetIpSrp> extendedSearchParameters() const; + QList<QKnxNetIpSrp> extendedSearchParameters() const; class Q_KNX_EXPORT Builder final { @@ -73,7 +73,7 @@ public: ~ExtendedBuilder(); ExtendedBuilder &setDiscoveryEndpoint(const QKnxNetIpHpai &hpai); - ExtendedBuilder &setExtendedParameters(const QVector<QKnxNetIpSrp> &srps); + ExtendedBuilder &setExtendedParameters(const QList<QKnxNetIpSrp> &srps); QKnxNetIpFrame create() const; diff --git a/src/knx/netip/qknxnetipsearchresponse.cpp b/src/knx/netip/qknxnetipsearchresponse.cpp index ac42b4b..42adcb2 100644 --- a/src/knx/netip/qknxnetipsearchresponse.cpp +++ b/src/knx/netip/qknxnetipsearchresponse.cpp @@ -155,17 +155,17 @@ QKnxNetIpDib QKnxNetIpSearchResponseProxy::supportedFamilies() const /*! \since 5.12 - Returns the vector of optional KNXnet/IP server device information block + Returns the list of optional KNXnet/IP server device information block (DIB) structures of the extended search response frame. The function therefor will remove the mandatory device hardware and service family DIB. - The vector can be empty if no optional structures are present or in + The list can be empty if no optional structures are present or in case of an error while extracting the optional DIBs. \note The function does not perform validity checks on the \l QKnxNetIpFrame used to create the description response proxy object. */ -QVector<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::optionalDibs() const +QList<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::optionalDibs() const { auto variable = variableDibs(); variable.erase(std::remove_if(variable.begin(), variable.end(), [](const QKnxNetIpDib &dib) { @@ -178,15 +178,15 @@ QVector<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::optionalDibs() const /*! \since 5.12 - Returns the vector of KNXnet/IP server device information blocks (DIBs) - structure of the extended search response frame. The vector can be empty + Returns the list of KNXnet/IP server device information blocks (DIBs) + structure of the extended search response frame. The list can be empty if no such structures are present or in case of an error while extracting the optional DIBs. \note The function does not perform validity checks on the \l QKnxNetIpFrame used to create the description response proxy object. */ -QVector<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::variableDibs() const +QList<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::variableDibs() const { if (!isExtended()) return {}; @@ -194,7 +194,7 @@ QVector<QKnxNetIpDib> QKnxNetIpSearchResponseProxy::variableDibs() const const auto &data = m_frame.constData(); quint16 index = 8; - QVector<QKnxNetIpDib> dibs; + QList<QKnxNetIpDib> dibs; while (index < data.size()) { auto dib = QKnxNetIpDib::fromBytes(data, index); if (!dib.isValid()) diff --git a/src/knx/netip/qknxnetipsearchresponse.h b/src/knx/netip/qknxnetipsearchresponse.h index b424488..ce7b8f7 100644 --- a/src/knx/netip/qknxnetipsearchresponse.h +++ b/src/knx/netip/qknxnetipsearchresponse.h @@ -55,8 +55,8 @@ public: QKnxNetIpDib deviceHardware() const; QKnxNetIpDib supportedFamilies() const; - QVector<QKnxNetIpDib> optionalDibs() const; - QVector<QKnxNetIpDib> variableDibs() const; + QList<QKnxNetIpDib> optionalDibs() const; + QList<QKnxNetIpDib> variableDibs() const; class Q_KNX_EXPORT Builder final { diff --git a/src/knx/netip/qknxnetipsecureconfiguration.cpp b/src/knx/netip/qknxnetipsecureconfiguration.cpp index 8b2d03b..4d576fb 100644 --- a/src/knx/netip/qknxnetipsecureconfiguration.cpp +++ b/src/knx/netip/qknxnetipsecureconfiguration.cpp @@ -69,7 +69,7 @@ namespace QKnxPrivate return s; } - static QVector<QKnxNetIpSecureConfiguration> fromKeyring(QKnxNetIpSecureConfiguration::Type type, + static QList<QKnxNetIpSecureConfiguration> fromKeyring(QKnxNetIpSecureConfiguration::Type type, const QKnxAddress &ia, const QString &filePath, const QByteArray &password, bool validate) { QFile file; @@ -93,7 +93,7 @@ namespace QKnxPrivate const auto createdHash = QKnxCryptographicEngine::hashSha256(keyring.Created.toUtf8()); auto iaString = ia.toString(); - QVector<QKnxNetIpSecureConfiguration> results; + QList<QKnxNetIpSecureConfiguration> results; if (type == QKnxNetIpSecureConfiguration::Type::Tunneling) { if (keyring.Interface.isEmpty()) @@ -177,16 +177,16 @@ QKnxNetIpSecureConfiguration::QKnxNetIpSecureConfiguration() QKnxNetIpSecureConfiguration::~QKnxNetIpSecureConfiguration() = default; /*! - Constructs a vector of secure configurations for the given type + Constructs a list of secure configurations for the given type \a type from an ETS exported \a keyring (*.knxkeys) file that was encrypted with the given password \a password. Set the \a validate argument to \c true to verify that all data in the keyring file is trustworthy, \c false to omit the check. \note If an error occurred, no or invalid information for \a type - was found in the keyring file, the returned vector can be empty. + was found in the keyring file, the returned list can be empty. */ -QVector<QKnxNetIpSecureConfiguration> QKnxNetIpSecureConfiguration::fromKeyring(Type type, +QList<QKnxNetIpSecureConfiguration> QKnxNetIpSecureConfiguration::fromKeyring(Type type, const QString &keyring, const QByteArray &password, bool validate) { return QKnxPrivate::fromKeyring(type, {}, keyring, password, validate); diff --git a/src/knx/netip/qknxnetipsecureconfiguration.h b/src/knx/netip/qknxnetipsecureconfiguration.h index 72b136a..3f1e06c 100644 --- a/src/knx/netip/qknxnetipsecureconfiguration.h +++ b/src/knx/netip/qknxnetipsecureconfiguration.h @@ -51,7 +51,7 @@ public: QKnxNetIpSecureConfiguration(); ~QKnxNetIpSecureConfiguration(); - static QVector<QKnxNetIpSecureConfiguration> fromKeyring(QKnxNetIpSecureConfiguration::Type type, + static QList<QKnxNetIpSecureConfiguration> fromKeyring(QKnxNetIpSecureConfiguration::Type type, const QString &keyring, const QByteArray &password, bool validate); static QKnxNetIpSecureConfiguration fromKeyring(QKnxNetIpSecureConfiguration::Type type, diff --git a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.cpp b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.cpp index 770e6f3..ca9914e 100644 --- a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.cpp +++ b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.cpp @@ -122,7 +122,7 @@ public: QKnxNetIpSecuredServiceFamiliesDibBuilderPrivate() = default; ~QKnxNetIpSecuredServiceFamiliesDibBuilderPrivate() = default; - QVector<QKnxSecuredServiceInfo> m_infos; + QList<QKnxSecuredServiceInfo> m_infos; }; /*! @@ -156,13 +156,13 @@ QKnxNetIp::DescriptionType QKnxNetIpSecuredServiceFamiliesDibProxy::descriptionT } /*! - Returns a vector of the QKnxSecuredServiceInfo carried by this KNXnet/IP + Returns a list of the QKnxSecuredServiceInfo carried by this KNXnet/IP DIB structure if the object that was passed during construction was valid; - otherwise returns an empty vector. + otherwise returns an empty list. */ -QVector<QKnxSecuredServiceInfo> QKnxNetIpSecuredServiceFamiliesDibProxy::serviceInfos() const +QList<QKnxSecuredServiceInfo> QKnxNetIpSecuredServiceFamiliesDibProxy::serviceInfos() const { - QVector<QKnxSecuredServiceInfo> infos; + QList<QKnxSecuredServiceInfo> infos; if (!isValid()) return infos; @@ -223,7 +223,7 @@ QKnxNetIpSecuredServiceFamiliesDibProxy::Builder::~Builder() = default; structure to \a infos and returns a reference to the builder. */ QKnxNetIpSecuredServiceFamiliesDibProxy::Builder &QKnxNetIpSecuredServiceFamiliesDibProxy:: - Builder::setServiceInfos(const QVector<QKnxSecuredServiceInfo> &infos) + Builder::setServiceInfos(const QList<QKnxSecuredServiceInfo> &infos) { d_ptr->m_infos = infos; diff --git a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h index b01dd55..66625c1 100644 --- a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h +++ b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h @@ -54,7 +54,7 @@ public: bool isValid() const; QKnxNetIp::DescriptionType descriptionType() const; - QVector<QKnxSecuredServiceInfo> serviceInfos() const; + QList<QKnxSecuredServiceInfo> serviceInfos() const; class Q_KNX_EXPORT Builder final { @@ -62,7 +62,7 @@ public: Builder(); ~Builder(); - Builder &setServiceInfos(const QVector<QKnxSecuredServiceInfo> &infos); + Builder &setServiceInfos(const QList<QKnxSecuredServiceInfo> &infos); QKnxNetIpDib create() const; diff --git a/src/knx/netip/qknxnetipserverdescriptionagent.h b/src/knx/netip/qknxnetipserverdescriptionagent.h index 917945d..4379638 100644 --- a/src/knx/netip/qknxnetipserverdescriptionagent.h +++ b/src/knx/netip/qknxnetipserverdescriptionagent.h @@ -31,7 +31,7 @@ #define QKNXNETIPSERVERDESCRIPTIONAGENT_H #include <QtCore/qobject.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/qtknxglobal.h> #include <QtKnx/qknxnetipserverinfo.h> #include <QtNetwork/qhostaddress.h> diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent.cpp b/src/knx/netip/qknxnetipserverdiscoveryagent.cpp index d00fd74..d640cfa 100644 --- a/src/knx/netip/qknxnetipserverdiscoveryagent.cpp +++ b/src/knx/netip/qknxnetipserverdiscoveryagent.cpp @@ -248,7 +248,7 @@ QString QKnxNetIpServerDiscoveryAgent::errorString() const /*! Returns a list of servers that were discovered. */ -QVector<QKnxNetIpServerInfo> QKnxNetIpServerDiscoveryAgent::discoveredServers() const +QList<QKnxNetIpServerInfo> QKnxNetIpServerDiscoveryAgent::discoveredServers() const { return d_func()->servers; } @@ -449,7 +449,7 @@ void QKnxNetIpServerDiscoveryAgent::setDiscoveryMode(QKnxNetIpServerDiscoveryAge Returns the search request parameter (SRP) objects used in an \l {QKnxNetIpServerDiscoveryAgent::CoreV2} {extended search request}. */ -QVector<QKnxNetIpSrp> QKnxNetIpServerDiscoveryAgent::extendedSearchParameters() const +QList<QKnxNetIpSrp> QKnxNetIpServerDiscoveryAgent::extendedSearchParameters() const { return d_func()->srps; } @@ -466,7 +466,7 @@ QVector<QKnxNetIpSrp> QKnxNetIpServerDiscoveryAgent::extendedSearchParameters() \sa QKnxNetIpSrpProxy::MacAddress, QKnxNetIpSrpProxy::ProgrammingMode, QKnxNetIpSrpProxy::SupportedFamily, QKnxNetIpSrpProxy::RequestDibs */ -void QKnxNetIpServerDiscoveryAgent::setExtendedSearchParameters(const QVector<QKnxNetIpSrp> &srps) +void QKnxNetIpServerDiscoveryAgent::setExtendedSearchParameters(const QList<QKnxNetIpSrp> &srps) { d_func()->srps = srps; } @@ -496,7 +496,7 @@ void QKnxNetIpServerDiscoveryAgent::start(int timeout) \note Does not emit the errorOccurred signal. */ -void QKnxNetIpServerDiscoveryAgent::start(const QVector<QHostAddress> &addresses) +void QKnxNetIpServerDiscoveryAgent::start(const QList<QHostAddress> &addresses) { d_func()->start(addresses); } diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent.h b/src/knx/netip/qknxnetipserverdiscoveryagent.h index b7bdf83..f93f4f5 100644 --- a/src/knx/netip/qknxnetipserverdiscoveryagent.h +++ b/src/knx/netip/qknxnetipserverdiscoveryagent.h @@ -31,7 +31,7 @@ #define QKNXNETIPDISCOVERYAGENT_H #include <QtCore/qobject.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/qtknxglobal.h> #include <QtKnx/qknxnetipserverinfo.h> #include <QtNetwork/qhostaddress.h> @@ -101,7 +101,7 @@ public: QKnxNetIpServerDiscoveryAgent::Error error() const; QString errorString() const; - QVector<QKnxNetIpServerInfo> discoveredServers() const; + QList<QKnxNetIpServerInfo> discoveredServers() const; quint16 localPort() const; void setLocalPort(quint16 port); @@ -127,15 +127,15 @@ public: QKnxNetIpServerDiscoveryAgent::DiscoveryModes discoveryMode() const; void setDiscoveryMode(QKnxNetIpServerDiscoveryAgent::DiscoveryModes mode); - QVector<QKnxNetIpSrp> extendedSearchParameters() const; - void setExtendedSearchParameters(const QVector<QKnxNetIpSrp> &srps); + QList<QKnxNetIpSrp> extendedSearchParameters() const; + void setExtendedSearchParameters(const QList<QKnxNetIpSrp> &srps); public Q_SLOTS: void start(); void stop(); void start(int timeout); - void start(const QVector<QHostAddress> &localAddresses); + void start(const QList<QHostAddress> &localAddresses); void start(QKnxNetIpServerDiscoveryAgent::InterfaceTypes types); Q_SIGNALS: diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp b/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp index d22a029..dc13ddf 100644 --- a/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp +++ b/src/knx/netip/qknxnetipserverdiscoveryagent_p.cpp @@ -55,9 +55,9 @@ namespace QKnxPrivate } } - static QVector<Adapter> adaptersForAddresses(const QVector<QHostAddress> addresses) + static QList<Adapter> adaptersForAddresses(const QList<QHostAddress> addresses) { - QVector<Adapter> adapters; + QList<Adapter> adapters; auto all = QNetworkInterface::allInterfaces(); for (const auto &iface : all) { const auto flags = iface.flags(); @@ -299,7 +299,7 @@ void QKnxNetIpServerDiscoveryAgentPrivate::setupSocket() Q_Q(QKnxNetIpServerDiscoveryAgent); socket = new QUdpSocket(q); - adapter = QKnxPrivate::adaptersForAddresses(QVector<QHostAddress> { address }).value(0); + adapter = QKnxPrivate::adaptersForAddresses(QList<QHostAddress> { address }).value(0); QObject::connect(socket, &QUdpSocket::stateChanged, q, [&](QUdpSocket::SocketState s) { Q_Q(QKnxNetIpServerDiscoveryAgent); switch (s) { @@ -561,7 +561,7 @@ void QKnxNetIpServerDiscoveryAgentPrivate::start() } } -void QKnxNetIpServerDiscoveryAgentPrivate::start(const QVector<Adapter> &adapters) +void QKnxNetIpServerDiscoveryAgentPrivate::start(const QList<Adapter> &adapters) { if (state != QKnxNetIpServerDiscoveryAgent::State::NotRunning) return; @@ -618,14 +618,14 @@ void QKnxNetIpServerDiscoveryAgentPrivate::start(const QVector<Adapter> &adapter setAndEmitStateChanged(QKnxNetIpServerDiscoveryAgent::State::Running); } -void QKnxNetIpServerDiscoveryAgentPrivate::start(const QVector<QHostAddress> addresses) +void QKnxNetIpServerDiscoveryAgentPrivate::start(const QList<QHostAddress> addresses) { start(QKnxPrivate::adaptersForAddresses(addresses)); } void QKnxNetIpServerDiscoveryAgentPrivate::start(QKnxNetIpServerDiscoveryAgent::InterfaceTypes types) { - QVector<Adapter> adapters; + QList<Adapter> adapters; auto all = QNetworkInterface::allInterfaces(); for (const auto &iface : all) { const auto flags = iface.flags(); diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent_p.h b/src/knx/netip/qknxnetipserverdiscoveryagent_p.h index 46be5fe..df718c6 100644 --- a/src/knx/netip/qknxnetipserverdiscoveryagent_p.h +++ b/src/knx/netip/qknxnetipserverdiscoveryagent_p.h @@ -69,7 +69,7 @@ struct DiscovererConfig ~DiscovererConfig() = default; DiscovererConfig(int ttl, int timeout, bool nat, bool multicast, bool coreV1, bool coreV2, - const QVector<QKnxNetIpSrp> &srps) + const QList<QKnxNetIpSrp> &srps) : Ttl(ttl) , Timeout(timeout) , Nat(nat) @@ -88,7 +88,7 @@ struct DiscovererConfig bool DiscoveryCoreV1 { true }; bool DiscoveryCoreV2 { true }; - QVector<QKnxNetIpSrp> ExtendedSearchParameters; + QList<QKnxNetIpSrp> ExtendedSearchParameters; }; class Discoverer : public QObject @@ -129,7 +129,7 @@ private: QUdpSocket *m_socket { nullptr }; DiscovererConfig m_config; - QVector<QByteArray> m_devices; + QList<QByteArray> m_devices; QHostAddress m_multicast { QStringLiteral("224.0.23.12") }; QKnxNetIpServerDiscoveryAgent::State m_state { QKnxNetIpServerDiscoveryAgent::State::NotRunning }; @@ -153,8 +153,8 @@ public: void setAndEmitErrorOccurred(QKnxNetIpServerDiscoveryAgent::Error newError, const QString &message); void start(); - void start(const QVector<Adapter> &adapters); - void start(const QVector<QHostAddress> addresses); + void start(const QList<Adapter> &adapters); + void start(const QList<QHostAddress> addresses); void start(QKnxNetIpServerDiscoveryAgent::InterfaceTypes types); void stop(); @@ -175,7 +175,7 @@ private: int timeout { QKnxNetIp::Timeout::SearchTimeout }; QString errorString; - QVector<QKnxNetIpServerInfo> servers; + QList<QKnxNetIpServerInfo> servers; QKnxNetIpServerDiscoveryAgent::Error error { QKnxNetIpServerDiscoveryAgent::Error::None }; QKnxNetIpServerDiscoveryAgent::State state { QKnxNetIpServerDiscoveryAgent::State::NotRunning }; @@ -184,10 +184,10 @@ private: QKnxNetIpServerDiscoveryAgent::DiscoveryModes mode { QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV1 }; - QVector<QKnxNetIpSrp> srps; + QList<QKnxNetIpSrp> srps; Adapter adapter; - QVector<Discoverer*> discoveries; + QList<Discoverer*> discoveries; }; QT_END_NAMESPACE diff --git a/src/knx/netip/qknxnetipserverinfo.cpp b/src/knx/netip/qknxnetipserverinfo.cpp index d8c6b62..5e70cf9 100644 --- a/src/knx/netip/qknxnetipserverinfo.cpp +++ b/src/knx/netip/qknxnetipserverinfo.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE A KNXnet/IP server can support the following service types: core, device management, tunneling, routing, remote logging and configuration, and object server. The supported services are returned by \l supportedServices() - as a vector of \l QKnxServiceInfo objects or by \l services() as a + as a list of \l QKnxServiceInfo objects or by \l services() as a \l QKnxNetIpDib object which can be accessed via \l QKnxNetIpServiceFamiliesDibProxy. Furthermore, as specified by the KNX application note AN185, the @@ -144,7 +144,7 @@ QHostAddress QKnxNetIpServerInfo::controlEndpointAddress() const /*! Returns the services supported by a KNXnet/IP server. */ -QVector<QKnxServiceInfo> QKnxNetIpServerInfo::supportedServices() const +QList<QKnxServiceInfo> QKnxNetIpServerInfo::supportedServices() const { return QKnxNetIpServiceFamiliesDibProxy(d_ptr->services).serviceInfos(); } @@ -154,12 +154,12 @@ QVector<QKnxServiceInfo> QKnxNetIpServerInfo::supportedServices() const Returns the available tunneling slots of the discovered KNXnet/IP server if it supports providing this kind of information; otherwise returns an - empty vector. + empty list. */ -QVector<QKnxNetIpTunnelingSlotInfo> QKnxNetIpServerInfo::tunnelingSlotInfos() const +QList<QKnxNetIpTunnelingSlotInfo> QKnxNetIpServerInfo::tunnelingSlotInfos() const { QKnxNetIpTunnelingInfoDibProxy proxy(d_ptr->tunnelingInfo); - return QVector<QKnxNetIpTunnelingSlotInfo> { proxy.tunnelingSlotInfo() } + return QList<QKnxNetIpTunnelingSlotInfo> { proxy.tunnelingSlotInfo() } + proxy.optionalSlotInfos(); } diff --git a/src/knx/netip/qknxnetipserverinfo.h b/src/knx/netip/qknxnetipserverinfo.h index 4db9656..5b7bee1 100644 --- a/src/knx/netip/qknxnetipserverinfo.h +++ b/src/knx/netip/qknxnetipserverinfo.h @@ -61,8 +61,8 @@ public: quint16 controlEndpointPort() const; QHostAddress controlEndpointAddress() const; - QVector<QKnxServiceInfo> supportedServices() const; - QVector<QKnxNetIpTunnelingSlotInfo> tunnelingSlotInfos() const; + QList<QKnxServiceInfo> supportedServices() const; + QList<QKnxNetIpTunnelingSlotInfo> tunnelingSlotInfos() const; QKnx::MediumStatus mediumStatus() const; quint16 maximumLocalApduLength() const; diff --git a/src/knx/netip/qknxnetipservicefamiliesdib.cpp b/src/knx/netip/qknxnetipservicefamiliesdib.cpp index 5c95f5a..5cba25e 100644 --- a/src/knx/netip/qknxnetipservicefamiliesdib.cpp +++ b/src/knx/netip/qknxnetipservicefamiliesdib.cpp @@ -171,13 +171,13 @@ QKnxNetIp::DescriptionType QKnxNetIpServiceFamiliesDibProxy::descriptionType() c } /*! - Returns a vector of the QKnxServiceInfo carried by this KNXnet/IP DIB + Returns a list of the QKnxServiceInfo carried by this KNXnet/IP DIB structure if the object that was passed during construction was valid; - otherwise returns an empty vector. + otherwise returns an empty list. */ -QVector<QKnxServiceInfo> QKnxNetIpServiceFamiliesDibProxy::serviceInfos() const +QList<QKnxServiceInfo> QKnxNetIpServiceFamiliesDibProxy::serviceInfos() const { - QVector<QKnxServiceInfo> infos; + QList<QKnxServiceInfo> infos; if (!isValid()) return infos; @@ -226,7 +226,7 @@ QKnxNetIpServiceFamiliesDibProxy::Builder QKnxNetIpServiceFamiliesDibProxy::buil structure to \a infos and returns a reference to the builder. */ QKnxNetIpServiceFamiliesDibProxy::Builder & - QKnxNetIpServiceFamiliesDibProxy::Builder::setServiceInfos(const QVector<QKnxServiceInfo> &infos) + QKnxNetIpServiceFamiliesDibProxy::Builder::setServiceInfos(const QList<QKnxServiceInfo> &infos) { m_infos = infos; diff --git a/src/knx/netip/qknxnetipservicefamiliesdib.h b/src/knx/netip/qknxnetipservicefamiliesdib.h index 1108208..8aa3162 100644 --- a/src/knx/netip/qknxnetipservicefamiliesdib.h +++ b/src/knx/netip/qknxnetipservicefamiliesdib.h @@ -56,17 +56,17 @@ public: bool isValid() const; QKnxNetIp::DescriptionType descriptionType() const; - QVector<QKnxServiceInfo> serviceInfos() const; + QList<QKnxServiceInfo> serviceInfos() const; class Q_KNX_EXPORT Builder final { public: - Builder &setServiceInfos(const QVector<QKnxServiceInfo> &infos); + Builder &setServiceInfos(const QList<QKnxServiceInfo> &infos); QKnxNetIpDib create() const; private: - QVector<QKnxServiceInfo> m_infos; + QList<QKnxServiceInfo> m_infos; }; static QKnxNetIpServiceFamiliesDibProxy::Builder builder(); diff --git a/src/knx/netip/qknxnetipsrp.cpp b/src/knx/netip/qknxnetipsrp.cpp index 7b5cc5d..91049a7 100644 --- a/src/knx/netip/qknxnetipsrp.cpp +++ b/src/knx/netip/qknxnetipsrp.cpp @@ -187,13 +187,13 @@ QKnxServiceInfo QKnxNetIpSrpProxy::serviceInfo() const } /*! - Returns a vector of QKnx::NetIp::DescriptionType enumeration values used as + Returns a list of QKnx::NetIp::DescriptionType enumeration values used as search criteria if the object that was passed during construction was valid; - otherwise returns an empty vector. + otherwise returns an empty list. */ -QVector<QKnxNetIp::DescriptionType> QKnxNetIpSrpProxy::descriptionTypes() const +QList<QKnxNetIp::DescriptionType> QKnxNetIpSrpProxy::descriptionTypes() const { - QVector<QKnxNetIp::DescriptionType> types; + QList<QKnxNetIp::DescriptionType> types; if (isValid() && m_srp.code() == QKnxNetIp::SearchParameterType::RequestDIBs) { const auto &data = m_srp.constData(); for (quint16 i = 0; i < m_srp.dataSize(); i++) @@ -564,7 +564,7 @@ QKnxNetIpSrpProxy::RequestDibs & \a types and returns a reference to the SRP builder. */ QKnxNetIpSrpProxy::RequestDibs & - QKnxNetIpSrpProxy::RequestDibs::setDescriptionTypes(const QVector<QKnxNetIp::DescriptionType> &types) + QKnxNetIpSrpProxy::RequestDibs::setDescriptionTypes(const QList<QKnxNetIp::DescriptionType> &types) { d_ptr->m_types = types; return *this; diff --git a/src/knx/netip/qknxnetipsrp.h b/src/knx/netip/qknxnetipsrp.h index 79ea979..c0dafa6 100644 --- a/src/knx/netip/qknxnetipsrp.h +++ b/src/knx/netip/qknxnetipsrp.h @@ -30,7 +30,7 @@ #ifndef QKNXNETIPSRP_H #define QKNXNETIPSRP_H -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qshareddata.h> #include <QtKnx/qtknxglobal.h> #include <QtKnx/qknxnetipstruct.h> @@ -61,7 +61,7 @@ public: bool programmingModeOnly() const; QKnxByteArray macAddress() const; QKnxServiceInfo serviceInfo() const; - QVector<QKnxNetIp::DescriptionType> descriptionTypes() const; + QList<QKnxNetIp::DescriptionType> descriptionTypes() const; class Q_KNX_EXPORT ProgrammingMode final { @@ -128,7 +128,7 @@ public: RequestDibs(const RequestDibs &other); RequestDibs &operator=(const RequestDibs &other); - RequestDibs &setDescriptionTypes(const QVector<QKnxNetIp::DescriptionType> &types); + RequestDibs &setDescriptionTypes(const QList<QKnxNetIp::DescriptionType> &types); RequestDibs &setMandatory(bool value); QKnxNetIpSrp create() const; diff --git a/src/knx/netip/qknxnetiptunnelinginfodib.cpp b/src/knx/netip/qknxnetiptunnelinginfodib.cpp index 6fee054..04a724f 100644 --- a/src/knx/netip/qknxnetiptunnelinginfodib.cpp +++ b/src/knx/netip/qknxnetiptunnelinginfodib.cpp @@ -372,13 +372,13 @@ QKnxNetIpTunnelingSlotInfo QKnxNetIpTunnelingInfoDibProxy::tunnelingSlotInfo() c } /*! - Returns a vector of \l QKnxNetIpTunnelingSlotInfo objects carried by this + Returns a list of \l QKnxNetIpTunnelingSlotInfo objects carried by this KNXnet/IP DIB structure if the object that was passed during construction - was valid; otherwise returns an empty vector. + was valid; otherwise returns an empty list. */ -QVector<QKnxNetIpTunnelingSlotInfo> QKnxNetIpTunnelingInfoDibProxy::optionalSlotInfos() const +QList<QKnxNetIpTunnelingSlotInfo> QKnxNetIpTunnelingInfoDibProxy::optionalSlotInfos() const { - QVector<QKnxNetIpTunnelingSlotInfo> infos; + QList<QKnxNetIpTunnelingSlotInfo> infos; if (!isValid()) return infos; @@ -441,7 +441,7 @@ public: quint16 maxApduLength { 0 }; QKnxNetIpTunnelingSlotInfo m_info; // mandatory - QVector<QKnxNetIpTunnelingSlotInfo> m_infos; + QList<QKnxNetIpTunnelingSlotInfo> m_infos; }; /*! @@ -483,7 +483,7 @@ QKnxNetIpTunnelingInfoDibProxy::Builder &QKnxNetIpTunnelingInfoDibProxy::Builder to \a infos and returns a reference to the builder. */ QKnxNetIpTunnelingInfoDibProxy::Builder &QKnxNetIpTunnelingInfoDibProxy::Builder - ::setOptionalSlotInfos(const QVector<QKnxNetIpTunnelingSlotInfo> &infos) + ::setOptionalSlotInfos(const QList<QKnxNetIpTunnelingSlotInfo> &infos) { d_ptr->m_infos = infos; return *this; diff --git a/src/knx/netip/qknxnetiptunnelinginfodib.h b/src/knx/netip/qknxnetiptunnelinginfodib.h index 519e9b6..501ca44 100644 --- a/src/knx/netip/qknxnetiptunnelinginfodib.h +++ b/src/knx/netip/qknxnetiptunnelinginfodib.h @@ -103,7 +103,7 @@ public: quint16 maximumInterfaceApduLength() const; QKnxNetIpTunnelingSlotInfo tunnelingSlotInfo() const; - QVector<QKnxNetIpTunnelingSlotInfo> optionalSlotInfos() const; + QList<QKnxNetIpTunnelingSlotInfo> optionalSlotInfos() const; class Q_KNX_EXPORT Builder final { @@ -113,7 +113,7 @@ public: Builder &setMaximumInterfaceApduLength(quint16 length); Builder &setTunnelingSlotInfo(const QKnxNetIpTunnelingSlotInfo &info); - Builder &setOptionalSlotInfos(const QVector<QKnxNetIpTunnelingSlotInfo> &infos); + Builder &setOptionalSlotInfos(const QList<QKnxNetIpTunnelingSlotInfo> &infos); QKnxNetIpDib create() const; diff --git a/src/knx/qknxaddress.cpp b/src/knx/qknxaddress.cpp index e245ef6..dc4b3d4 100644 --- a/src/knx/qknxaddress.cpp +++ b/src/knx/qknxaddress.cpp @@ -139,8 +139,8 @@ QKnxAddress::QKnxAddress(QKnxAddress::Type type, const QString &address) if (dots && slashes) return; - QVector<quint16> sections; - const auto convert = [§ions](const QVector<QStringView> &in) -> bool { + QList<quint16> sections; + const auto convert = [§ions](const QList<QStringView> &in) -> bool { for (const QStringView §ion : qAsConst(in)) { bool ok = false; const quint16 value = section.toUShort(&ok, 0); diff --git a/src/knx/qknxinterfaceobjectpropertydatatype.cpp b/src/knx/qknxinterfaceobjectpropertydatatype.cpp index c8c2f81..dff3b97 100644 --- a/src/knx/qknxinterfaceobjectpropertydatatype.cpp +++ b/src/knx/qknxinterfaceobjectpropertydatatype.cpp @@ -335,13 +335,13 @@ quint8 QKnxInterfaceObjectPropertyDataType::size(Id id, bool read) Creates a KNX interface object property data type from the property \a property. */ -QVector<QKnxInterfaceObjectPropertyDataType> +QList<QKnxInterfaceObjectPropertyDataType> QKnxInterfaceObjectPropertyDataType::fromProperty(QKnxInterfaceObjectProperty property) { if (!QKnxInterfaceObjectProperty::isProperty(property)) return {}; - using PropertyDataTypeHash = QHash<int, QVector<QKnxInterfaceObjectPropertyDataType>>; + using PropertyDataTypeHash = QHash<int, QList<QKnxInterfaceObjectPropertyDataType>>; static const PropertyDataTypeHash general = []() -> PropertyDataTypeHash { return { diff --git a/src/knx/qknxinterfaceobjectpropertydatatype.h b/src/knx/qknxinterfaceobjectpropertydatatype.h index d436b20..d0791e9 100644 --- a/src/knx/qknxinterfaceobjectpropertydatatype.h +++ b/src/knx/qknxinterfaceobjectpropertydatatype.h @@ -32,7 +32,7 @@ #include <QtCore/qobject.h> #include <QtCore/qshareddata.h> -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/qknxinterfaceobjectproperty.h> #include <QtKnx/qknxdatapointtype.h> @@ -135,7 +135,7 @@ public: QKnxInterfaceObjectPropertyDataType::Unit unit() const; static quint8 size(QKnxInterfaceObjectPropertyDataType::Id id, bool read = false); - static QVector<QKnxInterfaceObjectPropertyDataType> fromProperty(QKnxInterfaceObjectProperty p); + static QList<QKnxInterfaceObjectPropertyDataType> fromProperty(QKnxInterfaceObjectProperty p); QKnxInterfaceObjectPropertyDataType(const QKnxInterfaceObjectPropertyDataType &o); QKnxInterfaceObjectPropertyDataType &operator=(const QKnxInterfaceObjectPropertyDataType &o); diff --git a/src/knx/qknxlinklayerframe.cpp b/src/knx/qknxlinklayerframe.cpp index df8449f..1605916 100644 --- a/src/knx/qknxlinklayerframe.cpp +++ b/src/knx/qknxlinklayerframe.cpp @@ -125,7 +125,7 @@ public: QKnxExtendedControlField m_extCtrl; quint8 m_additionalInfoSize { 0 }; mutable bool m_additionalInfosSorted { true }; - mutable QVector<QKnxAdditionalInfo> m_additionalInfos; + mutable QList<QKnxAdditionalInfo> m_additionalInfos; }; /*! @@ -508,11 +508,11 @@ void QKnxLinkLayerFrame::addAdditionalInfo(const QKnxAdditionalInfo &info) } /*! - Returns a vector of additional information contained in the frame. + Returns a list of additional information contained in the frame. \sa QKnxAdditionalInfo */ -QVector<QKnxAdditionalInfo> QKnxLinkLayerFrame::additionalInfos() const +QList<QKnxAdditionalInfo> QKnxLinkLayerFrame::additionalInfos() const { if (!d_ptr->m_additionalInfosSorted) { std::sort(d_ptr->m_additionalInfos.begin(), d_ptr->m_additionalInfos.end(), diff --git a/src/knx/qknxlinklayerframe.h b/src/knx/qknxlinklayerframe.h index 8f954a5..6db78ec 100644 --- a/src/knx/qknxlinklayerframe.h +++ b/src/knx/qknxlinklayerframe.h @@ -115,7 +115,7 @@ public: void setExtendedControlField(const QKnxExtendedControlField &field); quint8 additionalInfosSize() const; - QVector<QKnxAdditionalInfo> additionalInfos() const; + QList<QKnxAdditionalInfo> additionalInfos() const; void addAdditionalInfo(const QKnxAdditionalInfo &info); void removeAdditionalInfo(QKnxAdditionalInfo::Type type); void removeAdditionalInfo(const QKnxAdditionalInfo &info); diff --git a/src/knx/qknxlinklayerframebuilder.cpp b/src/knx/qknxlinklayerframebuilder.cpp index 70bbeb6..2d43067 100644 --- a/src/knx/qknxlinklayerframebuilder.cpp +++ b/src/knx/qknxlinklayerframebuilder.cpp @@ -195,7 +195,7 @@ QKnxLinkLayerFrame::Builder & \sa QKnxAdditionalInfo */ QKnxLinkLayerFrame::Builder & - QKnxLinkLayerFrame::Builder::setAdditionalInfos(const QVector<QKnxAdditionalInfo> &infos) + QKnxLinkLayerFrame::Builder::setAdditionalInfos(const QList<QKnxAdditionalInfo> &infos) { m_additionalInfos = infos; return *this; diff --git a/src/knx/qknxlinklayerframebuilder.h b/src/knx/qknxlinklayerframebuilder.h index 4d1547e..4ad6285 100644 --- a/src/knx/qknxlinklayerframebuilder.h +++ b/src/knx/qknxlinklayerframebuilder.h @@ -30,7 +30,7 @@ #ifndef QKNXLINKLAYERFRAMEBUILDER_H #define QKNXLINKLAYERFRAMEBUILDER_H -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtKnx/qknxadditionalinfo.h> #include <QtKnx/qknxaddress.h> #include <QtKnx/qknxcontrolfield.h> @@ -54,13 +54,13 @@ public: Builder &setMedium(QKnx::MediumType type); Builder &setData(const QKnxByteArray &data, quint16 offset = 0); Builder &setMessageCode(QKnxLinkLayerFrame::MessageCode code); - Builder &setAdditionalInfos(const QVector<QKnxAdditionalInfo> &infos); + Builder &setAdditionalInfos(const QList<QKnxAdditionalInfo> &infos); QKnxLinkLayerFrame createFrame() const; private: QKnxLinkLayerFrame::MessageCode m_code { QKnxLinkLayerFrame::MessageCode::DataRequest }; - QVector<QKnxAdditionalInfo> m_additionalInfos; + QList<QKnxAdditionalInfo> m_additionalInfos; QKnxAddress m_src { QKnxAddress::Type::Individual, 0x0000 }; QKnxAddress m_dest; mutable QKnxControlField m_ctrl { 0xbc }; diff --git a/src/knx/qknxtpdufactory_p.h b/src/knx/qknxtpdufactory_p.h index 870ca4a..e7712d7 100644 --- a/src/knx/qknxtpdufactory_p.h +++ b/src/knx/qknxtpdufactory_p.h @@ -203,7 +203,7 @@ public: quint8 seqNumber = 0); static QKnxTpdu createLinkResponseTpdu(Mode mode, quint8 groupObjectNumber, quint8 sendingAddress, quint8 startAddress, - const QVector<QKnxAddress> &addresses, + const QList<QKnxAddress> &addresses, quint8 seqNumber = 0); static QKnxTpdu createLinkWriteTpdu(Mode mode, quint8 groupObjectNumber, QKnxTpdu::LinkWriteFlags flags, diff --git a/src/knx/qknxtpdufactory_p2p.cpp b/src/knx/qknxtpdufactory_p2p.cpp index c3f84ad..8257746 100644 --- a/src/knx/qknxtpdufactory_p2p.cpp +++ b/src/knx/qknxtpdufactory_p2p.cpp @@ -270,7 +270,7 @@ QKnxTpdu QKnxTpduFactory::PointToPoint::createLinkReadTpdu(Mode mode, quint8 gro } QKnxTpdu QKnxTpduFactory::PointToPoint::createLinkResponseTpdu(Mode mode, quint8 groupObjectNumber, - quint8 sendingAddress, quint8 startAddress, const QVector<QKnxAddress> &addresses, + quint8 sendingAddress, quint8 startAddress, const QList<QKnxAddress> &addresses, quint8 seqNumber) { if (sendingAddress > 15 || startAddress > 15) diff --git a/src/knx/ssl/qknxkeyring.cpp b/src/knx/ssl/qknxkeyring.cpp index 2efdbf9..cee457e 100644 --- a/src/knx/ssl/qknxkeyring.cpp +++ b/src/knx/ssl/qknxkeyring.cpp @@ -201,7 +201,7 @@ bool QKnxInterface::QKnxGroup::parseElement(QXmlStreamReader *reader, bool pedan if (!QKnxPrivate::fetchAttr(attrs, QStringLiteral("Senders"), &attr, reader)) return false; - Senders = attr.toString().split(QLatin1Char(' ')).toVector(); + Senders = attr.toString().split(QLatin1Char(' ')).toList(); if (pedantic) { QRegularExpression regExp; regExp.setPattern(QLatin1String(individualAddress)); 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; diff --git a/src/knx/ssl/qsslsocket_openssl_symbols.cpp b/src/knx/ssl/qsslsocket_openssl_symbols.cpp index ea3e805..6178bc9 100644 --- a/src/knx/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/knx/ssl/qsslsocket_openssl_symbols.cpp @@ -629,8 +629,8 @@ struct LibGreaterThan typedef bool result_type; result_type operator()(const QString &lhs, const QString &rhs) const { - const QVector<QStringView> lhsparts = QStringView{lhs}.split(QLatin1Char('.')); - const QVector<QStringView> rhsparts = QStringView{rhs}.split(QLatin1Char('.')); + const QList<QStringView> lhsparts = QStringView{lhs}.split(QLatin1Char('.')); + const QList<QStringView> rhsparts = QStringView{rhs}.split(QLatin1Char('.')); Q_ASSERT(lhsparts.count() > 1 && rhsparts.count() > 1); // note: checking rhs < lhs, the same as lhs > rhs diff --git a/tests/auto/qknxdatapointtype/tst_qknxdatapointtype.cpp b/tests/auto/qknxdatapointtype/tst_qknxdatapointtype.cpp index 8387ae1..fee7259 100644 --- a/tests/auto/qknxdatapointtype/tst_qknxdatapointtype.cpp +++ b/tests/auto/qknxdatapointtype/tst_qknxdatapointtype.cpp @@ -26,7 +26,7 @@ ** ******************************************************************************/ -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <QtCore/qmetaobject.h> #include <QtKnx/qknx1bit.h> #include <QtKnx/qknx1bitcontrolled.h> diff --git a/tests/auto/qknxgroupaddressinfo/tst_qknxgroupaddressinfo.cpp b/tests/auto/qknxgroupaddressinfo/tst_qknxgroupaddressinfo.cpp index 8d1766c..9f74b99 100644 --- a/tests/auto/qknxgroupaddressinfo/tst_qknxgroupaddressinfo.cpp +++ b/tests/auto/qknxgroupaddressinfo/tst_qknxgroupaddressinfo.cpp @@ -41,12 +41,12 @@ private slots: void groupAddressInfosFromZip(); private: - QVector<QKnxGroupAddressInfo> initGroupAddressInfos(const QString &install = {}); + QList<QKnxGroupAddressInfo> initGroupAddressInfos(const QString &install = {}); }; -QVector<QKnxGroupAddressInfo> tst_QKnxGroupAddressInfos::initGroupAddressInfos(const QString &i) +QList<QKnxGroupAddressInfo> tst_QKnxGroupAddressInfos::initGroupAddressInfos(const QString &i) { - return QVector<QKnxGroupAddressInfo> { + return QList<QKnxGroupAddressInfo> { { i, "Living room Ceiling light switching", 0x0900, "DPST-1-1", "Living room Ceiling light" }, { i, "Living room Desk light switching", 0x0901, "DPST-1-1", "Living room Desk light" }, { i, "Living room Socket switching", 0x0902, "DPST-1-1", "Living room Socket" }, @@ -200,7 +200,7 @@ void tst_QKnxGroupAddressInfos::groupAddressInfosFromXml() { QKnxGroupAddressInfos infos(QString(":/data/0.xml")); - QCOMPARE(infos.projectIds(), QVector<QString>()); + QCOMPARE(infos.projectIds(), QList<QString>()); QCOMPARE(infos.projectFile(), QString(":/data/0.xml")); QCOMPARE(infos.status(), QKnxGroupAddressInfos::Status::NoError); QCOMPARE(infos.errorString(), QString()); @@ -263,7 +263,7 @@ void tst_QKnxGroupAddressInfos::groupAddressInfosFromXml() void tst_QKnxGroupAddressInfos::groupAddressInfosFromZip() { QKnxGroupAddressInfos infos; - QCOMPARE(infos.projectIds(), QVector<QString>()); + QCOMPARE(infos.projectIds(), QList<QString>()); QCOMPARE(infos.projectFile(), QString()); QCOMPARE(infos.status(), QKnxGroupAddressInfos::Status::NoError); QCOMPARE(infos.errorString(), QString()); diff --git a/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp b/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp index e1a863a..9e52d51 100644 --- a/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp +++ b/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp @@ -169,7 +169,7 @@ void tst_QKnxNetIpDescriptionResponse::testSupportedFamiliesAccessor() void tst_QKnxNetIpDescriptionResponse::testSupportedFamiliesVersions() { - QVector<QKnxServiceInfo> fam = { + QList<QKnxServiceInfo> fam = { { QKnxNetIp::ServiceFamily::IpTunneling, 0x04 }, { QKnxNetIp::ServiceFamily::Core, 9 }, { QKnxNetIp::ServiceFamily::DeviceManagement, 2 }, diff --git a/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp b/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp index 2e956b7..ac6ceec 100644 --- a/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp +++ b/tests/auto/qknxnetipknxaddressesdib/tst_qknxnetipknxaddressesdib.cpp @@ -60,7 +60,7 @@ void tst_QKnxNetIpKnxAddressesDib::testDefaultConstructor() QKnxNetIpKnxAddressesDibProxy view(addrDib); QCOMPARE(view.isValid(), true); QCOMPARE(view.descriptionType(), QKnxNetIp::DescriptionType::KnxAddresses); - QCOMPARE(view.individualAddresses(), QVector<QKnxAddress>{}); + QCOMPARE(view.individualAddresses(), QList<QKnxAddress>{}); } void tst_QKnxNetIpKnxAddressesDib::testConstructorWithOneArgument() @@ -77,12 +77,12 @@ void tst_QKnxNetIpKnxAddressesDib::testConstructorWithOneArgument() QKnxNetIpKnxAddressesDibProxy view(addresses); QCOMPARE(view.isValid(), true); QCOMPARE(view.descriptionType(), QKnxNetIp::DescriptionType::KnxAddresses); - QCOMPARE(view.individualAddresses(), QVector<QKnxAddress> { QKnxAddress::createIndividual(1, 1, 1) }); + QCOMPARE(view.individualAddresses(), QList<QKnxAddress> { QKnxAddress::createIndividual(1, 1, 1) }); } void tst_QKnxNetIpKnxAddressesDib::testConstructorWithTwoArguments() { - QVector<QKnxAddress> knxAddresses; + QList<QKnxAddress> knxAddresses; knxAddresses.append(QKnxAddress::createIndividual(1, 1, 0)); knxAddresses.append(QKnxAddress::createIndividual(1, 2, 5)); knxAddresses.append(QKnxAddress::createIndividual(2, 3, 8)); @@ -105,7 +105,7 @@ void tst_QKnxNetIpKnxAddressesDib::testConstructorWithTwoArguments() void tst_QKnxNetIpKnxAddressesDib::testIndividualAddresses() { - QVector<QKnxAddress> knxAddresses; + QList<QKnxAddress> knxAddresses; knxAddresses.append(QKnxAddress::createIndividual(1, 1, 0)); knxAddresses.append(QKnxAddress::createGroup(1, 2, 5)); knxAddresses.append(QKnxAddress::createIndividual(2, 3, 8)); diff --git a/tests/auto/qknxnetipmanufacturerdib/tst_qknxnetipmanufacturerdib.cpp b/tests/auto/qknxnetipmanufacturerdib/tst_qknxnetipmanufacturerdib.cpp index 075bac0..2ef2cde 100644 --- a/tests/auto/qknxnetipmanufacturerdib/tst_qknxnetipmanufacturerdib.cpp +++ b/tests/auto/qknxnetipmanufacturerdib/tst_qknxnetipmanufacturerdib.cpp @@ -44,7 +44,7 @@ private slots: void testDefaultConstructor(); void testConstructorWithOneArguments(); void testConstructorWithByteArrayDataArguments(); - void testConstructorWithVectorDataArguments(); + void testConstructorWithDataArguments(); void testDebugStream(); }; @@ -100,7 +100,7 @@ void tst_QKnxNetIpManufacturerDib::testConstructorWithByteArrayDataArguments() QCOMPARE(view.manufacturerData().size(), evenData.size()); } -void tst_QKnxNetIpManufacturerDib::testConstructorWithVectorDataArguments() +void tst_QKnxNetIpManufacturerDib::testConstructorWithDataArguments() { const QKnxByteArray data = { 1, 2, 3, 4, 5 }; const QKnxByteArray evenData = { 1, 2, 3, 4, 5, 0 }; diff --git a/tests/auto/qknxnetipsearchrequest/tst_qknxnetipsearchrequest.cpp b/tests/auto/qknxnetipsearchrequest/tst_qknxnetipsearchrequest.cpp index a97ca50..9bb0d8d 100644 --- a/tests/auto/qknxnetipsearchrequest/tst_qknxnetipsearchrequest.cpp +++ b/tests/auto/qknxnetipsearchrequest/tst_qknxnetipsearchrequest.cpp @@ -137,7 +137,7 @@ void tst_QKnxNetIpSearchRequest::tst_srpBuilders() QCOMPARE(proxy.macAddress(), QKnxByteArray()); QCOMPARE(proxy.serviceInfo(), QKnxServiceInfo()); - QCOMPARE(proxy.descriptionTypes(), QVector<QKnxNetIp::DescriptionType>()); + QCOMPARE(proxy.descriptionTypes(), QList<QKnxNetIp::DescriptionType>()); } auto macAddress = QKnxByteArray::fromHex("4CCC6AE40000"); @@ -158,7 +158,7 @@ void tst_QKnxNetIpSearchRequest::tst_srpBuilders() QVERIFY(!proxy.programmingModeOnly()); QCOMPARE(proxy.serviceInfo(), QKnxServiceInfo()); - QCOMPARE(proxy.descriptionTypes(), QVector<QKnxNetIp::DescriptionType>()); + QCOMPARE(proxy.descriptionTypes(), QList<QKnxNetIp::DescriptionType>()); } QKnxServiceInfo serviceInfo { QKnxNetIp::ServiceFamily::ObjectServer, 0x04 }; @@ -179,10 +179,10 @@ void tst_QKnxNetIpSearchRequest::tst_srpBuilders() QVERIFY(!proxy.programmingModeOnly()); QCOMPARE(proxy.macAddress(), QKnxByteArray()); - QCOMPARE(proxy.descriptionTypes(), QVector<QKnxNetIp::DescriptionType>()); + QCOMPARE(proxy.descriptionTypes(), QList<QKnxNetIp::DescriptionType>()); } - QVector<QKnxNetIp::DescriptionType> types { + QList<QKnxNetIp::DescriptionType> types { QKnxNetIp::DescriptionType::DeviceInfo, QKnxNetIp::DescriptionType::SupportedServiceFamilies, QKnxNetIp::DescriptionType::ExtendedDeviceInfo @@ -235,7 +235,7 @@ void tst_QKnxNetIpSearchRequest::testExtendSearchRequest() QKnxNetIpSrp macSrp2 = QKnxNetIpSrpProxy::macAddressBuilder() .setMac(macAddress2) .create(); - QVector<QKnxNetIpSrp> srps = { macSrp1, macSrp2 }; + QList<QKnxNetIpSrp> srps = { macSrp1, macSrp2 }; QCOMPARE(srps.constFirst().isValid(), true); QVERIFY(srps.constFirst().header().isMandatory()); QCOMPARE(srps.constFirst().bytes(), diff --git a/tests/auto/qknxnetipsearchresponse/tst_qknxnetipsearchresponse.cpp b/tests/auto/qknxnetipsearchresponse/tst_qknxnetipsearchresponse.cpp index acf8b0d..8152749 100644 --- a/tests/auto/qknxnetipsearchresponse/tst_qknxnetipsearchresponse.cpp +++ b/tests/auto/qknxnetipsearchresponse/tst_qknxnetipsearchresponse.cpp @@ -198,7 +198,7 @@ void tst_QKnxNetIpSearchResponse::testSupportedFamiliesVersions() .setMacAddress(QKnxByteArray::fromHex("bcaec56690f9")) .setDeviceName(QByteArray("qt.io KNX device")) .create(); - QVector<QKnxServiceInfo> fam = { + QList<QKnxServiceInfo> fam = { { QKnxNetIp::ServiceFamily::IpTunneling, 0x04 }, { QKnxNetIp::ServiceFamily::Core, 9 }, { QKnxNetIp::ServiceFamily::DeviceManagement, 2 }, diff --git a/tests/auto/qknxnetipsecuredservicefamiliesdib/tst_qknxnetipsecuredservicefamiliesdib.cpp b/tests/auto/qknxnetipsecuredservicefamiliesdib/tst_qknxnetipsecuredservicefamiliesdib.cpp index 096db76..bcba8a6 100644 --- a/tests/auto/qknxnetipsecuredservicefamiliesdib/tst_qknxnetipsecuredservicefamiliesdib.cpp +++ b/tests/auto/qknxnetipsecuredservicefamiliesdib/tst_qknxnetipsecuredservicefamiliesdib.cpp @@ -75,7 +75,7 @@ void tst_QKnxNetIpSecuredServiceFamiliesDib::testDefaultConstructor() void tst_QKnxNetIpSecuredServiceFamiliesDib::testConstructorWithOneArgument() { - QVector<QKnxSecuredServiceInfo> infos; + QList<QKnxSecuredServiceInfo> infos; infos.append({ QKnxNetIp::ServiceFamily::Core, 9 }); infos.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 2 }); infos.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 1 }); @@ -217,7 +217,7 @@ void tst_QKnxNetIpSecuredServiceFamiliesDib::testDebugStream() qDebug() << QKnxNetIpSecuredServiceFamiliesDibProxy::builder().create(); QCOMPARE(s_msg, QString::fromLatin1("0x0206")); - QVector<QKnxSecuredServiceInfo> families; + QList<QKnxSecuredServiceInfo> families; families.append({ QKnxNetIp::ServiceFamily::Core, 9 }); families.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 10 }); families.append({ QKnxNetIp::ServiceFamily::IpTunneling, 11 }); diff --git a/tests/auto/qknxnetipservicefamiliesdib/tst_qknxnetipservicefamiliesdib.cpp b/tests/auto/qknxnetipservicefamiliesdib/tst_qknxnetipservicefamiliesdib.cpp index 7ffac6a..aa04fea 100644 --- a/tests/auto/qknxnetipservicefamiliesdib/tst_qknxnetipservicefamiliesdib.cpp +++ b/tests/auto/qknxnetipservicefamiliesdib/tst_qknxnetipservicefamiliesdib.cpp @@ -65,7 +65,7 @@ void tst_QKnxNetIpServiceFamiliesDib::testDefaultConstructor() void tst_QKnxNetIpServiceFamiliesDib::testConstructorWithOneArgument() { - QVector<QKnxServiceInfo> infos; + QList<QKnxServiceInfo> infos; infos.append({ QKnxNetIp::ServiceFamily::Core, 9 }); infos.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 2 }); infos.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 1 }); @@ -207,7 +207,7 @@ void tst_QKnxNetIpServiceFamiliesDib::testDebugStream() qDebug() << QKnxNetIpServiceFamiliesDibProxy::builder().create(); QCOMPARE(s_msg, QString::fromLatin1("0x0202")); - QVector<QKnxServiceInfo> families; + QList<QKnxServiceInfo> families; families.append({ QKnxNetIp::ServiceFamily::Core, 9 }); families.append({ QKnxNetIp::ServiceFamily::DeviceManagement, 10 }); families.append({ QKnxNetIp::ServiceFamily::IpTunneling, 11 }); diff --git a/tests/auto/qknxnetiptunnelinginfodib/tst_qknxnetiptunnelinginfodib.cpp b/tests/auto/qknxnetiptunnelinginfodib/tst_qknxnetiptunnelinginfodib.cpp index 1acbbb1..893838a 100644 --- a/tests/auto/qknxnetiptunnelinginfodib/tst_qknxnetiptunnelinginfodib.cpp +++ b/tests/auto/qknxnetiptunnelinginfodib/tst_qknxnetiptunnelinginfodib.cpp @@ -58,7 +58,7 @@ private slots: QCOMPARE(proxy.descriptionType(), QKnxNetIp::DescriptionType::Unknown); QCOMPARE(proxy.maximumInterfaceApduLength(), 0x0000); QCOMPARE(proxy.tunnelingSlotInfo(), QKnxNetIpTunnelingSlotInfo()); - QCOMPARE(proxy.optionalSlotInfos(), QVector<QKnxNetIpTunnelingSlotInfo>()); + QCOMPARE(proxy.optionalSlotInfos(), QList<QKnxNetIpTunnelingSlotInfo>()); dib = QKnxNetIpTunnelingInfoDibProxy::builder().create(); QCOMPARE(proxy.isValid(), false); @@ -66,7 +66,7 @@ private slots: QCOMPARE(proxy.descriptionType(), QKnxNetIp::DescriptionType::Unknown); QCOMPARE(proxy.maximumInterfaceApduLength(), 0x0000); QCOMPARE(proxy.tunnelingSlotInfo(), QKnxNetIpTunnelingSlotInfo()); - QCOMPARE(proxy.optionalSlotInfos(), QVector<QKnxNetIpTunnelingSlotInfo>()); + QCOMPARE(proxy.optionalSlotInfos(), QList<QKnxNetIpTunnelingSlotInfo>()); } void testValidDib() diff --git a/tests/auto/qknxproject/tst_qknxproject.cpp b/tests/auto/qknxproject/tst_qknxproject.cpp index 9e69d61..58a7f69 100644 --- a/tests/auto/qknxproject/tst_qknxproject.cpp +++ b/tests/auto/qknxproject/tst_qknxproject.cpp @@ -896,7 +896,7 @@ private Q_SLOTS: QCOMPARE(comRef.ChannelId, QLatin1String("ChannelId")); QCOMPARE(comRef.CommunicationFlag, QLatin1String("Enabled")); - QCOMPARE(comRef.DatapointType, QVector<QString>({ QStringLiteral("Dpt-1-1") })); + QCOMPARE(comRef.DatapointType, QList<QString>({ QStringLiteral("Dpt-1-1") })); QCOMPARE(comRef.Description, QLatin1String("Description")); QCOMPARE(comRef.FunctionText, QLatin1String("FunctionText")); QCOMPARE(comRef.Id, QLatin1String("Id12346")); diff --git a/tests/auto/qknxtunnelframe/tst_qknxtunnelframe.cpp b/tests/auto/qknxtunnelframe/tst_qknxtunnelframe.cpp index 6d82d7f..67b934c 100644 --- a/tests/auto/qknxtunnelframe/tst_qknxtunnelframe.cpp +++ b/tests/auto/qknxtunnelframe/tst_qknxtunnelframe.cpp @@ -45,7 +45,7 @@ class tst_QKnxLinkLayerFrame : public QObject private slots: void testConstructors() { - QVector<QKnxAdditionalInfo> addInfos = { + const QList<QKnxAdditionalInfo> addInfos = { { QKnxAdditionalInfo::Type::BiBatInformation, QKnxByteArray::fromHex("1020") }, { QKnxAdditionalInfo::Type::RfFastAckInformation, QKnxByteArray::fromHex("30405060") }, { QKnxAdditionalInfo::Type::ManufacturerSpecificData, QKnxByteArray::fromHex("708090") } @@ -85,7 +85,7 @@ private slots: void testTpduFetcher() { - QVector<QKnxAdditionalInfo> addInfos = { + const QList<QKnxAdditionalInfo> addInfos = { { QKnxAdditionalInfo::Type::BiBatInformation, QKnxByteArray::fromHex("1020") }, { QKnxAdditionalInfo::Type::RfFastAckInformation, QKnxByteArray::fromHex("30405060") }, { QKnxAdditionalInfo::Type::ManufacturerSpecificData, QKnxByteArray::fromHex("708090") } |