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/QXmppStun.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/QXmppStun.h')
| -rw-r--r-- | src/base/QXmppStun.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/base/QXmppStun.h b/src/base/QXmppStun.h index c801e4af..f46916c8 100644 --- a/src/base/QXmppStun.h +++ b/src/base/QXmppStun.h @@ -176,12 +176,12 @@ public: static QList<QHostAddress> discoverAddresses(); static QList<QUdpSocket *> reservePorts(const QList<QHostAddress> &addresses, int count, QObject *parent = nullptr); -public slots: +public Q_SLOTS: void close(); void connectToHost(); qint64 sendDatagram(const QByteArray &datagram); -private slots: +private Q_SLOTS: void checkCandidates(); void handleDatagram(const QByteArray &datagram, const QHostAddress &host, quint16 port); void turnConnected(); @@ -189,7 +189,7 @@ private slots: void updateGatheringState(); void writeStun(const QXmppStunMessage &request); -signals: +Q_SIGNALS: /// \brief This signal is emitted once ICE negotiation succeeds. void connected(); @@ -280,7 +280,7 @@ public: /// candidates. GatheringState gatheringState() const; -signals: +Q_SIGNALS: /// \brief This signal is emitted once ICE negotiation succeeds. void connected(); @@ -293,11 +293,11 @@ signals: /// \brief This signal is emitted when the list of local candidates changes. void localCandidatesChanged(); -public slots: +public Q_SLOTS: void close(); void connectToHost(); -private slots: +private Q_SLOTS: void slotConnected(); void slotGatheringStateChanged(); void slotTimeout(); |
