diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-02-11 21:03:10 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-02-11 21:39:00 +0100 |
| commit | cf54ba0b26b913e2f87c102f736886687505174b (patch) | |
| tree | 2e0de3bcc662f08e3cb129d37427a111f6823713 /src/base/QXmppRtpChannel.h | |
| parent | 279b92daac8eae020353b64b176cc0af800d3e6a (diff) | |
| download | qxmpp-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/QXmppRtpChannel.h')
| -rw-r--r-- | src/base/QXmppRtpChannel.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/base/QXmppRtpChannel.h b/src/base/QXmppRtpChannel.h index 0882bd57..cc934a59 100644 --- a/src/base/QXmppRtpChannel.h +++ b/src/base/QXmppRtpChannel.h @@ -109,14 +109,14 @@ public: qint64 pos() const override; bool seek(qint64 pos) override; -signals: +Q_SIGNALS: /// \brief This signal is emitted when a datagram needs to be sent. void sendDatagram(const QByteArray &ba); /// \brief This signal is emitted to send logging messages. void logMessage(QXmppLogger::MessageType type, const QString &msg); -public slots: +public Q_SLOTS: void datagramReceived(const QByteArray &ba); void startTone(QXmppRtpAudioChannel::Tone tone); void stopTone(QXmppRtpAudioChannel::Tone tone); @@ -148,7 +148,7 @@ protected: qint64 writeData(const char *data, qint64 maxSize) override; /// \endcond -private slots: +private Q_SLOTS: void emitSignals(); void writeDatagram(); @@ -284,11 +284,11 @@ public: void setEncoderFormat(const QXmppVideoFormat &format); void writeFrame(const QXmppVideoFrame &frame); -signals: +Q_SIGNALS: /// \brief This signal is emitted when a datagram needs to be sent. void sendDatagram(const QByteArray &ba); -public slots: +public Q_SLOTS: void datagramReceived(const QByteArray &ba); protected: |