From 7b72a8d27002319dab22540035f548f54d61241a Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Tue, 12 Mar 2019 15:19:47 +0100 Subject: Use Q_INVOKABLE for the methods not meant to be used as slots Declaring methods to be invoked via QMetaObject::invokeMethod in the Q_SLOTS section, makes the API confusing. Use Q_INVOKABLE instead. Change-Id: I1a04b279fe2ddb505e63dfd48efa1a3b4cb7ad7a Reviewed-by: Edward Welbourne Reviewed-by: Karsten Heimrich --- src/coap/qcoapconnection.h | 3 +-- src/coap/qcoapprotocol.h | 20 ++++++++++---------- src/coap/qcoapreply.h | 2 -- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/coap/qcoapconnection.h b/src/coap/qcoapconnection.h index 78a5ce1..017a0bd 100644 --- a/src/coap/qcoapconnection.h +++ b/src/coap/qcoapconnection.h @@ -57,8 +57,7 @@ public: QCoapConnection::ConnectionState state() const; QCoapSecurityConfiguration securityConfiguration() const; -public Q_SLOTS: - void setSecurityConfiguration(const QCoapSecurityConfiguration &configuration); + Q_INVOKABLE void setSecurityConfiguration(const QCoapSecurityConfiguration &configuration); Q_SIGNALS: void error(QAbstractSocket::SocketError error); diff --git a/src/coap/qcoapprotocol.h b/src/coap/qcoapprotocol.h index bf260d9..e7763d9 100644 --- a/src/coap/qcoapprotocol.h +++ b/src/coap/qcoapprotocol.h @@ -71,17 +71,17 @@ Q_SIGNALS: const QHostAddress &sender); void error(QCoapReply *reply, QtCoap::Error error); -public Q_SLOTS: - void setAckTimeout(uint ackTimeout); - void setAckRandomFactor(double ackRandomFactor); - void setMaxRetransmit(uint maxRetransmit); - void setBlockSize(quint16 blockSize); - void setMaxServerResponseDelay(uint responseDelay); +public: + Q_INVOKABLE void setAckTimeout(uint ackTimeout); + Q_INVOKABLE void setAckRandomFactor(double ackRandomFactor); + Q_INVOKABLE void setMaxRetransmit(uint maxRetransmit); + Q_INVOKABLE void setBlockSize(quint16 blockSize); + Q_INVOKABLE void setMaxServerResponseDelay(uint responseDelay); -private Q_SLOTS: - void sendRequest(QPointer reply, QCoapConnection *connection); - void cancelObserve(QPointer reply) const; - void cancelObserve(const QUrl &url) const; +private: + Q_INVOKABLE void sendRequest(QPointer reply, QCoapConnection *connection); + Q_INVOKABLE void cancelObserve(QPointer reply) const; + Q_INVOKABLE void cancelObserve(const QUrl &url) const; private: Q_DECLARE_PRIVATE(QCoapProtocol) diff --git a/src/coap/qcoapreply.h b/src/coap/qcoapreply.h index bce03fe..648dc3b 100644 --- a/src/coap/qcoapreply.h +++ b/src/coap/qcoapreply.h @@ -59,8 +59,6 @@ public: bool isFinished() const; bool isAborted() const; bool isSuccessful() const; - -public Q_SLOTS: void abortRequest(); Q_SIGNALS: -- cgit v1.2.3