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/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp
index eea55649..a58755ac 100644
--- a/tests/qxmppsocks/tst_qxmppsocks.cpp
+++ b/tests/qxmppsocks/tst_qxmppsocks.cpp
@@ -12,17 +12,16 @@ class tst_QXmppSocks : public QObject
 {
     Q_OBJECT
 
-private slots:
-    void init();
-    void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port);
+private:
+    Q_SLOT void init();
+    Q_SLOT void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port);
 
-    void testClient_data();
-    void testClient();
-    void testClientAndServer();
-    void testServer_data();
-    void testServer();
+    Q_SLOT void testClient_data();
+    Q_SLOT void testClient();
+    Q_SLOT void testClientAndServer();
+    Q_SLOT void testServer_data();
+    Q_SLOT void testServer();
 
-private:
     QTcpSocket *m_connectionSocket;
     QString m_connectionHostName;
     quint16 m_connectionPort;