From 46f3831fd238b4c1fb10d44e4531d9e59d574c97 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
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/base/QXmppStream.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/base/QXmppStream.cpp')

diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index d1a5ccd2..7274e242 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -251,8 +251,8 @@ QXmppTask<QXmppStream::IqResult> QXmppStream::sendIq(QXmppPacket &&packet, const
 
     auto sendFuture = send(std::move(packet));
     if (sendFuture.isFinished()) {
-        if (std::holds_alternative<QXmppError>(sendFuture.result())) {
-            // early exit (saves QFutureWatcher)
+        if (std::holds_alternative<QXmppError>(sendFuture.takeResult())) {
+            // early exit
             return makeReadyTask<IqResult>(std::get<QXmppError>(sendFuture.result()));
         }
     } else {
@@ -266,10 +266,7 @@ QXmppTask<QXmppStream::IqResult> QXmppStream::sendIq(QXmppPacket &&packet, const
         });
     }
 
-    IqState state {
-        {},
-        to,
-    };
+    IqState state { {}, to };
     auto task = state.interface.task();
     d->runningIqs.insert(id, std::move(state));
     return task;
-- 
cgit v1.2.3