refactor: misc cleanup

diff --git a/monero b/monero
index 4e02392274e1b5f7a038171deee2e445128b2e35..31ced6d76a1aaa1bfb9011c86987937b7042f3ce 160000 (submodule)
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit 4e02392274e1b5f7a038171deee2e445128b2e35
+Subproject commit 31ced6d76a1aaa1bfb9011c86987937b7042f3ce

diff --git a/src/CalcWindow.cpp b/src/CalcWindow.cpp
index a12376c83bf886c64a515f46b397eda78a498989..a146862bad07e636fd0ebcc3029b86dbc1db66eb 100644 (file)
--- 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 5300be914675d7a0df5eac4588c15b8c6a125cb5..8a78d763c2e86cf183655dfe71bd0e7b2156e21f 100644 (file)
--- 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::CalcWindow> ui;
 };
 
 #endif // FEATHER_CALCWINDOW_H
+

diff --git a/src/libwalletqt/Transfer.h b/src/libwalletqt/Transfer.h
index 8c18609c869709a6178f99f3253eb2d86384c595..9e9687da120b9e4144edd4e0cdb5f8ff2d67d231 100644 (file)
--- 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)) {};
+    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;
-public:
-    quint64 amount() const { return m_amount; }
-    QString address() const { return m_address; }
-
 };
 
-#endif // TRANSACTIONINFO_H
+#endif // TRANSFER_H

diff --git a/src/libwalletqt/rows/SubaddressRow.cpp b/src/libwalletqt/rows/SubaddressRow.cpp
index 8960087588ab2c6d196ef5f6bc4fbb95a745dc2b..f501ea516be597866bea207590259f1f166f3814 100644 (file)
--- 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 389b4a5982f8071a3596b64076d4f6a9a2348cf6..bad2d76754908334e98a4c034a324dcb8c6e5e42 100644 (file)
--- 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 e2f74654a25dfa9047de544e9e28bf3c3b92b8a8..673fe92f44d243a887050fd600991fa9a52285bd 100644 (file)
--- 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 += "<br> ";
-        destinations += WalletManager::displayAmount(t->amount()) + ": " + t->address();
-    }
-    return destinations;
-}
-
 QList<QString> TransactionRow::destinations() const
 {
     QList<QString> dests;

diff --git a/src/libwalletqt/rows/TransactionRow.h b/src/libwalletqt/rows/TransactionRow.h
index 06030f6ed3e140b541ef300c8869676124993a4e..8c59a0b4abed64b9de939acb07001dd6506cc761 100644 (file)
--- 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<QString> destinations() const;
-    QString destinations_formatted() const;
     QList<Transfer*> transfers() const;
     QString rings_formatted() const;
 
 private:
     explicit TransactionRow();
 
-//    TransactionRow(const Monero::TransactionInfo *pimpl, QObject *parent = nullptr);
-
 private:
     friend class TransactionHistory;
     mutable QList<Transfer*> m_transfers;

diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp
index fb66425351c50505d383c68313967759319fb3ac..2b84b7d23c72321d3f5dd46b6dd0467542faa290 100644 (file)
--- 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 16ddd6d7b5f2d3a8d8562f4f66aba64e06739db2..af40e474ca6ae42e4c5938884c765592de8e2fa7 100644 (file)
--- 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<QString, QString> 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 dc29deb21549671a1e9dc19786e72040e21e10f5..496ab40d8cd5eeddaca7ffdb6f6b298bd3b7b706 100644 (file)
--- 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 4f9a160fb84414a9d50d2f03d61edc4524ce7143..7f71265bddc4cb5b23f702b55fc8c402b915e356 100644 (file)
--- 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;