Fix some trivial clang/clazy warnings

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

4 files changed, 56 insertions, 50 deletions

diff --git a/src/knx/dpt/qknxdatapointtype.cpp b/src/knx/dpt/qknxdatapointtype.cpp
index b3fa6f0..7ee6368 100644
--- a/src/knx/dpt/qknxdatapointtype.cpp
+++ b/src/knx/dpt/qknxdatapointtype.cpp
@@ -698,8 +698,8 @@ QKnxDatapointType::QKnxDatapointType(Type type, int size)
     // Datapoint Type shall be identified by a 16 bit main number separated
     // by a dot from a 16 bit sub number. The assumption being made is that
     // QKnxDatapointType::Type is encoded in that way while omitting the dot.
-    int mainType = number.left(number.size() - 5).toInt(&okMain);
-    int subType = number.right(5).toInt(&okSub);
+    quint16 mainType = number.leftRef(number.size() - 5).toUShort(&okMain);
+    quint16 subType = number.rightRef(5).toUShort(&okSub);
 
     if (okMain && okSub)
         d_ptr->setup(mainType, subType, quint32(type), size);
@@ -1052,7 +1052,7 @@ QKnxDatapointType::Type QKnxDatapointType::toType(const QString &dpt)
     }
 
     quint32 type;
-    if (dtp.toType(mainType, subType, &type))
+    if (QKnxDatapointTypePrivate::toType(mainType, subType, &type))
         return static_cast<Type> (type);
     return QKnxDatapointType::Type::Unknown;
 }
diff --git a/src/knx/dpt/qknxdatapointtypefactory.cpp b/src/knx/dpt/qknxdatapointtypefactory.cpp
index 4ab11a0..334ca28 100644
--- a/src/knx/dpt/qknxdatapointtypefactory.cpp
+++ b/src/knx/dpt/qknxdatapointtypefactory.cpp
@@ -138,8 +138,8 @@ QKnxDatapointType *QKnxDatapointTypeFactory::createType(QKnxDatapointType::Type
     // Datapoint Type shall be identified by a 16 bit main number separated by a dot from a 16 bit
     // sub number. The assumption being made is that QKnxDatapointType::Type is encoded in that way
     // while omitting the dot.
-    int mainType = number.left(number.size() - 5).toInt(&okMain);
-    int subType = number.right(5).toInt(&okSub);
+    int mainType = number.leftRef(number.size() - 5).toInt(&okMain);
+    int subType = number.rightRef(5).toInt(&okSub);
 
     if (okMain && okSub)
         return createType(mainType, subType);
diff --git a/src/knx/netip/qknxnetipdevicemanagement.cpp b/src/knx/netip/qknxnetipdevicemanagement.cpp
index eb3d5b7..1da9b15 100644
--- a/src/knx/netip/qknxnetipdevicemanagement.cpp
+++ b/src/knx/netip/qknxnetipdevicemanagement.cpp
@@ -87,13 +87,15 @@ public:
             QKnxNetIp::DeviceConfigurationRequestTimeout)
     {}
 
-    void process(const QKnxDeviceManagementFrame &frame) override
-    {
-        Q_Q(QKnxNetIpDeviceManagement);
-        emit q->frameReceived(frame);
-    }
+    void process(const QKnxDeviceManagementFrame &frame) override;
 };
 
+void QKnxNetIpDeviceManagementPrivate::process(const QKnxDeviceManagementFrame &frame)
+{
+    Q_Q(QKnxNetIpDeviceManagement);
+    emit q->frameReceived(frame);
+}
+
 /*!
     Creates a device management connection with the parent \a parent.
 */
diff --git a/src/knx/netip/qknxnetiptunnel.cpp b/src/knx/netip/qknxnetiptunnel.cpp
index ba6279b..7f923a4 100644
--- a/src/knx/netip/qknxnetiptunnel.cpp
+++ b/src/knx/netip/qknxnetiptunnel.cpp
@@ -111,46 +111,9 @@ public:
         , m_layer(l)
     {}
 
-    void process(const QKnxLinkLayerFrame &frame) override
-    {
-        Q_Q(QKnxNetIpTunnel);
-        emit q->frameReceived(frame);
-    }
-
-    void processConnectResponse(const QKnxNetIpFrame &frame) override
-    {
-        QKnxNetIpConnectResponseProxy response(frame);
-        if (response.status() == QKnxNetIp::Error::NoMoreUniqueConnections) {
-            Q_ASSERT_X(false, "QKnxNetIpTunnelPrivate::process", "NoMoreUniqueConnections "
-                "error handling not implemented yet.");
-            // TODO: Maybe implement 03_08_04 Tunneling v01.05.03 AS.pdf, paragraph 3.3
-        }
-
-        Q_Q(QKnxNetIpTunnel);
-        if (q->state() != QKnxNetIpTunnel::Connected) {
-            const auto &crd = response.responseData();
-            m_address = QKnxNetIpCrdProxy(crd).individualAddress();
-        }
-        QKnxNetIpEndpointConnectionPrivate::processConnectResponse(frame);
-    }
-
-    void processTunnelingFeatureFrame(const QKnxNetIpFrame &frame) override
-    {
-        Q_Q(QKnxNetIpTunnel);
-        if (frame.serviceType() == QKnxNetIp::ServiceType::TunnelingFeatureInfo) {
-            const QKnxNetIpTunnelingFeatureInfoProxy proxy(frame);
-            if (proxy.isValid()) {
-                emit q->tunnelingFeatureInfoReceived(proxy.featureIdentifier(),
-                    proxy.featureValue());
-            }
-        } else if (frame.serviceType() == QKnxNetIp::ServiceType::TunnelingFeatureResponse) {
-            const QKnxNetIpTunnelingFeatureResponseProxy proxy(frame);
-            if (proxy.isValid()) {
-                emit q->tunnelingFeatureResponseReceived(proxy.featureIdentifier(),
-                    proxy.returnCode(), proxy.featureValue());
-            }
-        }
-    }
+    void process(const QKnxLinkLayerFrame &frame) override;
+    void processConnectResponse(const QKnxNetIpFrame &frame) override;
+    void processTunnelingFeatureFrame(const QKnxNetIpFrame &frame) override;
 
     void updateCri()
     {
@@ -174,6 +137,47 @@ private:
     QKnxNetIp::TunnelLayer m_layer { QKnxNetIp::TunnelLayer::Unknown };
 };
 
+void QKnxNetIpTunnelPrivate::process(const QKnxLinkLayerFrame &frame)
+{
+    Q_Q(QKnxNetIpTunnel);
+    emit q->frameReceived(frame);
+}
+
+void QKnxNetIpTunnelPrivate::processConnectResponse(const QKnxNetIpFrame &frame)
+{
+    QKnxNetIpConnectResponseProxy response(frame);
+    if (response.status() == QKnxNetIp::Error::NoMoreUniqueConnections) {
+        Q_ASSERT_X(false, "QKnxNetIpTunnelPrivate::process", "NoMoreUniqueConnections "
+            "error handling not implemented yet.");
+        // TODO: Maybe implement 03_08_04 Tunneling v01.05.03 AS.pdf, paragraph 3.3
+    }
+
+    Q_Q(QKnxNetIpTunnel);
+    if (q->state() != QKnxNetIpTunnel::Connected) {
+        const auto &crd = response.responseData();
+        m_address = QKnxNetIpCrdProxy(crd).individualAddress();
+    }
+    QKnxNetIpEndpointConnectionPrivate::processConnectResponse(frame);
+}
+
+void QKnxNetIpTunnelPrivate::processTunnelingFeatureFrame(const QKnxNetIpFrame &frame)
+{
+    Q_Q(QKnxNetIpTunnel);
+    if (frame.serviceType() == QKnxNetIp::ServiceType::TunnelingFeatureInfo) {
+        const QKnxNetIpTunnelingFeatureInfoProxy proxy(frame);
+        if (proxy.isValid()) {
+            emit q->tunnelingFeatureInfoReceived(proxy.featureIdentifier(),
+                proxy.featureValue());
+        }
+    } else if (frame.serviceType() == QKnxNetIp::ServiceType::TunnelingFeatureResponse) {
+        const QKnxNetIpTunnelingFeatureResponseProxy proxy(frame);
+        if (proxy.isValid()) {
+            emit q->tunnelingFeatureResponseReceived(proxy.featureIdentifier(),
+                proxy.returnCode(), proxy.featureValue());
+        }
+    }
+}
+
 /*!
     Creates a tunnel connection with the parent \a parent.
 */