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/client/QXmppRosterManager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/client/QXmppRosterManager.h') diff --git a/src/client/QXmppRosterManager.h b/src/client/QXmppRosterManager.h index 5caf0011..e91b90be 100644 --- a/src/client/QXmppRosterManager.h +++ b/src/client/QXmppRosterManager.h @@ -86,7 +86,7 @@ public: bool handleStanza(const QDomElement &element) override; /// \endcond -public slots: +public Q_SLOTS: bool acceptSubscription(const QString &bareJid, const QString &reason = QString()); bool refuseSubscription(const QString &bareJid, const QString &reason = QString()); bool addItem(const QString &bareJid, const QString &name = QString(), const QSet &groups = QSet()); @@ -95,7 +95,7 @@ public slots: bool subscribe(const QString &bareJid, const QString &reason = QString()); bool unsubscribe(const QString &bareJid, const QString &reason = QString()); -signals: +Q_SIGNALS: /// This signal is emitted when the Roster IQ is received after a successful /// connection. That is the roster entries are empty before this signal is emitted. /// One should use getRosterBareJids() and getRosterEntry() only after @@ -126,7 +126,7 @@ signals: /// removed as a result of roster push. void itemRemoved(const QString &bareJid); -private slots: +private Q_SLOTS: void _q_connected(); void _q_disconnected(); void _q_presenceReceived(const QXmppPresence &); -- cgit v1.2.3