diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-03-31 21:51:20 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-04-01 14:06:06 +0200 |
| commit | aac82e6884a0db5345d3f43b1916f725349b2e4c (patch) | |
| tree | fb3ab7670e91b36466e5d11d41e6a2dc7cf7240a /src/base | |
| parent | 49ead66e9b4d5914dfd9c33e62b0311d4d8eb940 (diff) | |
| download | qxmpp-aac82e6884a0db5345d3f43b1916f725349b2e4c.tar.gz | |
Add missing optional exclude to deprecated PaymentRequired
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/QXmppStanza.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h index 8d1c8860..8eb1b47a 100644 --- a/src/base/QXmppStanza.h +++ b/src/base/QXmppStanza.h @@ -130,21 +130,22 @@ public: NotAcceptable, ///< The request does not meet the defined critera. NotAllowed, ///< No entity is allowed to perform the request. NotAuthorized, ///< The request should be resent after authentication. +#if QXMPP_DEPRECATED_SINCE(1, 3) /// Payment is required to perform the request. /// \deprecated This error condition is deprecated since QXmpp 1.3 as it was not adopted in RFC6120. - QT_DEPRECATED_X("The <payment-required/> error was removed in RFC6120") - PaymentRequired, - RecipientUnavailable, ///< The recipient is unavailable. - Redirect, ///< The requested resource is available elsewhere. This is used in combination with a redirection URI. - RegistrationRequired, ///< The requesting entity needs to register first. - RemoteServerNotFound, ///< The remote server could not be found. - RemoteServerTimeout, ///< The connection to the server could not be established or timed out. - ResourceConstraint, ///< The recipient lacks system resources to perform the request. - ServiceUnavailable, ///< The service is currently not available. - SubscriptionRequired, ///< The requester needs to subscribe first. - UndefinedCondition, ///< An undefined condition was hit. - UnexpectedRequest, ///< The request was unexpected. - PolicyViolation ///< The entity has violated a local server policy. \since QXmpp 1.3 + QT_DEPRECATED_X("The <payment-required/> error was removed in RFC6120") PaymentRequired, +#endif + RecipientUnavailable = 12, ///< The recipient is unavailable. + Redirect, ///< The requested resource is available elsewhere. This is used in combination with a redirection URI. + RegistrationRequired, ///< The requesting entity needs to register first. + RemoteServerNotFound, ///< The remote server could not be found. + RemoteServerTimeout, ///< The connection to the server could not be established or timed out. + ResourceConstraint, ///< The recipient lacks system resources to perform the request. + ServiceUnavailable, ///< The service is currently not available. + SubscriptionRequired, ///< The requester needs to subscribe first. + UndefinedCondition, ///< An undefined condition was hit. + UnexpectedRequest, ///< The request was unexpected. + PolicyViolation ///< The entity has violated a local server policy. \since QXmpp 1.3 }; Error(); |