1 files changed, 9 insertions, 10 deletions
diff --git a/lib/e2ee/qolmoutboundsession.h b/lib/e2ee/qolmoutboundsession.h
index 32ba2b3b..8058bbb1 100644
--- a/lib/e2ee/qolmoutboundsession.h
+++ b/lib/e2ee/qolmoutboundsession.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "olm/olm.h"
-#include "e2ee/qolmerrors.h"
 #include "e2ee/e2ee.h"
+
 #include <memory>
+#include <olm/olm.h>
 
 namespace Quotient {
 
@@ -19,15 +19,15 @@ public:
     ~QOlmOutboundGroupSession();
     //! Creates a new instance of `QOlmOutboundGroupSession`.
     //! Throw OlmError on errors
-    static std::unique_ptr<QOlmOutboundGroupSession> create();
+    static QOlmOutboundGroupSessionPtr create();
     //! Serialises a `QOlmOutboundGroupSession` to encrypted Base64.
-    std::variant<QByteArray, QOlmError> pickle(const PicklingMode &mode);
+    QOlmExpected<QByteArray> pickle(const PicklingMode &mode);
     //! Deserialises from encrypted Base64 that was previously obtained by
     //! pickling a `QOlmOutboundGroupSession`.
-    static std::variant<std::unique_ptr<QOlmOutboundGroupSession>, QOlmError>
-    unpickle(QByteArray& pickled, const PicklingMode& mode);
+    static QOlmExpected<QOlmOutboundGroupSessionPtr> unpickle(
+        QByteArray& pickled, const PicklingMode& mode);
     //! Encrypts a plaintext message using the session.
-    std::variant<QByteArray, QOlmError> encrypt(const QString &plaintext);
+    QOlmExpected<QByteArray> encrypt(const QString& plaintext);
 
     //! Get the current message index for this session.
     //!
@@ -42,11 +42,10 @@ public:
     //!
     //! Each message is sent with a different ratchet key. This function returns the
     //! ratchet key that will be used for the next message.
-    std::variant<QByteArray, QOlmError> sessionKey() const;
+    QOlmExpected<QByteArray> sessionKey() const;
     QOlmOutboundGroupSession(OlmOutboundGroupSession *groupSession);
 private:
     OlmOutboundGroupSession *m_groupSession;
 };
 
-using QOlmOutboundGroupSessionPtr = std::unique_ptr<QOlmOutboundGroupSession>;
-}
+} // namespace Quotient