Make QXmpp work with projects using QT_NO_KEYWORDS

This replaces all occurencies of 'slots' and 'signals' with 'Q_SLOTS'
and 'Q_SIGNALS'. This allows for smooth integration with software
projects that need QT_NO_KEYWORDS, such as those ones that rely on
boost libraries.

Closes #115.

Co-authored-by: Tommaso Cucinotta <tommaso.cucinotta@santannapisa.it>

5 files changed, 13 insertions, 13 deletions

diff --git a/src/server/QXmppIncomingClient.h b/src/server/QXmppIncomingClient.h
index e5c5700d..9266fe40 100644
--- a/src/server/QXmppIncomingClient.h
+++ b/src/server/QXmppIncomingClient.h
@@ -50,7 +50,7 @@ public:
     void setInactivityTimeout(int secs);
     void setPasswordChecker(QXmppPasswordChecker *checker);
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when an element is received.
     void elementReceived(const QDomElement &element);
 
@@ -60,7 +60,7 @@ protected:
     void handleStanza(const QDomElement &element) override;
     /// \endcond
 
-private slots:
+private Q_SLOTS:
     void onDigestReply();
     void onPasswordReply();
     void onSocketDisconnected();
diff --git a/src/server/QXmppIncomingServer.h b/src/server/QXmppIncomingServer.h
index 392616ec..1a4c1f80 100644
--- a/src/server/QXmppIncomingServer.h
+++ b/src/server/QXmppIncomingServer.h
@@ -45,7 +45,7 @@ public:
     bool isConnected() const override;
     QString localStreamId() const;
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when a dialback verify request is received.
     void dialbackRequestReceived(const QXmppDialback &result);
 
@@ -58,7 +58,7 @@ protected:
     void handleStream(const QDomElement &streamElement) override;
     /// \endcond
 
-private slots:
+private Q_SLOTS:
     void slotDialbackResponseReceived(const QXmppDialback &dialback);
     void slotSocketDisconnected();
 
diff --git a/src/server/QXmppOutgoingServer.h b/src/server/QXmppOutgoingServer.h
index c0a6a589..438ac64c 100644
--- a/src/server/QXmppOutgoingServer.h
+++ b/src/server/QXmppOutgoingServer.h
@@ -53,7 +53,7 @@ public:
 
     QString remoteDomain() const;
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when a dialback verify response is received.
     void dialbackResponseReceived(const QXmppDialback &response);
 
@@ -64,11 +64,11 @@ protected:
     void handleStanza(const QDomElement &stanzaElement) override;
     /// \endcond
 
-public slots:
+public Q_SLOTS:
     void connectToHost(const QString &domain);
     void queueData(const QByteArray &data);
 
-private slots:
+private Q_SLOTS:
     void _q_dnsLookupFinished();
     void _q_socketDisconnected();
     void sendDialback();
diff --git a/src/server/QXmppPasswordChecker.h b/src/server/QXmppPasswordChecker.h
index 160b879e..8b4b2969 100644
--- a/src/server/QXmppPasswordChecker.h
+++ b/src/server/QXmppPasswordChecker.h
@@ -80,11 +80,11 @@ public:
 
     bool isFinished() const;
 
-public slots:
+public Q_SLOTS:
     void finish();
     void finishLater();
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when the reply has finished.
     void finished();
 
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index ce0e456a..36923c6c 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -97,7 +97,7 @@ public:
 
     void addIncomingClient(QXmppIncomingClient *stream);
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when a client has connected.
     void clientConnected(const QString &jid);
 
@@ -107,10 +107,10 @@ signals:
     /// This signal is emitted when the logger changes.
     void loggerChanged(QXmppLogger *logger);
 
-public slots:
+public Q_SLOTS:
     void handleElement(const QDomElement &element);
 
-private slots:
+private Q_SLOTS:
     void _q_clientConnection(QSslSocket *socket);
     void _q_clientConnected();
     void _q_clientDisconnected();
@@ -141,7 +141,7 @@ public:
     void setLocalCertificate(const QSslCertificate &certificate);
     void setPrivateKey(const QSslKey &key);
 
-signals:
+Q_SIGNALS:
     /// This signal is emitted when a new connection is established.
     void newConnection(QSslSocket *socket);