mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
libwalletqt: more cleanup
This commit is contained in:
parent
a674770d89
commit
34e5703f9c
5 changed files with 3 additions and 30 deletions
|
@ -14,12 +14,6 @@ class Transfer;
|
|||
class ConstructionInfo : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(quint64 unlockTime READ unlockTime)
|
||||
Q_PROPERTY(QSet<quint32> subaddressIndices READ subaddressIndices)
|
||||
Q_PROPERTY(QVector<QString> subaddresses READ subaddresses)
|
||||
Q_PROPERTY(quint64 minMixinCount READ minMixinCount)
|
||||
Q_PROPERTY(QList<Input*> inputs READ inputs)
|
||||
Q_PROPERTY(QList<Transfer*> outputs READ outputs)
|
||||
|
||||
public:
|
||||
quint64 unlockTime() const;
|
||||
|
@ -42,5 +36,4 @@ private:
|
|||
mutable QList<Transfer*> m_outputs;
|
||||
};
|
||||
|
||||
|
||||
#endif //FEATHER_CONSTRUCTIONINFO_H
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#include "PendingTransaction.h"
|
||||
|
||||
#include <QVariant>
|
||||
|
||||
PendingTransaction::Status PendingTransaction::status() const
|
||||
{
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#include <QObject>
|
||||
#include <QList>
|
||||
#include <QVariant>
|
||||
|
||||
#include <wallet/api/wallet2_api.h>
|
||||
#include "PendingTransactionInfo.h"
|
||||
|
@ -14,14 +13,6 @@
|
|||
class PendingTransaction : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(Status status READ status)
|
||||
Q_PROPERTY(QString errorString READ errorString)
|
||||
Q_PROPERTY(quint64 amount READ amount)
|
||||
Q_PROPERTY(quint64 dust READ dust)
|
||||
Q_PROPERTY(quint64 fee READ fee)
|
||||
Q_PROPERTY(QStringList txid READ txid)
|
||||
Q_PROPERTY(quint64 txCount READ txCount)
|
||||
Q_PROPERTY(QList<QVariant> subaddrIndices READ subaddrIndices)
|
||||
|
||||
public:
|
||||
enum Status {
|
||||
|
@ -41,7 +32,7 @@ public:
|
|||
|
||||
Status status() const;
|
||||
QString errorString() const;
|
||||
Q_INVOKABLE bool commit();
|
||||
bool commit();
|
||||
bool saveToFile(const QString &fileName);
|
||||
quint64 amount() const;
|
||||
quint64 dust() const;
|
||||
|
|
|
@ -15,16 +15,6 @@ class Transfer;
|
|||
class PendingTransactionInfo : public ConstructionInfo
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(quint64 fee READ fee)
|
||||
Q_PROPERTY(quint64 dust READ dust)
|
||||
Q_PROPERTY(bool dustAddedToFee READ dustAddedToFee)
|
||||
Q_PROPERTY(QString txKey READ txKey)
|
||||
Q_PROPERTY(quint64 unlockTime READ unlockTime)
|
||||
Q_PROPERTY(QSet<quint32> subaddressIndices READ subaddressIndices)
|
||||
Q_PROPERTY(QVector<QString> subaddresses READ subaddresses)
|
||||
Q_PROPERTY(quint64 minMixinCount READ minMixinCount)
|
||||
Q_PROPERTY(QList<Input*> inputs READ inputs)
|
||||
Q_PROPERTY(QList<Transfer*> outputs READ outputs)
|
||||
|
||||
public:
|
||||
quint64 fee() const;
|
||||
|
@ -42,5 +32,4 @@ private:
|
|||
QString m_txKey;
|
||||
};
|
||||
|
||||
|
||||
#endif //FEATHER_PENDINGTRANSACTIONINFO_H
|
||||
|
|
|
@ -11,8 +11,7 @@
|
|||
class Transfer : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(quint64 amount READ amount)
|
||||
Q_PROPERTY(QString address READ address)
|
||||
|
||||
private:
|
||||
explicit Transfer(uint64_t _amount, QString _address, QObject *parent = 0)
|
||||
: QObject(parent), m_amount(_amount), m_address(std::move(_address)) {};
|
||||
|
|
Loading…
Reference in a new issue