From 4e521ae29a55deaab2ca9d62cddd3791015c6cfb Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 6 Jul 2019 21:58:41 +0900
Subject: EncryptionEvent: Adjust upon merge from master
---
lib/events/encryptionevent.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 6a4a1c67..b9e108f0 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -56,8 +56,10 @@ namespace QMatrixClient
explicit EncryptionEvent(const QJsonObject& obj = {}) // TODO: apropriate default value
: StateEvent(typeId(), obj)
{ }
- EncryptionEvent(EncryptionEventContent&& c)
- : StateEvent(typeId(), matrixTypeId(), c)
+ template <typename... ArgTs>
+ EncryptionEvent(ArgTs&&... contentArgs)
+ : StateEvent(typeId(), matrixTypeId(), QString(),
+ std::forward<ArgTs>(contentArgs)...)
{ }
EncryptionType encryption() const { return content().encryption; }
--
cgit v1.2.3