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

diff --git a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp
index 6696081d..0c679aa5 100644
--- a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp
+++ b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp
@@ -17,19 +17,18 @@ class tst_QXmppTrustMemoryStorage : public QObject
 {
     Q_OBJECT
 
-private slots:
+private:
     // QXmppTrustMemoryStorage
-    void testSecurityPolicy();
-    void testOwnKeys();
-    void testKeys();
-    void testTrustLevels();
-    void testResetAll();
+    Q_SLOT void testSecurityPolicy();
+    Q_SLOT void testOwnKeys();
+    Q_SLOT void testKeys();
+    Q_SLOT void testTrustLevels();
+    Q_SLOT void testResetAll();
 
     // QXmppAtmTrustMemoryStorage
-    void atmTestKeysForPostponedTrustDecisions();
-    void atmTestResetAll();
+    Q_SLOT void atmTestKeysForPostponedTrustDecisions();
+    Q_SLOT void atmTestResetAll();
 
-private:
     QXmppTrustMemoryStorage m_trustStorage;
     QXmppAtmTrustMemoryStorage m_atmTrustStorage;
 };