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/QXmppTransferManager.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/client/QXmppTransferManager.h') diff --git a/src/client/QXmppTransferManager.h b/src/client/QXmppTransferManager.h index 7b7c82d4..d6dc1185 100644 --- a/src/client/QXmppTransferManager.h +++ b/src/client/QXmppTransferManager.h @@ -170,7 +170,7 @@ public: qint64 fileSize() const; /// \endcond -signals: +Q_SIGNALS: /// This signal is emitted when an error is encountered while /// processing the transfer job. void error(QXmppTransferJob::Error error); @@ -193,12 +193,12 @@ signals: /// This signal is emitted when the transfer job changes state. void stateChanged(QXmppTransferJob::State state); -public slots: +public Q_SLOTS: void abort(); void accept(const QString &filePath); void accept(QIODevice *output); -private slots: +private Q_SLOTS: void _q_terminated(); private: @@ -269,7 +269,7 @@ public: bool handleStanza(const QDomElement &element) override; /// \endcond -signals: +Q_SIGNALS: /// This signal is emitted when a new file transfer offer is received. /// /// To accept the transfer job, call the job's QXmppTransferJob::accept() method. @@ -284,7 +284,7 @@ signals: /// \sa QXmppTransferJob::finished() void jobFinished(QXmppTransferJob *job); -public slots: +public Q_SLOTS: QXmppTransferJob *sendFile(const QString &jid, const QString &filePath, const QString &description = QString()); QXmppTransferJob *sendFile(const QString &jid, QIODevice *device, const QXmppTransferFileInfo &fileInfo, const QString &sid = QString()); @@ -293,7 +293,7 @@ protected: void setClient(QXmppClient *client) override; /// \endcond -private slots: +private Q_SLOTS: void _q_iqReceived(const QXmppIq &); void _q_jobDestroyed(QObject *object); void _q_jobError(QXmppTransferJob::Error error); -- cgit v1.2.3