From 46995fd3fd7da4d1b035f71a1279c041b2871ffd Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Mon, 26 Dec 2022 21:35:16 +0100 Subject: Disable Qt keywords completely Previously we had the policy that no qt keywords were allowed in headers that may be included by users. However since there was no automatic test verifying that in some places keywords were still used. This now disables qt keywords completely, also in tests and examples. Qt keywords are in general no good or really good idea as they even conflict with the standard library (`emit` at least). In some cases in the examples I just removed the slot tag if the functions didn't need to be slots (anymore). Closes #503. --- src/client/QXmppAtmManager.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/client/QXmppAtmManager.h') diff --git a/src/client/QXmppAtmManager.h b/src/client/QXmppAtmManager.h index 9fbd5a63..9a0ab446 100644 --- a/src/client/QXmppAtmManager.h +++ b/src/client/QXmppAtmManager.h @@ -24,11 +24,10 @@ protected: /// \cond void setClient(QXmppClient *client) override; -private slots: - void handleMessageReceived(const QXmppMessage &message); +private: + Q_SLOT void handleMessageReceived(const QXmppMessage &message); /// \endcond -private: QFuture makeTrustDecisions(const QString &encryption, const QMultiHash &keyIdsForAuthentication, const QMultiHash &keyIdsForDistrusting); QFuture handleMessage(const QXmppMessage &message); @@ -40,10 +39,12 @@ private: QFuture sendTrustMessage(const QString &encryption, const QList &keyOwners, const QString &recipientJid); + /// \cond inline QXmppAtmTrustStorage *trustStorage() const { return dynamic_cast(QXmppTrustManager::trustStorage()); } + /// \endcond friend class tst_QXmppAtmManager; }; -- cgit v1.2.3