diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/knx/device/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/knx/discoverer/main.cpp | 6 | ||||
-rw-r--r-- | examples/knx/feature/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/knx/group/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/knx/knxeditor/localdevicemanagement.cpp | 2 | ||||
-rw-r--r-- | examples/knx/knxeditor/localdevicemanagement.h | 4 | ||||
-rw-r--r-- | examples/knx/knxeditor/tunneling.cpp | 2 | ||||
-rw-r--r-- | examples/knx/knxeditor/tunneling.h | 4 | ||||
-rw-r--r-- | examples/knx/knxeditor/tunnelingfeatures.cpp | 2 | ||||
-rw-r--r-- | examples/knx/knxeditor/tunnelingfeatures.h | 4 | ||||
-rw-r--r-- | examples/knx/knxproj/main.cpp | 2 |
11 files changed, 16 insertions, 16 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> |