From 93c35b3f1260f3dfafbc77609fcadb9a40a7b97f Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 29 Dec 2022 21:44:40 +0100 Subject: StanzaError: Remove optional getter/settters for type/condition The whole QXmppStanza::Error is now used optionally in QXmppStanza, so type and condition of the error don't need to be optionals as well. Part of #512. --- src/omemo/QXmppOmemoManager_p.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/omemo/QXmppOmemoManager_p.cpp') diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp index 2de0b5f3..805f0b56 100644 --- a/src/omemo/QXmppOmemoManager_p.cpp +++ b/src/omemo/QXmppOmemoManager_p.cpp @@ -1374,9 +1374,8 @@ QByteArray ManagerPrivate::createSceEnvelope(const T &stanza) } else { // If the IQ stanza contains an error (i.e., it is an error response), that error is // serialized instead of actual content. - const auto error = stanza.error(); - if (error.typeOpt()) { - error.toXml(&writer); + if (auto err = stanza.errorOptional()) { + err->toXml(&writer); } else { stanza.toXmlElementFromChild(&writer); } -- cgit v1.2.3