Refactor

src/recurring.cpp

@@ -15,6 +15,76 @@ QString schedule_desc(Schedule s) {
     }
 }
 
+
+RecurringPaymentInfo RecurringPaymentInfo::fromJson(QJsonObject j) {
+    RecurringPaymentInfo r;
+    r.hashid = j["hash"].toString();
+    r.desc = j["desc"].toString();
+    r.fromAddr = j["from"].toString();
+    r.toAddr = j["to"].toString();
+    r.amt = j["amt"].toString().toDouble();
+    r.memo = j["memo"].toString();
+    r.currency = j["currency"].toString();
+    r.schedule = (Schedule)j["schedule"].toInt();
+    r.frequency = j["frequency"].toInt();
+    r.numPayments = j["numpayments"].toInt();
+    r.startDate = QDateTime::fromSecsSinceEpoch(j["startdate"].toString().toLongLong());
+    r.completedPayments = j["completed"].toInt();
+
+    r.history = QList<HistoryItem>();
+    for (auto h : j["history"].toArray()) {
+        HistoryItem item;
+
+        item.paymentNumber = h.toObject()["paymentnumber"].toInt();
+        item.date = QDateTime::fromSecsSinceEpoch(h.toObject()["date"].toString().toLongLong());
+        item.txid = h.toObject()["txid"].toString();
+
+        r.history.append(item);
+    }
+
+    return r;
+}
+
+void RecurringPaymentInfo::updateHash() {
+    auto val = getScheduleDescription() + fromAddr + toAddr;
+    hashid = QString(QCryptographicHash::hash(val.toUtf8(), QCryptographicHash::Sha256).toHex());
+}
+
+QJsonObject RecurringPaymentInfo::toJson() {
+    QJsonArray historyJson;
+    for (auto h : history) {
+        historyJson.append(QJsonObject{
+            {"paymentnumber", h.paymentNumber},
+            {"date", QString::number(h.date.toSecsSinceEpoch())},
+            {"txid", h.txid}
+            });
+    }
+
+    auto j = QJsonObject{
+        {"hash", hashid},
+        {"desc", desc},
+        {"from", fromAddr},
+        {"to", toAddr},
+        {"amt", Settings::getDecimalString(amt)},
+        {"memo", memo},
+        {"currency", currency},
+        {"schedule", (int)schedule},
+        {"frequency", frequency},
+        {"numpayments", numPayments},
+        {"startdate", QString::number(startDate.toSecsSinceEpoch())},
+        {"completed", completedPayments},
+        {"history", historyJson}
+    };
+
+    return j;
+}
+
+QString RecurringPaymentInfo::getScheduleDescription() {
+    return "Pay " % (currency == "USD" ? Settings::getUSDFormat(amt) : Settings::getZECDisplayFormat(amt))
+        % " every " % schedule_desc(schedule) % ", starting " % startDate.toString("yyyy-MMM-dd")
+        % ", for " % QString::number(numPayments) % " payments";
+}
+
 // Returns a new Recurring payment info, created from the Tx. 
 // The caller needs to take ownership of the returned object.
 RecurringPaymentInfo* Recurring::getNewRecurringFromTx(QWidget* parent, MainWindow* main, Tx tx, RecurringPaymentInfo* rpi) {

src/recurring.h

@@ -37,76 +37,14 @@ struct RecurringPaymentInfo {
         QDateTime date;
         QString txid;
     };
+
     QList<HistoryItem> history;
+    
+    void        updateHash();
+    QString     getScheduleDescription();
+    QJsonObject toJson();
 
-    static RecurringPaymentInfo fromJson(QJsonObject j) {
-        RecurringPaymentInfo r;
-        r.hashid = j["hash"].toString();
-        r.desc = j["desc"].toString();
-        r.fromAddr = j["from"].toString();
-        r.toAddr = j["to"].toString();
-        r.amt = j["amt"].toString().toDouble();
-        r.memo = j["memo"].toString();
-        r.currency = j["currency"].toString();
-        r.schedule = (Schedule)j["schedule"].toInt();
-        r.frequency = j["frequency"].toInt();
-        r.numPayments = j["numpayments"].toInt();
-        r.startDate = QDateTime::fromSecsSinceEpoch(j["startdate"].toString().toLongLong());
-        r.completedPayments = j["completed"].toInt();
-
-        r.history = QList<HistoryItem>();
-        for (auto h : j["history"].toArray()) {
-            HistoryItem item;
-
-            item.paymentNumber = h.toObject()["paymentnumber"].toInt();
-            item.date = QDateTime::fromSecsSinceEpoch(h.toObject()["date"].toString().toLongLong());
-            item.txid = h.toObject()["txid"].toString();
-
-            r.history.append(item);
-        }
-
-        return r;
-    }
-
-    void updateHash() {
-        auto val = getScheduleDescription() + fromAddr + toAddr;
-        hashid = QString(QCryptographicHash::hash(val.toUtf8(), QCryptographicHash::Sha256).toHex());
-    }
-
-    QJsonObject toJson() {
-        QJsonArray historyJson;
-        for (auto h : history) {
-            historyJson.append(QJsonObject{
-                {"paymentnumber", h.paymentNumber},
-                {"date", QString::number(h.date.toSecsSinceEpoch())},
-                {"txid", h.txid}
-            });
-        }
-
-        auto j = QJsonObject{
-            {"hash", hashid},
-            {"desc", desc},
-            {"from", fromAddr},
-            {"to", toAddr},
-            {"amt", Settings::getDecimalString(amt)},
-            {"memo", memo},
-            {"currency", currency},
-            {"schedule", (int)schedule},
-            {"frequency", frequency},
-            {"numpayments", numPayments},
-            {"startdate", QString::number(startDate.toSecsSinceEpoch())},
-            {"completed", completedPayments},
-            {"history", historyJson}
-        };
-
-        return j;
-    }
-
-    QString getScheduleDescription() {
-        return "Pay " % (currency == "USD" ? Settings::getUSDFormat(amt) : Settings::getZECDisplayFormat(amt))
-            % " every " % schedule_desc(schedule) % ", starting " % startDate.toString("yyyy-MMM-dd")
-            % ", for " % QString::number(numPayments) % " payments";
-    }
+    static RecurringPaymentInfo fromJson(QJsonObject j);
 };
 
 class Recurring