From 98abdaa5d54daeb506acefeff901d8c4ba5c9eb6 Mon Sep 17 00:00:00 2001 From: xiphon Date: Sun, 16 Feb 2020 02:52:53 +0000 Subject: build: fix all warnings, treat warnings as errors --- src/libwalletqt/AddressBook.cpp | 3 --- src/libwalletqt/AddressBook.h | 2 +- src/libwalletqt/Subaddress.cpp | 3 --- src/libwalletqt/SubaddressAccount.cpp | 3 --- src/libwalletqt/TransactionHistory.h | 2 +- src/libwalletqt/Wallet.cpp | 18 +++++++++--------- src/libwalletqt/Wallet.h | 10 +++++----- src/libwalletqt/WalletManager.h | 2 +- 8 files changed, 17 insertions(+), 26 deletions(-) (limited to 'src/libwalletqt') diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp index d51fecc0..d20abb86 100644 --- a/src/libwalletqt/AddressBook.cpp +++ b/src/libwalletqt/AddressBook.cpp @@ -32,7 +32,6 @@ AddressBook::AddressBook(Monero::AddressBook *abImpl,QObject *parent) : QObject(parent), m_addressBookImpl(abImpl) { - qDebug(__FUNCTION__); getAll(); } @@ -48,8 +47,6 @@ int AddressBook::errorCode() const void AddressBook::getAll() { - qDebug(__FUNCTION__); - emit refreshStarted(); { diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h index 1d9309b3..8942b86e 100644 --- a/src/libwalletqt/AddressBook.h +++ b/src/libwalletqt/AddressBook.h @@ -36,7 +36,7 @@ #include namespace Monero { -class AddressBook; +struct AddressBook; } class AddressBookRow; diff --git a/src/libwalletqt/Subaddress.cpp b/src/libwalletqt/Subaddress.cpp index daa45d20..013ea68f 100644 --- a/src/libwalletqt/Subaddress.cpp +++ b/src/libwalletqt/Subaddress.cpp @@ -32,14 +32,11 @@ Subaddress::Subaddress(Monero::Subaddress *subaddressImpl, QObject *parent) : QObject(parent), m_subaddressImpl(subaddressImpl) { - qDebug(__FUNCTION__); getAll(); } void Subaddress::getAll() const { - qDebug(__FUNCTION__); - emit refreshStarted(); { diff --git a/src/libwalletqt/SubaddressAccount.cpp b/src/libwalletqt/SubaddressAccount.cpp index 940413a7..178a9355 100644 --- a/src/libwalletqt/SubaddressAccount.cpp +++ b/src/libwalletqt/SubaddressAccount.cpp @@ -32,14 +32,11 @@ SubaddressAccount::SubaddressAccount(Monero::SubaddressAccount *subaddressAccountImpl, QObject *parent) : QObject(parent), m_subaddressAccountImpl(subaddressAccountImpl) { - qDebug(__FUNCTION__); getAll(); } void SubaddressAccount::getAll() const { - qDebug(__FUNCTION__); - emit refreshStarted(); { diff --git a/src/libwalletqt/TransactionHistory.h b/src/libwalletqt/TransactionHistory.h index cf364782..519f454f 100644 --- a/src/libwalletqt/TransactionHistory.h +++ b/src/libwalletqt/TransactionHistory.h @@ -37,7 +37,7 @@ #include namespace Monero { -class TransactionHistory; +struct TransactionHistory; } class TransactionInfo; diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 89707b5a..4b37b3b8 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -68,38 +68,38 @@ public: } - virtual void moneySpent(const std::string &txId, uint64_t amount) + virtual void moneySpent(const std::string &txId, uint64_t amount) override { qDebug() << __FUNCTION__; emit m_wallet->moneySpent(QString::fromStdString(txId), amount); } - virtual void moneyReceived(const std::string &txId, uint64_t amount) + virtual void moneyReceived(const std::string &txId, uint64_t amount) override { qDebug() << __FUNCTION__; emit m_wallet->moneyReceived(QString::fromStdString(txId), amount); } - virtual void unconfirmedMoneyReceived(const std::string &txId, uint64_t amount) + virtual void unconfirmedMoneyReceived(const std::string &txId, uint64_t amount) override { qDebug() << __FUNCTION__; emit m_wallet->unconfirmedMoneyReceived(QString::fromStdString(txId), amount); } - virtual void newBlock(uint64_t height) + virtual void newBlock(uint64_t height) override { // qDebug() << __FUNCTION__; emit m_wallet->newBlock(height, m_wallet->daemonBlockChainTargetHeight()); } - virtual void updated() + virtual void updated() override { emit m_wallet->updated(); } // called when wallet refreshed by background thread or explicitly - virtual void refreshed() + virtual void refreshed() override { qDebug() << __FUNCTION__; emit m_wallet->refreshed(); @@ -1028,9 +1028,9 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent) m_walletImpl->setListener(m_walletListener); m_currentSubaddressAccount = getCacheAttribute(ATTRIBUTE_SUBADDRESS_ACCOUNT).toUInt(); // start cache timers - m_connectionStatusTime.restart(); - m_daemonBlockChainHeightTime.restart(); - m_daemonBlockChainTargetHeightTime.restart(); + m_connectionStatusTime.start(); + m_daemonBlockChainHeightTime.start(); + m_daemonBlockChainTargetHeightTime.start(); m_initialized = false; m_connectionStatusRunning = false; m_daemonUsername = ""; diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 2646da30..12c90fc4 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -29,8 +29,8 @@ #ifndef WALLET_H #define WALLET_H +#include #include -#include #include #include #include @@ -43,7 +43,7 @@ #include "NetworkType.h" namespace Monero { - class Wallet; // forward declaration +struct Wallet; // forward declaration } @@ -406,15 +406,15 @@ private: QString m_paymentId; AddressBook * m_addressBook; mutable AddressBookModel * m_addressBookModel; - mutable QTime m_daemonBlockChainHeightTime; + mutable QElapsedTimer m_daemonBlockChainHeightTime; mutable quint64 m_daemonBlockChainHeight; int m_daemonBlockChainHeightTtl; - mutable QTime m_daemonBlockChainTargetHeightTime; + mutable QElapsedTimer m_daemonBlockChainTargetHeightTime; mutable quint64 m_daemonBlockChainTargetHeight; int m_daemonBlockChainTargetHeightTtl; mutable ConnectionStatus m_connectionStatus; int m_connectionStatusTtl; - mutable QTime m_connectionStatusTime; + mutable QElapsedTimer m_connectionStatusTime; bool m_disconnected; mutable bool m_initialized; uint32_t m_currentSubaddressAccount; diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index a37d0466..e5243caf 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -42,7 +42,7 @@ class Wallet; namespace Monero { - class WalletManager; +struct WalletManager; } class WalletManager : public QObject -- cgit v1.2.3