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

diff --git a/src/client/QXmppCall.h b/src/client/QXmppCall.h
index f13a8cc3..a504ff29 100644
--- a/src/client/QXmppCall.h
+++ b/src/client/QXmppCall.h
@@ -55,39 +55,36 @@ public:
     QXmppCallStream *audioStream() const;
     QXmppCallStream *videoStream() const;
 
-signals:
     /// \brief This signal is emitted when a call is connected.
     ///
     /// Once this signal is emitted, you can connect a QAudioOutput and
     /// QAudioInput to the call. You can determine the appropriate clockrate
     /// and the number of channels by calling payloadType().
-    void connected();
+    Q_SIGNAL void connected();
 
     /// \brief This signal is emitted when a call is finished.
     ///
     /// Note: Do not delete the call in the slot connected to this signal,
     /// instead use deleteLater().
-    void finished();
+    Q_SIGNAL void finished();
 
     /// \brief This signal is emitted when the remote party is ringing.
-    void ringing();
+    Q_SIGNAL void ringing();
 
     /// \brief This signal is emitted when the call state changes.
-    void stateChanged(QXmppCall::State state);
+    Q_SIGNAL void stateChanged(QXmppCall::State state);
 
     /// \brief This signal is emitted when a stream is created.
-    void streamCreated(QXmppCallStream *stream);
+    Q_SIGNAL void streamCreated(QXmppCallStream *stream);
 
-public slots:
-    void accept();
-    void hangup();
-    void addVideo();
-
-private slots:
-    void localCandidatesChanged();
-    void terminated();
+    Q_SLOT void accept();
+    Q_SLOT void hangup();
+    Q_SLOT void addVideo();
 
 private:
+    Q_SLOT void localCandidatesChanged();
+    Q_SLOT void terminated();
+
     QXmppCall(const QString &jid, QXmppCall::Direction direction, QXmppCallManager *parent);
 
     QXmppCallPrivate *d;