Replace QXmpp::SendError with QXmppError everywhere

Part of #501.

5 files changed, 20 insertions, 19 deletions

diff --git a/src/client/QXmppCarbonManagerV2.cpp b/src/client/QXmppCarbonManagerV2.cpp
index fa162612..1c3a6fcc 100644
--- a/src/client/QXmppCarbonManagerV2.cpp
+++ b/src/client/QXmppCarbonManagerV2.cpp
@@ -62,7 +62,7 @@ auto firstChildElement(const QDomElement &el, const char *tagName, const char *x
     return QDomElement();
 }
 
-auto parseIq(std::variant<QDomElement, SendError> &&sendResult) -> std::optional<QXmppStanza::Error>
+auto parseIq(std::variant<QDomElement, QXmppError> &&sendResult) -> std::optional<QXmppError>
 {
     if (auto el = std::get_if<QDomElement>(&sendResult)) {
         auto iqType = el->attribute(QStringLiteral("type"));
@@ -71,11 +71,13 @@ auto parseIq(std::variant<QDomElement, SendError> &&sendResult) -> std::optional
         }
         QXmppIq iq;
         iq.parse(*el);
-        return iq.error();
-    } else if (auto err = std::get_if<SendError>(&sendResult)) {
-        using Error = QXmppStanza::Error;
-        return Error(Error::Wait, Error::UndefinedCondition,
-                     QStringLiteral("Couldn't send request: ") + err->text);
+        if (auto error = iq.errorOptional()) {
+            return QXmppError { error->text(), std::move(*error) };
+        }
+        // Only happens with IQs with type=error, but no <error/> element
+        return QXmppError { QStringLiteral("Unknown error received."), QXmppStanza::Error() };
+    } else if (auto err = std::get_if<QXmppError>(&sendResult)) {
+        return *err;
     }
     return {};
 }
@@ -163,7 +165,7 @@ void QXmppCarbonManagerV2::enableCarbons()
 
     await(client()->sendIq(CarbonEnableIq()), this, [this](QXmppClient::IqResult domResult) {
         if (auto err = parseIq(std::move(domResult))) {
-            warning("Could not enable message carbons: " % err->text());
+            warning("Could not enable message carbons: " % err->description);
         } else {
             info("Message Carbons enabled.");
         }
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index a6d55fa8..c0d7ee42 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -423,7 +423,7 @@ QFuture<QXmpp::SendResult> QXmppClient::send(QXmppStanza &&stanza, const std::op
                     reportFinishedResult(interface, result);
                 });
             } else {
-                reportFinishedResult(interface, { std::get<QXmpp::SendError>(result) });
+                reportFinishedResult(interface, { std::get<QXmppError>(result) });
             }
         });
 
@@ -526,7 +526,7 @@ QFuture<QXmppClient::IqResult> QXmppClient::sendSensitiveIq(QXmppIq &&iq, const
                 await(future, this, [this, interface](QXmppStream::IqResult result) mutable {
                     if (const auto encryptedDom = std::get_if<QDomElement>(&result)) {
                         if (!isIqResponse(*encryptedDom)) {
-                            QXmpp::SendError err {
+                            QXmppError err {
                                 QStringLiteral("Invalid IQ response received."),
                                 QXmpp::SendError::EncryptionError
                             };
@@ -543,24 +543,24 @@ QFuture<QXmppClient::IqResult> QXmppClient::sendSensitiveIq(QXmppIq &&iq, const
                                     // the IQ response from the other entity was not encrypted
                                     // then report IQ response without modifications
                                     interface.reportResult(encryptedDom);
-                                } else if (const auto error = std::get_if<QXmpp::SendError>(&result)) {
+                                } else if (const auto error = std::get_if<QXmppError>(&result)) {
                                     interface.reportResult(*error);
                                 }
                                 interface.reportFinished();
                             });
                         } else {
-                            interface.reportResult(QXmpp::SendError {
+                            interface.reportResult(QXmppError {
                                 QStringLiteral("No decryption extension found."),
                                 QXmpp::SendError::EncryptionError });
                             interface.reportFinished();
                         }
                     } else {
-                        interface.reportResult(std::get<QXmpp::SendError>(result));
+                        interface.reportResult(std::get<QXmppError>(result));
                         interface.reportFinished();
                     }
                 });
             } else {
-                interface.reportResult(std::get<QXmpp::SendError>(result));
+                interface.reportResult(std::get<QXmppError>(result));
                 interface.reportFinished();
             }
         });
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index daca8cc9..e99937cb 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -90,7 +90,7 @@ class QXMPP_EXPORT QXmppClient : public QXmppLoggable
     Q_PROPERTY(State state READ state NOTIFY stateChanged)
 
 public:
-    using IqResult = std::variant<QDomElement, QXmpp::SendError>;
+    using IqResult = std::variant<QDomElement, QXmppError>;
     using EmptyResult = std::variant<QXmpp::Success, QXmppStanza::Error>;
 
     /// An enumeration for type of error.
diff --git a/src/client/QXmppE2eeExtension.h b/src/client/QXmppE2eeExtension.h
index 295de1a3..f65fec45 100644
--- a/src/client/QXmppE2eeExtension.h
+++ b/src/client/QXmppE2eeExtension.h
@@ -25,10 +25,10 @@ public:
     {
     };
 
-    using MessageEncryptResult = std::variant<QByteArray, QXmpp::SendError>;
+    using MessageEncryptResult = std::variant<QByteArray, QXmppError>;
     using MessageDecryptResult = std::variant<QXmppMessage, NotEncrypted, QXmppError>;
-    using IqEncryptResult = std::variant<QByteArray, QXmpp::SendError>;
-    using IqDecryptResult = std::variant<QDomElement, NotEncrypted, QXmpp::SendError>;
+    using IqEncryptResult = std::variant<QByteArray, QXmppError>;
+    using IqDecryptResult = std::variant<QDomElement, NotEncrypted, QXmppError>;
 
     virtual QFuture<MessageEncryptResult> encryptMessage(QXmppMessage &&, const std::optional<QXmppSendStanzaParams> &) = 0;
     virtual QFuture<MessageDecryptResult> decryptMessage(QXmppMessage &&) = 0;
diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp
index 9050c02f..125e9a48 100644
--- a/src/client/QXmppMamManager.cpp
+++ b/src/client/QXmppMamManager.cpp
@@ -300,8 +300,7 @@ QFuture<QXmppMamManager::RetrieveResult> QXmppMamManager::retrieveMessages(const
                 d->ongoingRequests.erase(itr);
             }
         } else {
-            auto &error = std::get<QXmpp::SendError>(result);
-            itr->second.interface.reportResult(QXmppError { error.text, error });
+            itr->second.interface.reportResult(std::get<QXmppError>(result));
             itr->second.interface.reportFinished();
             d->ongoingRequests.erase(itr);
         }