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, 9 insertions, 11 deletions

diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
index 828a2cb6..b00748b7 100644
--- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp
+++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
@@ -12,11 +12,10 @@ class QXmppMamTestHelper : public QObject
 {
     Q_OBJECT
 
-public slots:
-    void archivedMessageReceived(const QString &queryId, const QXmppMessage &message);
-    void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete);
-
 public:
+    Q_SLOT void archivedMessageReceived(const QString &queryId, const QXmppMessage &message);
+    Q_SLOT void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete);
+
     QXmppMessage m_expectedMessage;
     QXmppResultSetReply m_expectedResultSetReply;
     QString m_expectedQueryId;
@@ -31,16 +30,15 @@ class tst_QXmppMamManager : public QObject
 {
     Q_OBJECT
 
-private slots:
-    void initTestCase();
+private:
+    Q_SLOT void initTestCase();
 
-    void testHandleStanza_data();
-    void testHandleStanza();
+    Q_SLOT void testHandleStanza_data();
+    Q_SLOT void testHandleStanza();
 
-    void testHandleResultIq_data();
-    void testHandleResultIq();
+    Q_SLOT void testHandleResultIq_data();
+    Q_SLOT void testHandleResultIq();
 
-private:
     QXmppMamTestHelper m_helper;
     QXmppMamManager m_manager;
 };