4 files changed, 14 insertions, 20 deletions
diff --git a/jobs/passwordlogin.cpp b/jobs/passwordlogin.cpp
index 9af025e6..8abfe66a 100644
--- a/jobs/passwordlogin.cpp
+++ b/jobs/passwordlogin.cpp
@@ -29,18 +29,15 @@ class PasswordLogin::Private
 };
 
 PasswordLogin::PasswordLogin(QString user, QString password)
-    : BaseJob(HttpVerb::Post, "PasswordLogin"
-            , "_matrix/client/r0/login"
-            , Query()
-            , Data(
-                { { "type", QStringLiteral("m.login.password") }
-                , { "user", user }
-                , { "password", password }
-                })
-            , false
-            )
+    : BaseJob(HttpVerb::Post, "PasswordLogin",
+              "_matrix/client/r0/login", Query(), Data(), false)
     , d(new Private)
 {
+    QJsonObject _data;
+    _data.insert("type", QStringLiteral("m.login.password"));
+    _data.insert("user", user);
+    _data.insert("password", password);
+    setRequestData(_data);
 }
 
 PasswordLogin::~PasswordLogin()
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..aed36e0b 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)) { }
@@ -58,12 +58,9 @@ namespace QMatrixClient
 
             SyncRoomData(const QString& roomId, JoinState joinState_,
                          const QJsonObject& room_);
+            SyncRoomData(SyncRoomData&&) = default;
+            SyncRoomData& operator=(SyncRoomData&&) = default;
     };
-}  // namespace QMatrixClient
-Q_DECLARE_TYPEINFO(QMatrixClient::SyncRoomData, Q_MOVABLE_TYPE);
-
-namespace QMatrixClient
-{
     // QVector cannot work with non-copiable objects, std::vector can.
     using SyncDataList = std::vector<SyncRoomData>;