From 4943cbea505aacdd33bf93c3365588ba73785d4d Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 13 Oct 2016 09:07:15 +0900
Subject: BaseJob: Use saved parameters instead of overriding apiPath(),
 query() and data() in each job class

---
 jobs/passwordlogin.cpp | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'jobs/passwordlogin.cpp')

diff --git a/jobs/passwordlogin.cpp b/jobs/passwordlogin.cpp
index c85e4c13..a7a405aa 100644
--- a/jobs/passwordlogin.cpp
+++ b/jobs/passwordlogin.cpp
@@ -29,21 +29,24 @@ using namespace QMatrixClient;
 class PasswordLogin::Private
 {
     public:
-        Private() {}
-
-        QString user;
-        QString password;
         QString returned_id;
         QString returned_server;
         QString returned_token;
 };
 
 PasswordLogin::PasswordLogin(ConnectionData* connection, QString user, QString password)
-    : BaseJob(connection, JobHttpType::PostJob, "PasswordLogin", false)
+    : BaseJob(connection, JobHttpType::PostJob, "PasswordLogin"
+            , "_matrix/client/r0/login"
+            , Query()
+            , Data(
+                { { "type", "m.login.password" }
+                , { "user", user }
+                , { "password", password }
+                })
+            , false
+            )
     , d(new Private)
 {
-    d->user = user;
-    d->password = password;
 }
 
 PasswordLogin::~PasswordLogin()
@@ -66,20 +69,6 @@ QString PasswordLogin::server()
     return d->returned_server;
 }
 
-QString PasswordLogin::apiPath() const
-{
-    return "_matrix/client/r0/login";
-}
-
-QJsonObject PasswordLogin::data() const
-{
-    QJsonObject json;
-    json.insert("type", QLatin1String("m.login.password"));
-    json.insert("user", d->user);
-    json.insert("password", d->password);
-    return json;
-}
-
 BaseJob::Status PasswordLogin::parseJson(const QJsonDocument& data)
 {
     QJsonObject json = data.object();
-- 
cgit v1.2.3