Merge pull request #129

01add29 Transfer: display number of split tx in transaction confirmation popup (Ilya Kitaev)

2 files changed, 14 insertions, 4 deletions

diff --git a/src/libwalletqt/PendingTransaction.cpp b/src/libwalletqt/PendingTransaction.cpp
index b1441f20..8140ceac 100644
--- a/src/libwalletqt/PendingTransaction.cpp
+++ b/src/libwalletqt/PendingTransaction.cpp
@@ -31,15 +31,22 @@ quint64 PendingTransaction::fee() const
     return m_pimpl->fee();
 }
 
-QList<QString> PendingTransaction::txid() const
+
+QStringList PendingTransaction::txid() const
 {
-    QList<QString> list;
+    QStringList list;
     std::vector<std::string> txid = m_pimpl->txid();
     for (const auto &t: txid)
         list.append(QString::fromStdString(t));
     return list;
 }
 
+
+quint64 PendingTransaction::txCount() const
+{
+    return m_pimpl->txCount();
+}
+
 PendingTransaction::PendingTransaction(Bitmonero::PendingTransaction *pt, QObject *parent)
     : QObject(parent), m_pimpl(pt)
 {
diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index 866431fb..3e31acbc 100644
--- a/src/libwalletqt/PendingTransaction.h
+++ b/src/libwalletqt/PendingTransaction.h
@@ -17,7 +17,8 @@ class PendingTransaction : public QObject
     Q_PROPERTY(quint64 amount READ amount)
     Q_PROPERTY(quint64 dust READ dust)
     Q_PROPERTY(quint64 fee READ fee)
-    Q_PROPERTY(QList<QString> txid READ txid)
+    Q_PROPERTY(QStringList txid READ txid)
+    Q_PROPERTY(quint64 txCount READ txCount)
 
 public:
     enum Status {
@@ -40,7 +41,9 @@ public:
     quint64 amount() const;
     quint64 dust() const;
     quint64 fee() const;
-    QList<QString> txid() const;
+    QStringList txid() const;
+    quint64 txCount() const;
+
 private:
     explicit PendingTransaction(Bitmonero::PendingTransaction * pt, QObject *parent = 0);