From b9ac8d04f2f5e3fe4b2d2dcc9fe5d6c12603898c Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 8 Aug 2018 14:05:58 +0200 Subject: MQTT5: Rename QMqttServerConnectionProperties::reasonString Use reason() as name for consistency with other cases. Change-Id: I9219a0fd47520f10f1c4b85fd0c4428dcc2d39a1 Reviewed-by: hjk --- src/mqtt/qmqttconnectionproperties.cpp | 2 +- src/mqtt/qmqttconnectionproperties.h | 2 +- tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mqtt/qmqttconnectionproperties.cpp b/src/mqtt/qmqttconnectionproperties.cpp index 7bedc63..68d0374 100644 --- a/src/mqtt/qmqttconnectionproperties.cpp +++ b/src/mqtt/qmqttconnectionproperties.cpp @@ -288,7 +288,7 @@ bool QMqttServerConnectionProperties::clientIdAssigned() const return serverData->details & QMqttServerConnectionProperties::AssignedClientId; } -QString QMqttServerConnectionProperties::reasonString() const +QString QMqttServerConnectionProperties::reason() const { return serverData->reasonString; } diff --git a/src/mqtt/qmqttconnectionproperties.h b/src/mqtt/qmqttconnectionproperties.h index 76bf7a1..61ded91 100644 --- a/src/mqtt/qmqttconnectionproperties.h +++ b/src/mqtt/qmqttconnectionproperties.h @@ -144,7 +144,7 @@ public: quint8 maximumQoS() const; bool retainAvailable() const; bool clientIdAssigned() const; - QString reasonString() const; + QString reason() const; bool wildcardSupported() const; bool subscriptionIdentifierSupported() const; bool sharedSubscriptionSupported() const; diff --git a/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp b/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp index fe72ac9..d592463 100644 --- a/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp +++ b/tests/auto/qmqttconnectionproperties/tst_qmqttconnectionproperties.cpp @@ -159,7 +159,7 @@ void tst_QMqttConnectionProperties::receiveServerProperties() if (properties & QMqttServerConnectionProperties::MaximumTopicAlias) qDebug() << " MaximumTopicAlias:" << server.maximumTopicAlias(); if (properties & QMqttServerConnectionProperties::ReasonString) - qDebug() << " ReasonString:" << server.reasonString(); + qDebug() << " ReasonString:" << server.reason(); if (properties & QMqttServerConnectionProperties::UserProperty) qDebug() << " UserProperty:" << server.userProperties(); if (properties & QMqttServerConnectionProperties::WildCardSupported) -- cgit v1.2.3