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.

1 files changed, 3 insertions, 10 deletions

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::OptionsResult> 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::Result> QXmppPubSubManager::setSubscribeOptions(co
 ///
 QXmppTask<QXmppPubSubManager::NodeConfigResult> 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::NodeConfigResult> 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."), {} };
                    });
 }