From 3a33ddeecdea52bbf35549ffb0d4904eba1ebff6 Mon Sep 17 00:00:00 2001 From: xiphon Date: Wed, 28 Aug 2019 16:21:53 +0000 Subject: fix invalid include paths, compilation warnings, update README.md --- src/libwalletqt/UnsignedTransaction.cpp | 6 +++--- src/libwalletqt/UnsignedTransaction.h | 6 +++--- src/libwalletqt/Wallet.cpp | 8 ++++---- src/libwalletqt/Wallet.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/libwalletqt') diff --git a/src/libwalletqt/UnsignedTransaction.cpp b/src/libwalletqt/UnsignedTransaction.cpp index 77e2614d..99b7740d 100644 --- a/src/libwalletqt/UnsignedTransaction.cpp +++ b/src/libwalletqt/UnsignedTransaction.cpp @@ -40,7 +40,7 @@ QString UnsignedTransaction::errorString() const return QString::fromStdString(m_pimpl->errorString()); } -quint64 UnsignedTransaction::amount(int index) const +quint64 UnsignedTransaction::amount(size_t index) const { std::vector arr = m_pimpl->amount(); if(index > arr.size() - 1) @@ -48,7 +48,7 @@ quint64 UnsignedTransaction::amount(int index) const return arr[index]; } -quint64 UnsignedTransaction::fee(int index) const +quint64 UnsignedTransaction::fee(size_t index) const { std::vector arr = m_pimpl->fee(); if(index > arr.size() - 1) @@ -56,7 +56,7 @@ quint64 UnsignedTransaction::fee(int index) const return arr[index]; } -quint64 UnsignedTransaction::mixin(int index) const +quint64 UnsignedTransaction::mixin(size_t index) const { std::vector arr = m_pimpl->mixin(); if(index > arr.size() - 1) diff --git a/src/libwalletqt/UnsignedTransaction.h b/src/libwalletqt/UnsignedTransaction.h index 5b54e299..f679f9a9 100644 --- a/src/libwalletqt/UnsignedTransaction.h +++ b/src/libwalletqt/UnsignedTransaction.h @@ -56,9 +56,9 @@ public: Status status() const; QString errorString() const; - Q_INVOKABLE quint64 amount(int index) const; - Q_INVOKABLE quint64 fee(int index) const; - Q_INVOKABLE quint64 mixin(int index) const; + Q_INVOKABLE quint64 amount(size_t index) const; + Q_INVOKABLE quint64 fee(size_t index) const; + Q_INVOKABLE quint64 mixin(size_t index) const; QStringList recipientAddress() const; QStringList paymentId() const; quint64 txCount() const; diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 592559e2..5b0f0719 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -963,16 +963,16 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent) , m_historyModel(nullptr) , m_addressBook(nullptr) , m_addressBookModel(nullptr) - , m_subaddress(nullptr) - , m_subaddressModel(nullptr) - , m_subaddressAccount(nullptr) - , m_subaddressAccountModel(nullptr) , m_daemonBlockChainHeight(0) , m_daemonBlockChainHeightTtl(DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS) , m_daemonBlockChainTargetHeight(0) , m_daemonBlockChainTargetHeightTtl(DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS) , m_connectionStatusTtl(WALLET_CONNECTION_STATUS_CACHE_TTL_SECONDS) , m_currentSubaddressAccount(0) + , m_subaddress(nullptr) + , m_subaddressModel(nullptr) + , m_subaddressAccount(nullptr) + , m_subaddressAccountModel(nullptr) , m_scheduler(this) { m_history = new TransactionHistory(m_walletImpl->history(), this); diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 4d60b060..fb2dc3f8 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -395,6 +395,8 @@ private: mutable TransactionHistoryModel * m_historyModel; mutable TransactionHistorySortFilterModel * m_historySortFilterModel; QString m_paymentId; + AddressBook * m_addressBook; + mutable AddressBookModel * m_addressBookModel; mutable QTime m_daemonBlockChainHeightTime; mutable quint64 m_daemonBlockChainHeight; int m_daemonBlockChainHeightTtl; @@ -406,8 +408,6 @@ private: mutable QTime m_connectionStatusTime; mutable bool m_initialized; uint32_t m_currentSubaddressAccount; - AddressBook * m_addressBook; - mutable AddressBookModel * m_addressBookModel; Subaddress * m_subaddress; mutable SubaddressModel * m_subaddressModel; SubaddressAccount * m_subaddressAccount; -- cgit v1.2.3