aboutsummaryrefslogtreecommitdiff
path: root/src/server/QXmppServer.h
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2020-02-11 21:03:10 +0100
committerLNJ <lnj@kaidan.im>2020-02-11 21:39:00 +0100
commitcf54ba0b26b913e2f87c102f736886687505174b (patch)
tree2e0de3bcc662f08e3cb129d37427a111f6823713 /src/server/QXmppServer.h
parent279b92daac8eae020353b64b176cc0af800d3e6a (diff)
downloadqxmpp-cf54ba0b26b913e2f87c102f736886687505174b.tar.gz
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>
Diffstat (limited to 'src/server/QXmppServer.h')
-rw-r--r--src/server/QXmppServer.h8
1 files changed, 4 insertions, 4 deletions
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);