Rename from *tunneling* to *tunnel*, matching the KNX spec more closely

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

6 files changed, 26 insertions, 26 deletions

diff --git a/examples/knx/demo/qmlknxdemo.cpp b/examples/knx/demo/qmlknxdemo.cpp
index af046e5..4215246 100644
--- a/examples/knx/demo/qmlknxdemo.cpp
+++ b/examples/knx/demo/qmlknxdemo.cpp
@@ -229,9 +229,9 @@ static QHostAddress obtainLocalAddress()
 
 QmlKnxTunnel::QmlKnxTunnel(QmlKnxDemo *demo)
 {
-    connect(&m_connection, &QKnxNetIpTunnelConnection::stateChanged,
+    connect(&m_connection, &QKnxNetIpTunnel::stateChanged,
             this, &QmlKnxTunnel::handleConnection);
-    connect(&m_connection, &QKnxNetIpTunnelConnection::receivedTunnelFrame,
+    connect(&m_connection, &QKnxNetIpTunnel::frameReceived,
             demo, &QmlKnxDemo::handleFrame);
     connect(&m_timer, &QTimer::timeout, this, &QmlKnxTunnel::send);
 
@@ -254,7 +254,7 @@ QmlKnxTunnel::QmlKnxTunnel(QmlKnxDemo *demo)
     autoDiscoverKnxServers();
 }
 
-void QmlKnxTunnel::sendTunnelFrame(const QKnxLinkLayerFrame &frame)
+void QmlKnxTunnel::sendFrame(const QKnxLinkLayerFrame &frame)
 {
     if (frame.size() == 0)
         return;
@@ -284,7 +284,7 @@ void QmlKnxTunnel::changeIp(const QString &ip, quint16 port)
 
 void QmlKnxTunnel::send()
 {
-    m_connection.sendTunnelFrame(m_frames.dequeue());
+    m_connection.sendFrame(m_frames.dequeue());
     if (m_frames.size() == 0)
         m_timer.stop();
 }
diff --git a/examples/knx/demo/qmlknxdemo.h b/examples/knx/demo/qmlknxdemo.h
index 67e27b2..dd9b037 100644
--- a/examples/knx/demo/qmlknxdemo.h
+++ b/examples/knx/demo/qmlknxdemo.h
@@ -57,7 +57,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QColor>
 #include <QtKnx/QKnxNetIpServerDiscoveryAgent>
-#include <QtKnx/QKnxNetIpTunnelConnection>
+#include <QtKnx/QKnxNetIpTunnel>
 #include <QtKnx/QKnxLinkLayerFrame>
 
 class QmlKnxDemo;
@@ -68,7 +68,7 @@ class QmlKnxTunnel : public QObject
 
 public:
     QmlKnxTunnel(QmlKnxDemo *demo);
-    void sendTunnelFrame(const QKnxLinkLayerFrame &frame);
+    void sendFrame(const QKnxLinkLayerFrame &frame);
     void changeIp(const QString &ip, quint16 port = 3671);
 
 public slots:
@@ -81,7 +81,7 @@ private:
 
 private:
     QQueue<QKnxLinkLayerFrame> m_frames;
-    QKnxNetIpTunnelConnection m_connection;
+    QKnxNetIpTunnel m_connection;
     QKnxNetIpServerDiscoveryAgent m_discoveryAgent;
 
     QTimer m_timer;
diff --git a/examples/knx/demo/utils.h b/examples/knx/demo/utils.h
index 3df007f..626cb37 100644
--- a/examples/knx/demo/utils.h
+++ b/examples/knx/demo/utils.h
@@ -71,20 +71,20 @@ QKnxLinkLayerFrame createRequestFrame(const QKnxAddress &address, const QKnxTpdu
 void sendGroupValueWrite(QmlKnxTunnel &tunnel, const QKnxAddress &address,
     const QKnxByteArray &data, quint8 ctrl = 0xa4, quint8 extCtrl = 0xe0)
 {
-    tunnel.sendTunnelFrame(createRequestFrame(address,
+    tunnel.sendFrame(createRequestFrame(address,
         QKnxTpduFactory::Multicast::createGroupValueWriteTpdu(data), ctrl, extCtrl));
 }
 
 void sendColorLedGroupValueWriteFrames(QmlKnxTunnel &tunnel, const DemoColorLed *const dpt)
 {
     if (dpt) {
-        tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 12),
+        tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 12),
             QKnxTpduFactory::Multicast::createGroupValueWriteTpdu(dpt->redBytes())));
 
-        tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 13),
+        tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 13),
             QKnxTpduFactory::Multicast::createGroupValueWriteTpdu(dpt->greenBytes())));
 
-        tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 14),
+        tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 14),
             QKnxTpduFactory::Multicast::createGroupValueWriteTpdu(dpt->blueBytes())));
     }
 }
@@ -99,11 +99,11 @@ void initBoard(EtsDevelopmentBoard &board, QmlKnxTunnel &tunnel)
             continue; // skip checking blinds state
 
         if (QKnxAddress::createGroup(0, 0, 12) == board.getAddress(i)) {
-            tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 12), tpdu));
-            tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 13), tpdu));
-            tunnel.sendTunnelFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 14), tpdu));
+            tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 12), tpdu));
+            tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 13), tpdu));
+            tunnel.sendFrame(createRequestFrame(QKnxAddress::createGroup(0, 0, 14), tpdu));
         } else {
-            tunnel.sendTunnelFrame(createRequestFrame(board.getAddress(i), tpdu, 0xa4));
+            tunnel.sendFrame(createRequestFrame(board.getAddress(i), tpdu, 0xa4));
         }
     }
 }
diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp
index 3c06661..57d1e0d 100644
--- a/examples/knx/knxeditor/tunneling.cpp
+++ b/examples/knx/knxeditor/tunneling.cpp
@@ -97,7 +97,7 @@ Tunneling::Tunneling(QWidget* parent)
         m_tunnel.connectToHost(m_server.controlEndpointAddress(), m_server.controlEndpointPort());
     });
 
-    connect(&m_tunnel, &QKnxNetIpTunnelConnection::connected, this, [&] {
+    connect(&m_tunnel, &QKnxNetIpTunnel::connected, this, [&] {
         ui->connectTunneling->setEnabled(false);
         ui->disconnectTunneling->setEnabled(true);
         ui->tunnelingSendRequest->setEnabled(true);
@@ -110,7 +110,7 @@ Tunneling::Tunneling(QWidget* parent)
         m_tunnel.disconnectFromHost();
     });
 
-    connect(&m_tunnel, &QKnxNetIpTunnelConnection::disconnected, this, [&] {
+    connect(&m_tunnel, &QKnxNetIpTunnel::disconnected, this, [&] {
         ui->connectTunneling->setEnabled(true);
         ui->disconnectTunneling->setEnabled(false);
         ui->tunnelingSendRequest->setEnabled(false);
@@ -126,10 +126,10 @@ Tunneling::Tunneling(QWidget* parent)
                 .setData(data)
                 .setMedium(QKnx::MediumType::NetIP)
                 .createFrame();
-        m_tunnel.sendTunnelFrame(frame);
+        m_tunnel.sendFrame(frame);
     });
 
-    connect(&m_tunnel, &QKnxNetIpTunnelConnection::receivedTunnelFrame, this,
+    connect(&m_tunnel, &QKnxNetIpTunnel::frameReceived, this,
         [&](QKnxLinkLayerFrame frame) {
         ui->textOuputTunneling->append(tr("Source address: %1").arg(frame.sourceAddress()
             .toString()));
diff --git a/examples/knx/knxeditor/tunneling.h b/examples/knx/knxeditor/tunneling.h
index 538cffd..45458ca 100644
--- a/examples/knx/knxeditor/tunneling.h
+++ b/examples/knx/knxeditor/tunneling.h
@@ -53,7 +53,7 @@
 
 #include <QKnxControlField>
 #include <QKnxExtendedControlField>
-#include <QKnxNetIpTunnelConnection>
+#include <QKnxNetIpTunnel>
 #include <QKnxNetIpServerInfo>
 #include <QKnxLinkLayerFrame>
 #include <QValidator>
@@ -115,7 +115,7 @@ private:
     QKnxExtendedControlField m_extCtrl;
 
     QKnxLinkLayerFrame m_frame;
-    QKnxNetIpTunnelConnection m_tunnel;
+    QKnxNetIpTunnel m_tunnel;
     QKnxNetIpServerInfo m_server;
 };
 
diff --git a/examples/knx/tunnelclient/main.cpp b/examples/knx/tunnelclient/main.cpp
index 6ba7f69..d2481c7 100644
--- a/examples/knx/tunnelclient/main.cpp
+++ b/examples/knx/tunnelclient/main.cpp
@@ -52,8 +52,8 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QCoreApplication>
 #include <QtKnx/QKnxByteArray>
-#include <QtKnx/QKnxNetIpTunnelConnection>
 #include <QtKnx/QKnxLinkLayerFrameBuilder>
+#include <QtKnx/QKnxNetIpTunnel>
 #include <QtNetwork/QNetworkInterface>
 
 #ifdef Q_OS_WIN
@@ -85,13 +85,13 @@ int main(int argc, char *argv[])
     });
     parser.process(app);
 
-    QKnxNetIpTunnelConnection tunnel;
+    QKnxNetIpTunnel tunnel;
     tunnel.setNatAware(parser.isSet("nat"));
     tunnel.setLocalPort(parser.value("localPort").toUInt());
     tunnel.setHeartbeatTimeout(parser.value("timeout").toInt() * 1000);
     tunnel.setLocalAddress(QHostAddress(parser.value("localAddress")));
 
-    QObject::connect(&tunnel, &QKnxNetIpTunnelConnection::disconnected, &app, &QCoreApplication::quit);
+    QObject::connect(&tunnel, &QKnxNetIpTunnel::disconnected, &app, &QCoreApplication::quit);
 
     tunnel.connectToHost(QHostAddress(parser.value("remoteAddress")),
         parser.value("remotePort").toUInt());
@@ -111,13 +111,13 @@ int main(int argc, char *argv[])
                 .setData(bytes)
                 .setMedium(QKnx::MediumType::NetIP)
                 .createFrame();
-            tunnel.sendTunnelFrame(frame);
+            tunnel.sendFrame(frame);
         } else {
             tunnel.disconnectFromHost();
         }
     });
 
-    if (tunnel.error() == QKnxNetIpTunnelConnection::Error::None) {
+    if (tunnel.error() == QKnxNetIpTunnel::Error::None) {
         qInfo().noquote() << "Type 'quit' to stop the application.";
         app.exec();
     }