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.

1 files changed, 4 insertions, 3 deletions

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<void> makeTrustDecisions(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIdsForAuthentication, const QMultiHash<QString, QByteArray> &keyIdsForDistrusting);
     QFuture<void> handleMessage(const QXmppMessage &message);
 
@@ -40,10 +39,12 @@ private:
 
     QFuture<QXmpp::SendResult> sendTrustMessage(const QString &encryption, const QList<QXmppTrustMessageKeyOwner> &keyOwners, const QString &recipientJid);
 
+    /// \cond
     inline QXmppAtmTrustStorage *trustStorage() const
     {
         return dynamic_cast<QXmppAtmTrustStorage *>(QXmppTrustManager::trustStorage());
     }
+    /// \endcond
 
     friend class tst_QXmppAtmManager;
 };