libwalletqt: more cleanup

diff --git a/src/libwalletqt/ConstructionInfo.h b/src/libwalletqt/ConstructionInfo.h
index 5be7cc29ce19a2d47f9fe69b049fcf8ffeae42e9..a86485df1459c007a5fb849e8ee7415ee764b573 100644 (file)
--- a/src/libwalletqt/ConstructionInfo.h
+++ b/src/libwalletqt/ConstructionInfo.h
@@ -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

diff --git a/src/libwalletqt/PendingTransaction.cpp b/src/libwalletqt/PendingTransaction.cpp
index 726aade6476acae7064803518a3e74085c9381dc..6725b16c03003f37107af0b442e4764c94bea1cd 100644 (file)
--- a/src/libwalletqt/PendingTransaction.cpp
+++ b/src/libwalletqt/PendingTransaction.cpp
@@ -3,6 +3,7 @@
 
 #include "PendingTransaction.h"
 
+#include <QVariant>
 
 PendingTransaction::Status PendingTransaction::status() const
 {

diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index ec037b392aa3e63d3d3fd2dfb75552fa2bd1f22f..202b3a4469f3a5c8c0b99b307efd24e52fab2dc6 100644 (file)
--- a/src/libwalletqt/PendingTransaction.h
+++ b/src/libwalletqt/PendingTransaction.h
@@ -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;

diff --git a/src/libwalletqt/PendingTransactionInfo.h b/src/libwalletqt/PendingTransactionInfo.h
index 2667c6e3f4431acee0f020dcb8fbc01d2606c86a..28ec3829cf5eab0aa770378b7f5c769c291eeaab 100644 (file)
--- a/src/libwalletqt/PendingTransactionInfo.h
+++ b/src/libwalletqt/PendingTransactionInfo.h
@@ -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

diff --git a/src/libwalletqt/Transfer.h b/src/libwalletqt/Transfer.h
index aebf09e0560254e4518a4048deb1ce795887be62..65fe73cc053e7b4c58000ae5971a594d4c17714a 100644 (file)
--- a/src/libwalletqt/Transfer.h
+++ b/src/libwalletqt/Transfer.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)) {};