merge and updates

This commit is contained in:
DenioD
2019-10-27 19:46:36 +01:00
35 changed files with 661 additions and 1253 deletions

View File

@@ -3,6 +3,7 @@
#include "precompiled.h"
#include "datamodel.h"
#include "camount.h"
class BalancesTableModel : public QAbstractTableModel
@@ -11,7 +12,7 @@ public:
BalancesTableModel(QObject* parent);
~BalancesTableModel();
void setNewData(const QMap<QString, double> balances, const QList<UnspentOutput> outputs);
void setNewData(const QList<QString> zaddrs, const QList<QString> taddrs, const QMap<QString, CAmount> balances, const QList<UnspentOutput> outputs);
int rowCount(const QModelIndex &parent) const;
int columnCount(const QModelIndex &parent) const;
@@ -19,8 +20,8 @@ public:
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
private:
QList<std::tuple<QString, double>>* modeldata = nullptr;
QList<UnspentOutput>* utxos = nullptr;
QList<std::tuple<QString, CAmount>>* modeldata = nullptr;
QList<UnspentOutput>* unspentOutputs = nullptr;
bool loading = true;
};