From cf54ba0b26b913e2f87c102f736886687505174b Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 11 Feb 2020 21:03:10 +0100 Subject: 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 --- src/base/QXmppStream.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/base/QXmppStream.h') 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); -- cgit v1.2.3