From 46f3831fd238b4c1fb10d44e4531d9e59d574c97 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sun, 22 Jan 2023 18:06:09 +0100 Subject: Use QXmppError in all IQ results instead of StanzaError This allows us to report different error types with more information and makes it possible to distinguish stanza errors and errors generated locally. Part of #501. --- src/client/QXmppPubSubManager.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/client/QXmppPubSubManager.cpp') diff --git a/src/client/QXmppPubSubManager.cpp b/src/client/QXmppPubSubManager.cpp index a10fc25b..18ad9d7a 100644 --- a/src/client/QXmppPubSubManager.cpp +++ b/src/client/QXmppPubSubManager.cpp @@ -596,12 +596,7 @@ QXmppTask QXmppPubSubManager::requestSubscrib return *options; } } - - // "real" stanza errors are already handled - using Error = QXmppStanza::Error; - return Error(Error::Cancel, - Error::Condition::InternalServerError, - QStringLiteral("Server returned invalid data form.")); + return QXmppError { QStringLiteral("Server returned invalid data form."), {} }; }); } @@ -655,8 +650,6 @@ QXmppTask QXmppPubSubManager::setSubscribeOptions(co /// QXmppTask QXmppPubSubManager::requestNodeConfiguration(const QString &service, const QString &nodeName) { - using Error = QXmppStanza::Error; - PubSubIq request; request.setType(QXmppIq::Get); request.setTo(service); @@ -669,9 +662,9 @@ QXmppTask QXmppPubSubManager::requestNodeC if (const auto config = QXmppPubSubNodeConfig::fromDataForm(*dataForm)) { return *config; } - return Error(Error::Cancel, Error::UndefinedCondition, QStringLiteral("Server returned invalid data form.")); + return QXmppError { QStringLiteral("Server returned invalid data form."), {} }; } - return Error(Error::Cancel, Error::UndefinedCondition, QStringLiteral("Server returned no data form.")); + return QXmppError { QStringLiteral("Server returned no data form."), {} }; }); } -- cgit v1.2.3