diff options
author | Andrew O'Doherty <andrew.odoherty@qt.io> | 2018-09-14 14:16:41 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-09-17 07:02:43 +0000 |
commit | 922468345956605f66381f3fd2b3e92f2b8c47dd (patch) | |
tree | e4586b679ab7460fbc5e30c21ca5bd8474c65170 | |
parent | ef6af1acfdebec69ed7f221ba5734a3b1ba16aec (diff) |
fix enum names
Change-Id: I19887a3de5e877b215bc10bdf7ac06adc59532f8
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/knx/netip/qknxnetip.cpp | 2 | ||||
-rw-r--r-- | src/knx/netip/qknxnetip.h | 2 | ||||
-rw-r--r-- | src/knx/netip/qknxnetiproutinginterface.cpp | 6 | ||||
-rw-r--r-- | src/knx/netip/qknxnetiproutinginterface.h | 4 | ||||
-rw-r--r-- | src/knx/netip/qknxnetiproutinginterface_p.cpp | 4 | ||||
-rw-r--r-- | src/knx/netip/qknxnetiproutinginterface_p.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/knx/netip/qknxnetip.cpp b/src/knx/netip/qknxnetip.cpp index cb21189..34c69ba 100644 --- a/src/knx/netip/qknxnetip.cpp +++ b/src/knx/netip/qknxnetip.cpp @@ -405,7 +405,7 @@ bool QKnxNetIp::isServiceType(QKnxNetIp::ServiceType type) \value KnxConnection The KNXnet/IP server device detects an error concerning the KNX connection with the specified ID. - \value AuthorizationError + \value Authorization The KNXnet/IP client is not authorized to use the requested individual address in the extended connection request information (CRI) structure. \value TunnelingLayer diff --git a/src/knx/netip/qknxnetip.h b/src/knx/netip/qknxnetip.h index 378e758..e34503c 100644 --- a/src/knx/netip/qknxnetip.h +++ b/src/knx/netip/qknxnetip.h @@ -162,7 +162,7 @@ namespace QKnx NoMoreUniqueConnections = 0x25, DataConnection = 0x26, KnxConnection = 0x27, - AuthorizationError = 0x28, + Authorization = 0x28, TunnelingLayer = 0x29, NoTunnelingAddress = 0x2d, ConnectionInUse = 0x2e diff --git a/src/knx/netip/qknxnetiproutinginterface.cpp b/src/knx/netip/qknxnetiproutinginterface.cpp index 9e46e98..5fe1251 100644 --- a/src/knx/netip/qknxnetiproutinginterface.cpp +++ b/src/knx/netip/qknxnetiproutinginterface.cpp @@ -178,11 +178,11 @@ QT_BEGIN_NAMESPACE apply on telegrams of a point-to-multipoint connectionless communication mode with standard group addresses. - \value BlockRouting + \value Block No telegrams are allowed to be forwarded on the interface. \value RouteAll All telegrams are routed and the filter table is ignored. - \value FilterTableRouting + \value Filter All telegrams with destination addresses not in the filter table are blocked, the rest of telegrams are forwarded. */ @@ -292,7 +292,7 @@ void QKnxNetIpRoutingInterface::setFilterTable(const QKnxNetIpRoutingInterface:: { Q_D(QKnxNetIpRoutingInterface); d->m_filterTable = table; - d->m_routingMode = RoutingMode::FilterTableRouting; + d->m_routingMode = RoutingMode::Filter; } /*! diff --git a/src/knx/netip/qknxnetiproutinginterface.h b/src/knx/netip/qknxnetiproutinginterface.h index 9b1bc40..dc88aba 100644 --- a/src/knx/netip/qknxnetiproutinginterface.h +++ b/src/knx/netip/qknxnetiproutinginterface.h @@ -85,9 +85,9 @@ public: enum class RoutingMode : quint8 { - BlockRouting, + Block, RouteAll, - FilterTableRouting + Filter }; QKnxNetIpRoutingInterface(QObject *parent = nullptr); diff --git a/src/knx/netip/qknxnetiproutinginterface_p.cpp b/src/knx/netip/qknxnetiproutinginterface_p.cpp index b70398e..8b10c17 100644 --- a/src/knx/netip/qknxnetiproutinginterface_p.cpp +++ b/src/knx/netip/qknxnetiproutinginterface_p.cpp @@ -369,9 +369,9 @@ QKnxNetIpRoutingInterface::FilterAction // TODO: review this part auto gAdd = QKnxAddress::createGroup(dst.mainOrAreaSection(), dst.middleOrLineSection(), 0); bool routingCondition = true; - if (m_routingMode == QKnxNetIpRoutingInterface::RoutingMode::FilterTableRouting) + if (m_routingMode == QKnxNetIpRoutingInterface::RoutingMode::Filter) routingCondition = m_filterTable.contains(gAdd); - if (m_routingMode == QKnxNetIpRoutingInterface::RoutingMode::BlockRouting) + if (m_routingMode == QKnxNetIpRoutingInterface::RoutingMode::Block) return QKnxNetIpRoutingInterface::FilterAction::IgnoreTotally; if (routingCondition && hopCount > 0 && hopCount <= 7) return QKnxNetIpRoutingInterface::FilterAction::RouteDecremented; diff --git a/src/knx/netip/qknxnetiproutinginterface_p.h b/src/knx/netip/qknxnetiproutinginterface_p.h index 6bf9e9e..afd05e0 100644 --- a/src/knx/netip/qknxnetiproutinginterface_p.h +++ b/src/knx/netip/qknxnetiproutinginterface_p.h @@ -114,7 +114,7 @@ public: QString m_errorMessage; QKnxNetIpRoutingInterface::FilterTable m_filterTable; - QKnxNetIpRoutingInterface::RoutingMode m_routingMode { QKnxNetIpRoutingInterface::RoutingMode::BlockRouting }; + QKnxNetIpRoutingInterface::RoutingMode m_routingMode { QKnxNetIpRoutingInterface::RoutingMode::Block }; }; QT_END_NAMESPACE |