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/client/QXmppCallManager.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/client/QXmppCallManager.h')
| -rw-r--r-- | src/client/QXmppCallManager.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/QXmppCallManager.h b/src/client/QXmppCallManager.h index 47ad1984..8b611f89 100644 --- a/src/client/QXmppCallManager.h +++ b/src/client/QXmppCallManager.h @@ -102,7 +102,7 @@ public: /// Returns the video mode. QIODevice::OpenMode videoMode() const; -signals: +Q_SIGNALS: /// \brief This signal is emitted when a call is connected. /// /// Once this signal is emitted, you can connect a QAudioOutput and @@ -128,13 +128,13 @@ signals: /// \brief This signal is emitted when the video channel changes. void videoModeChanged(QIODevice::OpenMode mode); -public slots: +public Q_SLOTS: void accept(); void hangup(); void startVideo(); void stopVideo(); -private slots: +private Q_SLOTS: void localCandidatesChanged(); void terminated(); void updateOpenMode(); @@ -186,7 +186,7 @@ public: bool handleStanza(const QDomElement &element) override; /// \endcond -signals: +Q_SIGNALS: /// This signal is emitted when a new incoming call is received. /// /// To accept the call, invoke the call's QXmppCall::accept() method. @@ -196,7 +196,7 @@ signals: /// This signal is emitted when a call (incoming or outgoing) is started. void callStarted(QXmppCall *call); -public slots: +public Q_SLOTS: QXmppCall *call(const QString &jid); protected: @@ -204,7 +204,7 @@ protected: void setClient(QXmppClient *client) override; /// \endcond -private slots: +private Q_SLOTS: void _q_callDestroyed(QObject *object); void _q_disconnected(); void _q_iqReceived(const QXmppIq &iq); |
