From 91ff2bc7f05fac958e717bb75512ddd689eae20f Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 23 Nov 2023 21:18:11 +0100 Subject: [PATCH] refactor: misc cleanup --- monero | 2 +- src/CalcWindow.cpp | 4 ---- src/CalcWindow.h | 7 +------ src/libwalletqt/Transfer.h | 21 ++++++++++++--------- src/libwalletqt/rows/SubaddressRow.cpp | 12 ------------ src/libwalletqt/rows/SubaddressRow.h | 4 ---- src/libwalletqt/rows/TransactionRow.cpp | 11 ----------- src/libwalletqt/rows/TransactionRow.h | 6 ------ src/model/AddressBookModel.cpp | 12 ++---------- src/model/AddressBookModel.h | 6 +----- src/model/SubaddressModel.cpp | 12 ++---------- src/model/SubaddressModel.h | 4 ---- 12 files changed, 19 insertions(+), 82 deletions(-) diff --git a/monero b/monero index 4e02392..31ced6d 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 4e02392274e1b5f7a038171deee2e445128b2e35 +Subproject commit 31ced6d76a1aaa1bfb9011c86987937b7042f3ce diff --git a/src/CalcWindow.cpp b/src/CalcWindow.cpp index a12376c..a146862 100644 --- a/src/CalcWindow.cpp +++ b/src/CalcWindow.cpp @@ -18,8 +18,4 @@ CalcWindow::CalcWindow(QWidget *parent) this->setWindowIcon(icons()->icon("gnome-calc.png")); } -void CalcWindow::closeEvent(QCloseEvent *foo) { - emit closed(); -} - CalcWindow::~CalcWindow() = default; \ No newline at end of file diff --git a/src/CalcWindow.h b/src/CalcWindow.h index 5300be9..8a78d76 100644 --- a/src/CalcWindow.h +++ b/src/CalcWindow.h @@ -18,14 +18,9 @@ public: explicit CalcWindow(QWidget *parent = nullptr); ~CalcWindow() override; -signals: - void closed(); - -private: - void closeEvent(QCloseEvent *bar) override; - private: QScopedPointer ui; }; #endif // FEATHER_CALCWINDOW_H + diff --git a/src/libwalletqt/Transfer.h b/src/libwalletqt/Transfer.h index 8c18609..9e9687d 100644 --- a/src/libwalletqt/Transfer.h +++ b/src/libwalletqt/Transfer.h @@ -13,17 +13,20 @@ class Transfer : public QObject Q_OBJECT public: - explicit Transfer(uint64_t _amount, QString _address, QObject *parent = 0) - : QObject(parent), m_amount(_amount), m_address(std::move(_address)) {}; -private: - friend class TransactionInfo; - friend class ConstructionInfo; - quint64 m_amount; - QString m_address; -public: + explicit Transfer(uint64_t amount, QString address, QObject *parent = nullptr) + : QObject(parent) + , m_amount(amount) + , m_address(std::move(address)) {}; + quint64 amount() const { return m_amount; } QString address() const { return m_address; } +private: + friend class TransactionInfo; + friend class ConstructionInfo; + + quint64 m_amount; + QString m_address; }; -#endif // TRANSACTIONINFO_H +#endif // TRANSFER_H diff --git a/src/libwalletqt/rows/SubaddressRow.cpp b/src/libwalletqt/rows/SubaddressRow.cpp index 8960087..f501ea5 100644 --- a/src/libwalletqt/rows/SubaddressRow.cpp +++ b/src/libwalletqt/rows/SubaddressRow.cpp @@ -3,18 +3,6 @@ #include "SubaddressRow.h" -bool SubaddressRow::setHidden(bool hidden) { - m_hidden = hidden; -} - -bool SubaddressRow::setUsed(bool used) { - m_used = used; -} - -bool SubaddressRow::setPinned(bool pinned) { - m_used = pinned; -} - qsizetype SubaddressRow::getRow() const { return m_row; } diff --git a/src/libwalletqt/rows/SubaddressRow.h b/src/libwalletqt/rows/SubaddressRow.h index 389b4a5..bad2d76 100644 --- a/src/libwalletqt/rows/SubaddressRow.h +++ b/src/libwalletqt/rows/SubaddressRow.h @@ -19,10 +19,6 @@ public: , m_used(used) , m_hidden(hidden) , m_pinned(pinned) {} - - bool setUsed(bool used); - bool setHidden(bool hidden); - bool setPinned(bool pinned); qsizetype getRow() const; const QString& getAddress() const; diff --git a/src/libwalletqt/rows/TransactionRow.cpp b/src/libwalletqt/rows/TransactionRow.cpp index e2f7465..673fe92 100644 --- a/src/libwalletqt/rows/TransactionRow.cpp +++ b/src/libwalletqt/rows/TransactionRow.cpp @@ -145,17 +145,6 @@ QString TransactionRow::paymentId() const return m_paymentId; } -QString TransactionRow::destinations_formatted() const -{ - QString destinations; - for (auto const& t: m_transfers) { - if (!destinations.isEmpty()) - destinations += "
"; - destinations += WalletManager::displayAmount(t->amount()) + ": " + t->address(); - } - return destinations; -} - QList TransactionRow::destinations() const { QList dests; diff --git a/src/libwalletqt/rows/TransactionRow.h b/src/libwalletqt/rows/TransactionRow.h index 06030f6..8c59a0b 100644 --- a/src/libwalletqt/rows/TransactionRow.h +++ b/src/libwalletqt/rows/TransactionRow.h @@ -42,24 +42,18 @@ public: quint64 confirmations() const; quint64 confirmationsRequired() const; quint64 unlockTime() const; - //! transaction_id QString hash() const; QDateTime timestamp() const; QString date() const; QString time() const; QString paymentId() const; - //! only applicable for output transactions - //! used in tx details popup QList destinations() const; - QString destinations_formatted() const; QList transfers() const; QString rings_formatted() const; private: explicit TransactionRow(); -// TransactionRow(const Monero::TransactionInfo *pimpl, QObject *parent = nullptr); - private: friend class TransactionHistory; mutable QList m_transfers; diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp index fb66425..2b84b7d 100644 --- a/src/model/AddressBookModel.cpp +++ b/src/model/AddressBookModel.cpp @@ -11,19 +11,11 @@ AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook) , m_addressBook(addressBook) , m_showFullAddresses(false) { - connect(m_addressBook, &AddressBook::refreshStarted, this, &AddressBookModel::startReset); - connect(m_addressBook, &AddressBook::refreshFinished, this, &AddressBookModel::endReset); + connect(m_addressBook, &AddressBook::refreshStarted, this, &AddressBookModel::beginResetModel); + connect(m_addressBook, &AddressBook::refreshFinished, this, &AddressBookModel::endResetModel); m_contactIcon = icons()->icon("person.svg"); } -void AddressBookModel::startReset(){ - beginResetModel(); -} - -void AddressBookModel::endReset(){ - endResetModel(); -} - int AddressBookModel::rowCount(const QModelIndex &) const { return m_addressBook->count(); diff --git a/src/model/AddressBookModel.h b/src/model/AddressBookModel.h index 16ddd6d..af40e47 100644 --- a/src/model/AddressBookModel.h +++ b/src/model/AddressBookModel.h @@ -30,17 +30,13 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; - Q_INVOKABLE bool deleteRow(int row); + bool deleteRow(int row); bool isShowFullAddresses() const; void setShowFullAddresses(bool show); bool writeCSV(const QString &path); QMap readCSV(const QString &path); -public slots: - void startReset(); - void endReset(); - private: AddressBook * m_addressBook; QIcon m_contactIcon; diff --git a/src/model/SubaddressModel.cpp b/src/model/SubaddressModel.cpp index dc29deb..496ab40 100644 --- a/src/model/SubaddressModel.cpp +++ b/src/model/SubaddressModel.cpp @@ -17,16 +17,8 @@ SubaddressModel::SubaddressModel(QObject *parent, Subaddress *subaddress) : QAbstractTableModel(parent) , m_subaddress(subaddress) { - connect(m_subaddress, &Subaddress::refreshStarted, this, &SubaddressModel::startReset); - connect(m_subaddress, &Subaddress::refreshFinished, this, &SubaddressModel::endReset); -} - -void SubaddressModel::startReset(){ - beginResetModel(); -} - -void SubaddressModel::endReset(){ - endResetModel(); + connect(m_subaddress, &Subaddress::refreshStarted, this, &SubaddressModel::beginResetModel); + connect(m_subaddress, &Subaddress::refreshFinished, this, &SubaddressModel::endResetModel); } int SubaddressModel::rowCount(const QModelIndex &parent) const diff --git a/src/model/SubaddressModel.h b/src/model/SubaddressModel.h index 4f9a160..7f71265 100644 --- a/src/model/SubaddressModel.h +++ b/src/model/SubaddressModel.h @@ -42,10 +42,6 @@ public: void setCurrentSubaddressAccount(quint32 accountIndex); -public slots: - void startReset(); - void endReset(); - private: Subaddress *m_subaddress; QVariant parseSubaddressRow(const SubaddressRow &subaddress, const QModelIndex &index, int role) const;