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.

7 files changed, 11 insertions, 17 deletions

diff --git a/examples/example_1_echoClient/example_1_echoClient.h b/examples/example_1_echoClient/example_1_echoClient.h
index af94f091..4205ab70 100644
--- a/examples/example_1_echoClient/example_1_echoClient.h
+++ b/examples/example_1_echoClient/example_1_echoClient.h
@@ -15,7 +15,6 @@ public:
     echoClient(QObject *parent = nullptr);
     ~echoClient() override;
 
-public slots:
     void messageReceived(const QXmppMessage &);
 };
 
diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h
index fc195cae..a8ec502e 100644
--- a/examples/example_2_rosterHandling/example_2_rosterHandling.h
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h
@@ -17,7 +17,6 @@ public:
     xmppClient(QObject *parent = nullptr);
     ~xmppClient() override;
 
-public slots:
     void clientConnected();
     void rosterReceived();
     void presenceChanged(const QString &bareJid, const QString &resource);
diff --git a/examples/example_3_transferHandling/example_3_transferHandling.h b/examples/example_3_transferHandling/example_3_transferHandling.h
index b8a6cf8b..f2eec6a7 100644
--- a/examples/example_3_transferHandling/example_3_transferHandling.h
+++ b/examples/example_3_transferHandling/example_3_transferHandling.h
@@ -16,14 +16,13 @@ public:
     xmppClient(QObject *parent = nullptr);
     void setRecipient(const QString &recipient);
 
-private slots:
-    void slotError(QXmppTransferJob::Error error);
-    void slotFileReceived(QXmppTransferJob *job);
-    void slotFinished();
-    void slotPresenceReceived(const QXmppPresence &presence);
-    void slotProgress(qint64 done, qint64 total);
-
 private:
+    Q_SLOT void slotError(QXmppTransferJob::Error error);
+    Q_SLOT void slotFileReceived(QXmppTransferJob *job);
+    Q_SLOT void slotFinished();
+    Q_SLOT void slotPresenceReceived(const QXmppPresence &presence);
+    Q_SLOT void slotProgress(qint64 done, qint64 total);
+
     QString m_recipient;
     QXmppTransferManager *transferManager;
 };
diff --git a/examples/example_5_rpcInterface/remoteinterface.h b/examples/example_5_rpcInterface/remoteinterface.h
index 04bb4393..a83903f8 100644
--- a/examples/example_5_rpcInterface/remoteinterface.h
+++ b/examples/example_5_rpcInterface/remoteinterface.h
@@ -16,8 +16,8 @@ public:
     bool isAuthorized(const QString &jid) const override;
 
     // RPC Interface
-public slots:
-    QString echoString(const QString &message);
+public:
+    Q_SLOT QString echoString(const QString &message);
 };
 
 #endif  // REMOTEINTERFACE_H
diff --git a/examples/example_6_rpcClient/rpcClient.h b/examples/example_6_rpcClient/rpcClient.h
index 9e075441..b4d4c393 100644
--- a/examples/example_6_rpcClient/rpcClient.h
+++ b/examples/example_6_rpcClient/rpcClient.h
@@ -18,11 +18,10 @@ public:
     rpcClient(QObject *parent = nullptr);
     ~rpcClient() override;
 
-private slots:
-    void slotInvokeRemoteMethod();
-    void slotPresenceReceived(const QXmppPresence &presence);
-
 private:
+    Q_SLOT void slotInvokeRemoteMethod();
+    Q_SLOT void slotPresenceReceived(const QXmppPresence &presence);
+
     QString m_remoteJid;
     QXmppRpcManager *m_rpcManager;
 };
diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.h b/examples/example_7_archiveHandling/example_7_archiveHandling.h
index aa46619e..9f65be7e 100644
--- a/examples/example_7_archiveHandling/example_7_archiveHandling.h
+++ b/examples/example_7_archiveHandling/example_7_archiveHandling.h
@@ -29,7 +29,6 @@ public:
     void setPageDirection(PageDirection direction);
     void setPageSize(int size);
 
-public slots:
     void clientConnected();
     void archiveListReceived(const QList<QXmppArchiveChat> &chats, const QXmppResultSetReply &rsmReply);
     void archiveChatReceived(const QXmppArchiveChat &chat, const QXmppResultSetReply &rsmReply);
diff --git a/examples/example_9_vCard/example_9_vCard.h b/examples/example_9_vCard/example_9_vCard.h
index f0f4a8a3..dbaac65c 100644
--- a/examples/example_9_vCard/example_9_vCard.h
+++ b/examples/example_9_vCard/example_9_vCard.h
@@ -19,7 +19,6 @@ public:
     xmppClient(QObject *parent = nullptr);
     ~xmppClient() override;
 
-public slots:
     void clientConnected();
     void rosterReceived();
     void vCardReceived(const QXmppVCardIq &);