aboutsummaryrefslogtreecommitdiff
path: root/src/base/QXmppStream.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/base/QXmppStream.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/base/QXmppStream.h')
-rw-r--r--src/base/QXmppStream.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h
index 05555d86..ce1f62f9 100644
--- a/src/base/QXmppStream.h
+++ b/src/base/QXmppStream.h
@@ -49,7 +49,7 @@ public:
virtual bool isConnected() const;
bool sendPacket(const QXmppStanza &);
-signals:
+Q_SIGNALS:
/// This signal is emitted when the stream is connected.
void connected();
@@ -98,11 +98,11 @@ private:
/// Sends an acknowledgement request as defined in \xep{0198}.
void sendAcknowledgementRequest();
-public slots:
+public Q_SLOTS:
virtual void disconnectFromHost();
virtual bool sendData(const QByteArray &);
-private slots:
+private Q_SLOTS:
void _q_socketConnected();
void _q_socketEncrypted();
void _q_socketError(QAbstractSocket::SocketError error);