Merge master

2019-02-01 11:15:42 -08:00
parent 7c71457cc1
commit 45c3cee410
4 changed files with 14 additions and 18 deletions
--- a/src/rpc.h
+++ b/src/rpc.h
@@ -58,7 +58,7 @@ public:
    void sendZTransaction(json params, const std::function<void(json)>& cb, const std::function<void(QString)>& err);
    void watchTxStatus();

-    const QMap<QString, Tx> getWatchingTxns() { return watchingOps; }
+    const QMap<QString, WatchedTx> getWatchingTxns() { return watchingOps; }
    void addNewTxToWatch(const QString& newOpid, WatchedTx wtx); 

    const TxTableModel*               getTransactionsModel() { return transactionsTableModel; }