Remove *connection, matching the KNX spec more closely

Change-Id: Ia6614cdd30ead9ef2819cd0efa3da376d4912cee
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

2 files changed, 8 insertions, 8 deletions

diff --git a/examples/knx/knxeditor/localdevicemanagement.cpp b/examples/knx/knxeditor/localdevicemanagement.cpp
index 33c2486..95cde29 100644
--- a/examples/knx/knxeditor/localdevicemanagement.cpp
+++ b/examples/knx/knxeditor/localdevicemanagement.cpp
@@ -85,14 +85,14 @@ LocalDeviceManagement::LocalDeviceManagement(QWidget* parent)
         m_management.connectToHost(m_server.controlEndpointAddress(), m_server.controlEndpointPort());
     });
 
-    connect(&m_management, &QKnxNetIpDeviceManagementConnection::connected, this, [&] {
+    connect(&m_management, &QKnxNetIpDeviceManagement::connected, this, [&] {
         ui->deviceManagementSendRequest->setEnabled(true);
         ui->connectRequestDeviceManagement->setEnabled(false);
         ui->disconnectRequestDeviceManagement->setEnabled(true);
         ui->textOuputDeviceManagement->append(tr("Successfully connected to: %1 on port: %2")
             .arg(m_server.controlEndpointAddress().toString()).arg(m_server.controlEndpointPort()));
 
-        m_management.sendDeviceManagementFrame(QKnxLocalDeviceManagementFrameFactory::PropertyRead
+        m_management.sendFrame(QKnxLocalDeviceManagementFrameFactory::PropertyRead
             ::createRequest(QKnxInterfaceObjectType::System::Device, 1,
                 QKnxInterfaceObjectProperty::Device::IoList, 1, 0));
     });
@@ -101,7 +101,7 @@ LocalDeviceManagement::LocalDeviceManagement(QWidget* parent)
         m_management.disconnectFromHost();
     });
 
-    connect(&m_management, &QKnxNetIpDeviceManagementConnection::disconnected, this, [&] {
+    connect(&m_management, &QKnxNetIpDeviceManagement::disconnected, this, [&] {
         m_awaitIoListResponse = true;
         ui->deviceManagementSendRequest->setEnabled(false);
         ui->connectRequestDeviceManagement->setEnabled(true);
@@ -117,11 +117,11 @@ LocalDeviceManagement::LocalDeviceManagement(QWidget* parent)
         auto data = QKnxByteArray::fromHex(ui->cemiFrame->text().toUtf8());
         if (ui->cemiData->isEnabled())
             data.append(QKnxByteArray::fromHex(ui->cemiData->text().toUtf8()));
-        m_management.sendDeviceManagementFrame(QKnxLocalDeviceManagementFrame::fromBytes(data, 0,
+        m_management.sendFrame(QKnxLocalDeviceManagementFrame::fromBytes(data, 0,
             data.size()));
     });
 
-    connect(&m_management, &QKnxNetIpDeviceManagementConnection::receivedDeviceManagementFrame,
+    connect(&m_management, &QKnxNetIpDeviceManagement::frameReceived,
         this, [&](QKnxLocalDeviceManagementFrame frame) {
         ui->textOuputDeviceManagement->append(tr("Received device management frame with cEMI "
             "payload: " + frame.bytes().toHex().toByteArray()));
@@ -319,7 +319,7 @@ void LocalDeviceManagement::handleIoListResponse(const QKnxLocalDeviceManagement
     quint8 expectedDataSize = dataTypes[0].size();
     if (frame.startIndex() == 0) {
         if (data.size() == expectedDataSize) {
-            m_management.sendDeviceManagementFrame(QKnxLocalDeviceManagementFrameFactory::PropertyRead
+            m_management.sendFrame(QKnxLocalDeviceManagementFrameFactory::PropertyRead
                 ::createRequest(QKnxInterfaceObjectType::System::Device, 1,
                     QKnxInterfaceObjectProperty::Device::IoList, data.toUShort(nullptr, 16), 1));
         }
diff --git a/examples/knx/knxeditor/localdevicemanagement.h b/examples/knx/knxeditor/localdevicemanagement.h
index 6907277..bfa5106 100644
--- a/examples/knx/knxeditor/localdevicemanagement.h
+++ b/examples/knx/knxeditor/localdevicemanagement.h
@@ -52,7 +52,7 @@
 #define LOCALDEVICEMANAGEMENT_H
 
 #include <QWidget>
-#include <QKnxNetIpDeviceManagementConnection>
+#include <QKnxNetIpDeviceManagement>
 #include <QKnxNetIpServerInfo>
 
 QT_BEGIN_NAMESPACE
@@ -107,7 +107,7 @@ private:
     bool m_awaitIoListResponse { true };
 
     QKnxNetIpServerInfo m_server;
-    QKnxNetIpDeviceManagementConnection m_management;
+    QKnxNetIpDeviceManagement m_management;
 };
 
 #endif