diff options
Diffstat (limited to 'src/knx/netip')
26 files changed, 106 insertions, 106 deletions
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; |