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.

1 files changed, 5 insertions, 6 deletions

diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp
index 5439262c..598e623d 100644
--- a/tests/qxmppstanza/tst_qxmppstanza.cpp
+++ b/tests/qxmppstanza/tst_qxmppstanza.cpp
@@ -389,18 +389,17 @@ void tst_QXmppStanza::testErrorRetry()
 void tst_QXmppStanza::testErrorEnums()
 {
     QXmppStanza::Error err;
-    QVERIFY(!err.conditionOpt().has_value());
-    QVERIFY(!err.typeOpt().has_value());
+    QCOMPARE(err.condition(), QXmppStanza::Error::NoCondition);
+    QCOMPARE(err.type(), QXmppStanza::Error::NoType);
 
     err.setCondition(QXmppStanza::Error::BadRequest);
     err.setType(QXmppStanza::Error::Cancel);
-    QVERIFY(err.conditionOpt().has_value());
-    QVERIFY(err.typeOpt().has_value());
 
     err.setCondition(QXmppStanza::Error::Condition(-1));
     err.setType(QXmppStanza::Error::Type(-1));
-    QVERIFY(!err.conditionOpt().has_value());
-    QVERIFY(!err.typeOpt().has_value());
+
+    QCOMPARE(err.condition(), QXmppStanza::Error::NoCondition);
+    QCOMPARE(err.type(), QXmppStanza::Error::NoType);
 }
 
 void tst_QXmppStanza::testEncryption()