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

diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index c167586a..29b9da15 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -35,15 +35,15 @@ class QXmppCarbonTestHelper : public QObject
 {
     Q_OBJECT
 
-public slots:
-    void messageSent(const QXmppMessage &msg)
+public:
+    Q_SLOT void messageSent(const QXmppMessage &msg)
     {
         m_signalTriggered = true;
         QCOMPARE(m_expectSent, true);
 
         compareMessages(m_expectedMessage, msg);
     }
-    void messageReceived(const QXmppMessage &msg)
+    Q_SLOT void messageReceived(const QXmppMessage &msg)
     {
         m_signalTriggered = true;
         QCOMPARE(m_expectSent, false);
@@ -51,7 +51,6 @@ public slots:
         compareMessages(m_expectedMessage, msg);
     }
 
-public:
     QXmppMessage m_expectedMessage;
     bool m_expectSent;
     bool m_signalTriggered;
@@ -73,13 +72,12 @@ class tst_QXmppCarbonManager : 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();
 
-private:
     QXmppCarbonTestHelper m_helper;
     MessageHandler *m_messageHandler;
     QXmppCarbonManager *m_managerV1;