Merge branch 'master' into e2ee-enc-mng

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index ab31a75d..254eb9a9 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -53,6 +53,9 @@ namespace QMatrixClient
                 QJsonObject originalJson;
 
             protected:
+                Base(const Base&) = default;
+                Base(Base&&) = default;
+
                 virtual void fillJson(QJsonObject* o) const = 0;
         };
 
@@ -167,11 +170,14 @@ namespace QMatrixClient
         class TypedBase: public Base
         {
             public:
-                explicit TypedBase(const QJsonObject& o = {}) : Base(o) { }
+                explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) { }
                 virtual QMimeType type() const = 0;
                 virtual const FileInfo* fileInfo() const { return nullptr; }
                 virtual FileInfo* fileInfo() { return nullptr; }
                 virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
+
+            protected:
+                using Base::Base;
         };
 
         /**