3 files changed, 5 insertions, 5 deletions
diff --git a/jobs/roommessagesjob.cpp b/jobs/roommessagesjob.cpp
index 9af1b3a6..e5568f17 100644
--- a/jobs/roommessagesjob.cpp
+++ b/jobs/roommessagesjob.cpp
@@ -23,7 +23,7 @@ using namespace QMatrixClient;
 class RoomMessagesJob::Private
 {
     public:
-        Owning<RoomEvents> events;
+        RoomEvents events;
         QString end;
 };
 
@@ -46,9 +46,9 @@ RoomMessagesJob::~RoomMessagesJob()
     delete d;
 }
 
-RoomEvents RoomMessagesJob::releaseEvents()
+RoomEvents&& RoomMessagesJob::releaseEvents()
 {
-    return d->events.release();
+    return move(d->events);
 }
 
 QString RoomMessagesJob::end() const
diff --git a/jobs/roommessagesjob.h b/jobs/roommessagesjob.h
index 9680d52c..7b3fd9c9 100644
--- a/jobs/roommessagesjob.h
+++ b/jobs/roommessagesjob.h
@@ -34,7 +34,7 @@ namespace QMatrixClient
                             FetchDirection dir = FetchDirection::Backward);
             virtual ~RoomMessagesJob();
 
-            RoomEvents releaseEvents();
+            RoomEvents&& releaseEvents();
             QString end() const;
 
         protected:
diff --git a/jobs/syncjob.h b/jobs/syncjob.h
index 08bd773e..e9288486 100644
--- a/jobs/syncjob.h
+++ b/jobs/syncjob.h
@@ -30,7 +30,7 @@ namespace QMatrixClient
     {
         public:
             template <typename EventT>
-            class Batch : public Owning<EventsBatch<EventT>>
+            class Batch : public EventsBatch<EventT>
             {
                 public:
                     explicit Batch(QString k) : jsonKey(std::move(k)) { }