cleanup includes

monero

@@ -1 +1 @@
-Subproject commit 14d2ac095df656745e383258f4434ed4968b1c6b
+Subproject commit 5b9a197de481409ab3dc4cd25c5a1048d20ca09f

src/Application.h

@@ -8,7 +8,6 @@
 #include <QtNetwork/qlocalserver.h>
 
 class QLockFile;
-class QSocketNotifier;
 
 class Application : public QApplication {
     Q_OBJECT

src/ContactsWidget.cpp

@@ -7,7 +7,10 @@
 #include <QMessageBox>
 
 #include "dialog/ContactsDialog.h"
+#include "model/AddressBookModel.h"
+#include "model/AddressBookProxyModel.h"
 #include "libwalletqt/AddressBook.h"
+#include "libwalletqt/Wallet.h"
 #include "libwalletqt/WalletManager.h"
 #include "utils/Icons.h"
 #include "utils/Utils.h"

src/ContactsWidget.h

@@ -8,9 +8,9 @@
 #include <QWidget>
 #include <QMenu>
 
-#include "model/AddressBookModel.h"
-#include "model/AddressBookProxyModel.h"
-#include "libwalletqt/Wallet.h"
+class AddressBookModel;
+class AddressBookProxyModel;
+class Wallet;
 
 namespace Ui {
 class ContactsWidget;

src/HistoryWidget.cpp

@@ -8,6 +8,8 @@
 
 #include "dialog/TxInfoDialog.h"
 #include "dialog/TxProofDialog.h"
+#include "model/TransactionHistoryProxyModel.h"
+#include "libwalletqt/Wallet.h"
 #include "libwalletqt/WalletManager.h"
 #include "utils/config.h"
 #include "utils/Icons.h"

src/HistoryWidget.h

@@ -7,10 +7,8 @@
 #include <QWidget>
 #include <QMenu>
 
-#include "libwalletqt/Coins.h"
-#include "libwalletqt/Wallet.h"
-#include "model/TransactionHistoryModel.h"
-#include "model/TransactionHistoryProxyModel.h"
+class TransactionHistoryProxyModel;
+class Wallet;
 
 namespace Ui {
     class HistoryWidget;

src/MainWindow.cpp

@@ -26,12 +26,13 @@
 #include "libwalletqt/AddressBook.h"
 #include "libwalletqt/rows/CoinsInfo.h"
 #include "libwalletqt/Transfer.h"
+#include "libwalletqt/TransactionHistory.h"
+#include "model/AddressBookModel.h"
 #include "plugins/PluginRegistry.h"
 #include "utils/AppData.h"
 #include "utils/AsyncTask.h"
 #include "utils/ColorScheme.h"
 #include "utils/Icons.h"
-#include "utils/SemanticVersion.h"
 #include "utils/TorManager.h"
 #include "utils/WebsocketNotifier.h"
 

src/ReceiveWidget.cpp

@@ -5,7 +5,6 @@
 #include "ui_ReceiveWidget.h"
 
 #include <QMenu>
-#include <QMessageBox>
 
 #include "dialog/PaymentRequestDialog.h"
 #include "dialog/QrCodeDialog.h"

src/ReceiveWidget.h

@@ -6,7 +6,6 @@
 
 #include <QMenu>
 #include <QWidget>
-#include <QSvgWidget>
 
 #include "libwalletqt/Subaddress.h"
 #include "libwalletqt/Wallet.h"

src/SendWidget.h

@@ -6,7 +6,7 @@
 
 #include <QWidget>
 
-#include "libwalletqt/Wallet.h"
+class Wallet;
 
 namespace Ui {
     class SendWidget;

src/SettingsDialog.cpp

@@ -12,6 +12,7 @@
 #include "libwalletqt/WalletManager.h"
 #include "utils/AppData.h"
 #include "utils/Icons.h"
+#include "utils/nodes.h"
 #include "utils/WebsocketNotifier.h"
 #include "widgets/NetworkProxyWidget.h"
 #include "WindowManager.h"

src/SettingsDialog.h

@@ -4,17 +4,13 @@
 #ifndef FEATHER_SettingsDIALOG_H
 #define FEATHER_SettingsDIALOG_H
 
-
-#include <QAbstractButton>
 #include <QDialog>
-#include <QSettings>
-
-#include "widgets/NodeWidget.h"
 
 namespace Ui {
     class Settings;
 }
 
+class Nodes;
 class Settings : public QDialog
 {
 Q_OBJECT

src/WindowManager.cpp

@@ -10,14 +10,20 @@
 
 #include "Application.h"
 #include "constants.h"
+#include "MainWindow.h"
+#include "dialog/DocsDialog.h"
 #include "dialog/PasswordDialog.h"
 #include "dialog/SplashDialog.h"
+#include "dialog/TorInfoDialog.h"
+#include "libwalletqt/WalletManager.h"
+#include "libwalletqt/Wallet.h"
 #include "utils/Icons.h"
 #include "utils/NetworkManager.h"
 #include "utils/os/tails.h"
 #include "utils/os/whonix.h"
 #include "utils/TorManager.h"
 #include "utils/WebsocketNotifier.h"
+#include "utils/AppData.h"
 
 WindowManager::WindowManager(QObject *parent)
     : QObject(parent)

src/WindowManager.h

@@ -5,17 +5,20 @@
 #define FEATHER_WINDOWMANAGER_H
 
 #include <QObject>
+#include <QSystemTrayIcon>
 
-#include "dialog/DocsDialog.h"
-#include "dialog/TorInfoDialog.h"
-#include "libwalletqt/WalletManager.h"
-#include "libwalletqt/Wallet.h"
-#include "MainWindow.h"
+#include "utils/EventFilter.h"
 #include "utils/nodes.h"
 #include "wizard/WalletWizard.h"
 #include "Utils.h"
 
 class MainWindow;
+class DocsDialog;
+class TorInfoDialog;
+class WalletManager;
+class Wallet;
+class SplashDialog;
+
 class WindowManager : public QObject {
 Q_OBJECT
 

src/constants.h

@@ -4,8 +4,7 @@
 #ifndef FEATHER_CONSTANTS_H
 #define FEATHER_CONSTANTS_H
 
-#include <QtGlobal>
-#include <QUrl>
+#include <QString>
 
 #include "networktype.h"
 

src/dialog/AboutDialog.cpp

@@ -5,6 +5,7 @@
 #include "ui_AboutDialog.h"
 
 #include <QMessageBox>
+#include <QDate>
 
 #include "config-feather.h"
 #include "utils/Utils.h"

src/dialog/AboutDialog.h

@@ -4,9 +4,6 @@
 #ifndef FEATHER_ABOUT_H
 #define FEATHER_ABOUT_H
 
-#include <QDialog>
-#include <QStringListModel>
-
 #include "components.h"
 
 namespace Ui {

src/dialog/AccountSwitcherDialog.cpp

@@ -8,6 +8,7 @@
 
 #include "libwalletqt/SubaddressAccount.h"
 #include "libwalletqt/WalletManager.h"
+#include "model/SubaddressAccountModel.h"
 #include "utils/Icons.h"
 #include "utils/Utils.h"
 

src/dialog/AccountSwitcherDialog.h

@@ -4,10 +4,8 @@
 #ifndef FEATHER_ACCOUNTSWITCHERDIALOG_H
 #define FEATHER_ACCOUNTSWITCHERDIALOG_H
 
-#include <QDialog>
-
-#include "libwalletqt/Wallet.h"
 #include "components.h"
+#include "libwalletqt/Wallet.h"
 #include "model/SubaddressAccountModel.h"
 
 namespace Ui {

src/dialog/AddressCheckerIndexDialog.cpp

@@ -7,6 +7,7 @@
 #include "utils/Utils.h"
 #include "components.h"
 #include "dialog/QrCodeDialog.h"
+#include "libwalletqt/Wallet.h"
 
 AddressCheckerIndexDialog::AddressCheckerIndexDialog(Wallet *wallet, QWidget *parent)
         : WindowModalDialog(parent)

src/dialog/AddressCheckerIndexDialog.h

@@ -5,7 +5,8 @@
 #define ADDRESSCHECKERINDEXDIALOG_H
 
 #include "components.h"
-#include "Wallet.h"
+
+class Wallet;
 
 namespace Ui {
     class AddressCheckerIndexDialog;

src/dialog/BalanceDialog.h

@@ -4,8 +4,6 @@
 #ifndef FEATHER_BALANCEDIALOG_H
 #define FEATHER_BALANCEDIALOG_H
 
-#include <QDialog>
-
 #include "components.h"
 #include "libwalletqt/Wallet.h"
 

src/dialog/DocsDialog.cpp

@@ -5,6 +5,7 @@
 #include "ui_DocsDialog.h"
 
 #include <QScrollBar>
+#include <QDirIterator>
 
 #include "utils/Utils.h"
 #include "ColorScheme.h"

src/libwalletqt/Coins.h

@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QList>
 #include <QReadWriteLock>
-#include <QDateTime>
 
 #include "Wallet.h"
 

src/libwalletqt/ConstructionInfo.cpp

@@ -5,6 +5,7 @@
 
 #include "Input.h"
 #include "Transfer.h"
+#include <wallet/api/wallet2_api.h>
 
 quint64 ConstructionInfo::unlockTime() const {
     return m_unlockTime;

src/libwalletqt/ConstructionInfo.h

@@ -4,13 +4,16 @@
 #ifndef FEATHER_CONSTRUCTIONINFO_H
 #define FEATHER_CONSTRUCTIONINFO_H
 
-#include <wallet/api/wallet2_api.h>
 #include <QObject>
 #include <QSet>
 
 class Input;
 class Transfer;
 
+namespace Monero {
+    class TransactionConstructionInfo;
+}
+
 class ConstructionInfo : public QObject
 {
     Q_OBJECT

src/libwalletqt/Input.h

@@ -4,15 +4,11 @@
 #ifndef FEATHER_INPUT_H
 #define FEATHER_INPUT_H
 
-#include <wallet/api/wallet2_api.h>
 #include <QObject>
-#include <utility>
 
 class Input : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(quint64 amount READ amount)
-    Q_PROPERTY(QString pubKey READ pubKey)
 
 private:
     explicit Input(uint64_t _amount, QString _address,  QObject *parent = nullptr): QObject(parent), m_amount(_amount), m_pubkey(std::move(_address)) {};
@@ -20,10 +16,10 @@ private:
     friend class ConstructionInfo;
     quint64 m_amount;
     QString m_pubkey;
+
 public:
     quint64 amount() const { return m_amount; }
     QString pubKey() const { return m_pubkey; }
-
 };
 
 #endif //FEATHER_INPUT_H

src/libwalletqt/PassphraseHelper.cpp

@@ -4,7 +4,7 @@
 #include "PassphraseHelper.h"
 #include <QDebug>
 
-Monero::optional<std::string> PassphraseHelper::onDevicePassphraseRequest(bool & on_device)
+std::optional<std::string> PassphraseHelper::onDevicePassphraseRequest(bool & on_device)
 {
     qDebug() << __FUNCTION__;
     QMutexLocker locker(&m_mutex_pass);
@@ -26,9 +26,9 @@ Monero::optional<std::string> PassphraseHelper::onDevicePassphraseRequest(bool &
     if (!on_device) {
         auto tmpPass = m_passphrase.toStdString();
         m_passphrase = QString();
-        return Monero::optional<std::string>(tmpPass);
+        return std::optional<std::string>(tmpPass);
     } else {
-        return Monero::optional<std::string>();
+        return std::optional<std::string>();
     }
 }
 

src/libwalletqt/PassphraseHelper.h

@@ -4,11 +4,9 @@
 #ifndef MONERO_GUI_PASSPHRASEHELPER_H
 #define MONERO_GUI_PASSPHRASEHELPER_H
 
-#include <wallet/api/wallet2_api.h>
 #include <QMutex>
 #include <QPointer>
 #include <QWaitCondition>
-#include <QMutex>
 
 /**
  * Implements component responsible for showing entry prompt to the user,
@@ -32,7 +30,7 @@ class PassphraseHelper {
 public:
     PassphraseHelper(PassphrasePrompter * prompter=nullptr): m_prompter(prompter) {};
     PassphraseHelper(const PassphraseHelper & h): PassphraseHelper(h.m_prompter) {};
-    Monero::optional<std::string> onDevicePassphraseRequest(bool & on_device);
+    std::optional<std::string> onDevicePassphraseRequest(bool & on_device);
     void onPassphraseEntered(const QString &passphrase, bool enter_on_device, bool entry_abort);
 
 private:

src/libwalletqt/PendingTransaction.cpp

@@ -5,6 +5,8 @@
 
 #include <QVariant>
 
+#include <wallet/api/wallet2_api.h>
+
 PendingTransaction::Status PendingTransaction::status() const
 {
     return static_cast<Status>(m_pimpl->status());

src/libwalletqt/PendingTransaction.h

@@ -7,18 +7,21 @@
 #include <QObject>
 #include <QList>
 
-#include <wallet/api/wallet2_api.h>
 #include "PendingTransactionInfo.h"
 
+namespace Monero {
+    class PendingTransaction;
+}
+
 class PendingTransaction : public QObject
 {
     Q_OBJECT
 
 public:
     enum Status {
-        Status_Ok       = Monero::PendingTransaction::Status_Ok,
-        Status_Error    = Monero::PendingTransaction::Status_Error,
-        Status_Critical = Monero::PendingTransaction::Status_Critical
+        Status_Ok       = 0,
+        Status_Error    = 1,
+        Status_Critical = 2
     };
     Q_ENUM(Status)
 

src/libwalletqt/PendingTransactionInfo.cpp

@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "PendingTransactionInfo.h"
+#include <wallet/api/wallet2_api.h>
 
 quint64 PendingTransactionInfo::fee() const {
     return m_fee;

src/libwalletqt/PendingTransactionInfo.h

@@ -11,6 +11,10 @@
 class Input;
 class Transfer;
 
+namespace Monero {
+    class PendingTransactionInfo;
+}
+
 class PendingTransactionInfo : public ConstructionInfo
 {
     Q_OBJECT

src/libwalletqt/Ring.h

@@ -4,10 +4,7 @@
 #ifndef FEATHER_RINGS_H
 #define FEATHER_RINGS_H
 
-#include <wallet/api/wallet2_api.h>
 #include <QObject>
-#include <QList>
-#include <utility>
 
 class Ring : public QObject
 {

src/libwalletqt/Subaddress.h

@@ -4,10 +4,8 @@
 #ifndef SUBADDRESS_H
 #define SUBADDRESS_H
 
-#include <functional>
-
-#include <QReadWriteLock>
 #include <QObject>
+#include <QReadWriteLock>
 #include <QList>
 #include <QDateTime>
 

src/libwalletqt/UnsignedTransaction.cpp

@@ -2,7 +2,9 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "UnsignedTransaction.h"
-#include <QDebug>
+
+#include "ConstructionInfo.h"
+#include <wallet/api/wallet2_api.h>
 
 UnsignedTransaction::Status UnsignedTransaction::status() const
 {

src/libwalletqt/UnsignedTransaction.h

@@ -6,7 +6,12 @@
 
 #include <QObject>
 
-#include "libwalletqt/PendingTransactionInfo.h"
+namespace Monero {
+    class UnsignedTransaction;
+    class Wallet;
+}
+
+class ConstructionInfo;
 
 class UnsignedTransaction : public QObject
 {
@@ -14,9 +19,9 @@ class UnsignedTransaction : public QObject
 
 public:
     enum Status {
-        Status_Ok       = Monero::UnsignedTransaction::Status_Ok,
-        Status_Error    = Monero::UnsignedTransaction::Status_Error,
-        Status_Critical    = Monero::UnsignedTransaction::Status_Critical
+        Status_Ok = 0,
+        Status_Error = 1,
+        Status_Critical = 2
     };
     Q_ENUM(Status)
 

src/libwalletqt/Wallet.cpp

@@ -12,6 +12,7 @@
 #include "SubaddressAccount.h"
 #include "TransactionHistory.h"
 #include "WalletManager.h"
+#include "WalletListenerImpl.h"
 
 #include "config.h"
 #include "constants.h"
@@ -357,6 +358,22 @@ void Wallet::setSeedLanguage(const QString &lang)
     m_wallet2->set_seed_language(lang.toStdString());
 }
 
+QString Wallet::getSecretViewKey() const {
+    return QString::fromStdString(m_walletImpl->secretViewKey());
+}
+
+QString Wallet::getPublicViewKey() const {
+    return QString::fromStdString(m_walletImpl->publicViewKey());
+}
+
+QString Wallet::getSecretSpendKey() const {
+    return QString::fromStdString(m_walletImpl->secretSpendKey());
+}
+
+QString Wallet::getPublicSpendKey() const {
+    return QString::fromStdString(m_walletImpl->publicSpendKey());
+}
+
 // #################### Node connection ####################
 
 void Wallet::setOffline(bool offline) {
@@ -866,7 +883,7 @@ void Wallet::createTransaction(const QString &address, quint64 amount, const QSt
     m_scheduler.run([this, all, address, amount, feeLevel, subtractFeeFromAmount] {
         std::set<uint32_t> subaddr_indices;
 
-        Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? Monero::optional<uint64_t>() : Monero::optional<uint64_t>(amount), constants::mixin,
+        Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? std::optional<uint64_t>() : std::optional<uint64_t>(amount), constants::mixin,
                                                                              static_cast<Monero::PendingTransaction::Priority>(feeLevel),
                                                                              currentSubaddressAccount(), subaddr_indices, m_selectedInputs, subtractFeeFromAmount);
 
@@ -1331,6 +1348,10 @@ bool Wallet::setRingDatabase(const QString &path) {
     return m_walletImpl->setRingDatabase(path.toStdString());
 }
 
+quint64 Wallet::getWalletCreationHeight() const {
+    return m_walletImpl->getRefreshFromBlockHeight();
+}
+
 void Wallet::setWalletCreationHeight(quint64 height) {
     m_wallet2->set_refresh_from_block_height(height);
 }

src/libwalletqt/Wallet.h

@@ -4,24 +4,28 @@
 #ifndef WALLET_H
 #define WALLET_H
 
-#include <QElapsedTimer>
 #include <QObject>
 #include <QMutex>
-#include <QList>
-#include <QtConcurrent/QtConcurrent>
 
 #include "utils/scheduler.h"
 #include "PendingTransaction.h"
 #include "UnsignedTransaction.h"
 #include "utils/networktype.h"
 #include "PassphraseHelper.h"
-#include "WalletListenerImpl.h"
 #include "rows/TxBacklogEntry.h"
 
+#include <set>
+
+class WalletListenerImpl;
+
 namespace Monero {
     struct Wallet; // forward declaration
 }
 
+namespace tools {
+    struct wallet2;
+}
+
 struct TxProof {
     TxProof(QString proof, QString error = "")
         : proof(std::move(proof)), error(std::move(error)){}
@@ -94,17 +98,17 @@ public:
     ~Wallet() override;
 
     enum Status {
-        Status_Ok          = Monero::Wallet::Status_Ok,
-        Status_Error       = Monero::Wallet::Status_Error,
-        Status_Critical    = Monero::Wallet::Status_Critical,
-        Status_BadPassword = Monero::Wallet::Status_BadPassword
+        Status_Ok          = 0,
+        Status_Error       = 1,
+        Status_Critical    = 2,
+        Status_BadPassword = 3
     };
 
     Q_ENUM(Status)
 
     enum ConnectionStatus {
-        ConnectionStatus_Disconnected    = Monero::Wallet::ConnectionStatus_Disconnected,
-        ConnectionStatus_WrongVersion    = Monero::Wallet::ConnectionStatus_WrongVersion,
+        ConnectionStatus_Disconnected    = 0,
+        ConnectionStatus_WrongVersion    = 2,
         ConnectionStatus_Connecting = 9,
         ConnectionStatus_Synchronizing = 10,
         ConnectionStatus_Synchronized = 11
@@ -186,10 +190,10 @@ public:
     void setSeedLanguage(const QString &lang);
 
     //! Get wallet keys
-    QString getSecretViewKey() const {return QString::fromStdString(m_walletImpl->secretViewKey());}
-    QString getPublicViewKey() const {return QString::fromStdString(m_walletImpl->publicViewKey());}
-    QString getSecretSpendKey() const {return QString::fromStdString(m_walletImpl->secretSpendKey());}
-    QString getPublicSpendKey() const {return QString::fromStdString(m_walletImpl->publicSpendKey());}
+    QString getSecretViewKey() const;
+    QString getPublicViewKey() const;
+    QString getSecretSpendKey() const;
+    QString getPublicSpendKey() const;
 
     // ##### Node connection #####
 
@@ -399,7 +403,7 @@ public:
 
     bool setRingDatabase(const QString &path);
 
-    quint64 getWalletCreationHeight() const {return m_walletImpl->getRefreshFromBlockHeight();}
+    quint64 getWalletCreationHeight() const;
     void setWalletCreationHeight(quint64 height);
 
     //! Rescan spent outputs
@@ -529,6 +533,4 @@ private:
     std::set<std::string> m_selectedInputs;
 };
 
-
-
 #endif // WALLET_H

src/libwalletqt/WalletListenerImpl.cpp

@@ -85,7 +85,7 @@ void WalletListenerImpl::onPassphraseEntered(const QString &passphrase, bool ent
     m_phelper.onPassphraseEntered(passphrase, enter_on_device, entry_abort);
 }
 
-Monero::optional<std::string> WalletListenerImpl::onDevicePassphraseRequest(bool & on_device)
+std::optional<std::string> WalletListenerImpl::onDevicePassphraseRequest(bool & on_device)
 {
     qDebug() << __FUNCTION__;
     return m_phelper.onDevicePassphraseRequest(on_device);

src/libwalletqt/WalletListenerImpl.h

@@ -35,7 +35,7 @@ public:
 
     virtual void onPassphraseEntered(const QString &passphrase, bool enter_on_device, bool entry_abort) override;
 
-    virtual Monero::optional<std::string> onDevicePassphraseRequest(bool & on_device) override;
+    virtual std::optional<std::string> onDevicePassphraseRequest(bool & on_device) override;
 
 private:
     Wallet * m_wallet;

src/libwalletqt/WalletManager.cpp

@@ -5,6 +5,7 @@
 #include "Wallet.h"
 
 #include "utils/ScopeGuard.h"
+#include <wallet/api/wallet2_api.h>
 
 class WalletPassphraseListenerImpl : public Monero::WalletListener, public PassphraseReceiver
 {
@@ -24,7 +25,7 @@ public:
         m_phelper.onPassphraseEntered(passphrase, enter_on_device, entry_abort);
     }
 
-    Monero::optional<std::string> onDevicePassphraseRequest(bool & on_device) override
+    std::optional<std::string> onDevicePassphraseRequest(bool & on_device) override
     {
         qDebug() << __FUNCTION__;
         return m_phelper.onDevicePassphraseRequest(on_device);

src/libwalletqt/WalletManager.h

@@ -4,8 +4,6 @@
 #ifndef WALLETMANAGER_H
 #define WALLETMANAGER_H
 
-#include <wallet/api/wallet2_api.h>
-
 #include <QObject>
 #include <QMutex>
 #include <QPointer>

src/main.cpp

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
+#include <QSslSocket>
+
 #include "Application.h"
 #include "config-feather.h"
 #include "constants.h"
@@ -8,6 +10,9 @@
 #include "utils/os/Prestium.h"
 #include "WindowManager.h"
 #include "config.h"
+#include <wallet/api/wallet2_api.h>
+#include "libwalletqt/Wallet.h"
+#include "libwalletqt/WalletManager.h"
 
 #if defined(Q_OS_LINUX) && defined(STACK_TRACE)
 #define BOOST_STACKTRACE_LINK

src/model/CoinsModel.h

@@ -4,12 +4,7 @@
 #ifndef FEATHER_COINSMODEL_H
 #define FEATHER_COINSMODEL_H
 
-#include <wallet/api/wallet2_api.h>
-
 #include <QAbstractTableModel>
-#include <QSortFilterProxyModel>
-#include <QDebug>
-#include <QIcon>
 
 class Coins;
 class CoinsInfo;

src/model/SubaddressModel.h

@@ -4,11 +4,7 @@
 #ifndef SUBADDRESSMODEL_H
 #define SUBADDRESSMODEL_H
 
-#include <wallet/api/wallet2_api.h>
-
 #include <QAbstractTableModel>
-#include <QSortFilterProxyModel>
-#include <QDebug>
 
 #include "rows/SubaddressRow.h"
 

src/model/TransactionHistoryModel.cpp

@@ -5,7 +5,6 @@
 #include "TransactionHistory.h"
 #include "constants.h"
 #include "utils/config.h"
-#include "utils/ColorScheme.h"
 #include "utils/Icons.h"
 #include "utils/AppData.h"
 #include "utils/Utils.h"

src/plugins/bounties/BountiesWidget.cpp

@@ -5,6 +5,7 @@
 #include "ui_BountiesWidget.h"
 
 #include <QTableWidget>
+#include <QJsonArray>
 
 #include "BountiesModel.h"
 #include "utils/Utils.h"

src/plugins/crowdfunding/CCSWidget.cpp

@@ -5,6 +5,7 @@
 #include "ui_CCSWidget.h"
 
 #include <QTableWidget>
+#include <QJsonArray>
 
 #include "CCSProgressDelegate.h"
 #include "utils/Utils.h"

src/plugins/revuo/RevuoWidget.cpp

@@ -4,6 +4,8 @@
 #include "RevuoWidget.h"
 #include "ui_RevuoWidget.h"
 
+#include <QJsonArray>
+
 #include "utils/ColorScheme.h"
 #include "Utils.h"
 #include "utils/WebsocketNotifier.h"

src/qrcode/scanner/QrCodeScanDialog.cpp

@@ -4,15 +4,6 @@
 #include "QrCodeScanDialog.h"
 #include "ui_QrCodeScanDialog.h"
 
-#include <QCamera>
-#include <QMediaDevices>
-#include <QCameraDevice>
-#include <QMessageBox>
-#include <QImageCapture>
-#include <QVideoFrame>
-
-#include "Utils.h"
-
 QrCodeScanDialog::QrCodeScanDialog(QWidget *parent, bool scan_ur)
         : QDialog(parent)
         , ui(new Ui::QrCodeScanDialog)

src/qrcode/scanner/QrCodeScanDialog.h

@@ -5,13 +5,7 @@
 #define FEATHER_QRCODESCANDIALOG_H
 
 #include <QDialog>
-#include <QCamera>
 #include <QScopedPointer>
-#include <QMediaCaptureSession>
-#include <QTimer>
-#include <QVideoSink>
-
-#include "QrScanThread.h"
 
 namespace Ui {
     class QrCodeScanDialog;

src/qrcode/scanner/QrCodeScanWidget.cpp

@@ -8,8 +8,11 @@
 #include <QMediaDevices>
 #include <QComboBox>
 
+#include <bcur/bc-ur.hpp>
+
 #include "utils/config.h"
 #include "utils/Icons.h"
+#include "QrScanThread.h"
 
 QrCodeScanWidget::QrCodeScanWidget(QWidget *parent)
         : QWidget(parent)

src/qrcode/scanner/QrCodeScanWidget.h

@@ -11,11 +11,10 @@
 #include <QTimer>
 #include <QVideoSink>
 
-#include "QrScanThread.h"
-
-#include <bcur/bc-ur.hpp>
 #include <bcur/ur-decoder.hpp>
 
+class QrScanThread;
+
 namespace Ui {
     class QrCodeScanWidget;
 }

src/qrcode/scanner/QrScanThread.cpp

@@ -2,10 +2,11 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "QrScanThread.h"
-#include <QDebug>
 
 #include <ZXing/ReadBarcode.h>
 
+#include "utils/QrCodeUtils.h"
+
 QrScanThread::QrScanThread(QObject *parent)
     : QThread(parent)
     , m_running(true)

src/qrcode/scanner/QrScanThread.h

@@ -7,12 +7,6 @@
 #include <QThread>
 #include <QMutex>
 #include <QWaitCondition>
-#include <QEvent>
-#include <QCamera>
-
-#include <ZXing/ReadBarcode.h>
-
-#include "qrcode/utils/QrCodeUtils.h"
 
 class QrScanThread : public QThread
 {

src/qrcode/scanner/URDialog.cpp

@@ -8,7 +8,6 @@
 #include <QInputDialog>
 
 #include "utils/Utils.h"
-#include "WalletManager.h"
 
 URDialog::URDialog(QWidget *parent)
         : WindowModalDialog(parent)

src/qrcode/scanner/URDialog.h

@@ -4,8 +4,6 @@
 #ifndef FEATHER_URDIALOG_H
 #define FEATHER_URDIALOG_H
 
-#include <QDialog>
-
 #include "components.h"
 
 namespace Ui {

src/qrcode/scanner/URWidget.h

@@ -8,7 +8,6 @@
 #include <QTimer>
 
 #include "qrcode/QrCode.h"
-#include "widgets/QrCodeWidget.h"
 #include <bcur/bc-ur.hpp>
 
 namespace Ui {

src/utils/AppData.cpp

@@ -2,6 +2,9 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "AppData.h"
+
+#include <QCoreApplication>
+
 #include "config.h"
 #include "WebsocketNotifier.h"
 

src/utils/AppData.h

@@ -6,7 +6,6 @@
 
 #include <QObject>
 #include <QPointer>
-#include <QCoreApplication>
 
 #include "prices.h"
 #include "TxFiatHistory.h"

src/utils/EventFilter.cpp

@@ -4,7 +4,6 @@
 #include "EventFilter.h"
 
 #include <QKeyEvent>
-#include <QDebug>
 
 EventFilter::EventFilter(QObject *parent)
     : QObject(parent)

src/utils/EventFilter.h

@@ -16,7 +16,6 @@ public:
 protected:
     bool eventFilter(QObject *obj, QEvent *ev);
 
-
 signals:
     void userActivity();
 };

src/utils/NetworkManager.cpp

@@ -5,7 +5,6 @@
 
 #include <QCoreApplication>
 #include <QNetworkProxy>
-#include <QRegularExpression>
 #include <QUrl>
 
 #include "utils/config.h"

src/utils/Networking.cpp

@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
+#include "utils/Networking.h"
+
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QJsonDocument>
 
-#include "utils/Utils.h"
-#include "utils/Networking.h"
 #include "utils/NetworkManager.h"
 #include "config.h"
 

src/utils/Seed.cpp

@@ -1,9 +1,17 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include <iomanip>
 #include "Seed.h"
 
+#include "constants.h"
+#include "monero_seed/monero_seed.hpp"
+#include "polyseed/polyseed.h"
+#include "utils/AppData.h"
+
+#include <sstream>
+#include <utility>
+#include <iomanip>
+
 Seed::Seed(Type type, NetworkType::Type networkType, QString language, const char* secret)
     : type(type)
     , networkType(networkType)

src/utils/Seed.h

@@ -4,17 +4,11 @@
 #ifndef FEATHER_SEED_H
 #define FEATHER_SEED_H
 
-#include "constants.h"
-#include "libwalletqt/Wallet.h"
-#include "monero_seed/monero_seed.hpp"
-#include "polyseed/polyseed.h"
-#include "utils/AppData.h"
-
+#include <QMap>
 #include <QString>
 #include <QStringList>
 
-#include <sstream>
-#include <utility>
+#include "networktype.h"
 
 struct Seed {
     enum Type {

src/utils/SemanticVersion.h

@@ -5,6 +5,7 @@
 #define FEATHER_SEMANTICVERSION_H
 
 #include <QObject>
+#include <QRegularExpression>
 
 struct SemanticVersion
 {

src/utils/TorManager.cpp

@@ -3,7 +3,8 @@
 
 #include "utils/TorManager.h"
 
-#include <QDesktopServices>
+#include <QCoreApplication>
+#include <QDirIterator>
 
 #include "utils/config.h"
 #include "utils/Utils.h"

src/utils/TorManager.h

@@ -4,11 +4,10 @@
 #ifndef FEATHER_TOR_H
 #define FEATHER_TOR_H
 
-#include <cstdio>
-#include <cstdlib>
-#include <iostream>
-#include <QRegularExpression>
-#include <QtNetwork>
+#include <QObject>
+#include <QProcess>
+#include <QTimer>
+
 #include "utils/SemanticVersion.h"
 
 class TorManager : public QObject

src/utils/TxFiatHistory.cpp

@@ -2,6 +2,9 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "TxFiatHistory.h"
+
+#include <QJsonObject>
+
 #include "utils/Utils.h"
 
 TxFiatHistory::TxFiatHistory(int genesis_timestamp, const QString &configDirectory, QObject *parent)

src/utils/Utils.cpp

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
+#include "Utils.h"
+
 #include <QApplication>
 #include <QMessageBox>
 #include <QClipboard>
@@ -9,14 +11,20 @@
 #include <QFontDatabase>
 #include <QTcpSocket>
 #include <QFileDialog>
+#include <QLayout>
+#include <QLayoutItem>
+#include <QJsonDocument>
+#include <QThread>
+#include <QStandardPaths>
+#include <QProcess>
 
 #include "constants.h"
 #include "networktype.h"
-#include "Utils.h"
 #include "utils/ColorScheme.h"
 #include "utils/config.h"
 #include "utils/os/tails.h"
 #include "utils/os/whonix.h"
+#include "libwalletqt/Wallet.h"
 #include "WindowManager.h"
 
 namespace Utils {

src/utils/Utils.h

@@ -5,13 +5,16 @@
 #define FEATHER_UTILS_H
 
 #include <QRegularExpression>
-#include <QStandardItemModel>
 #include <QTextCharFormat>
 #include <QMessageBox>
+#include <QSettings>
+#include <QStandardItem>
+#include <QMetaEnum>
 
-#include "libwalletqt/Wallet.h"
 #include "networktype.h"
 
+class SubaddressIndex;
+
 namespace Utils
 {
     enum MessageType

src/utils/WebsocketClient.cpp

@@ -4,9 +4,12 @@
 #include "WebsocketClient.h"
 
 #include <QCoreApplication>
-#include "utils/Utils.h"
+#include <QRandomGenerator>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 #include "utils/config.h"
+#include "utils/Utils.h"
 
 WebsocketClient::WebsocketClient(QObject *parent)
     : QObject(parent)

src/utils/WebsocketNotifier.cpp

@@ -2,8 +2,6 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "WebsocketNotifier.h"
-#include "Utils.h"
-#include "utils/os/tails.h"
 #include "utils/os/whonix.h"
 #include "plugins/PluginRegistry.h"
 

src/utils/config.cpp

@@ -4,6 +4,10 @@
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
 #include "config.h"
+
+#include <QCoreApplication>
+#include <QStandardPaths>
+
 #include "utils/Utils.h"
 #include "utils/os/tails.h"
 

src/utils/daemonrpc.cpp

@@ -3,6 +3,9 @@
 
 #include "daemonrpc.h"
 
+#include <QJsonArray>
+#include <QJsonDocument>
+
 DaemonRpc::DaemonRpc(QObject *parent, QString daemonAddress)
         : QObject(parent)
         , m_network(new Networking(this))

src/utils/daemonrpc.h

@@ -5,6 +5,7 @@
 #define FEATHER_DAEMON_RPC_H
 
 #include <QObject>
+#include <QJsonObject>
 
 #include "utils/Networking.h"
 

src/utils/networktype.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <QObject>
-#include <wallet/api/wallet2_api.h>
 
 class NetworkType : public QObject
 {
@@ -12,9 +11,9 @@ class NetworkType : public QObject
 
 public:
     enum Type : uint8_t {
-        MAINNET = Monero::MAINNET,
-        TESTNET = Monero::TESTNET,
-        STAGENET = Monero::STAGENET
+        MAINNET = 0,
+        TESTNET = 1,
+        STAGENET = 2
     };
     Q_ENUM(Type)
 };

src/utils/nodes.cpp

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include <QObject>
-
 #include "nodes.h"
+
+#include "libwalletqt/Wallet.h"
 #include "utils/AppData.h"
 #include "utils/Utils.h"
 #include "utils/os/tails.h"

src/utils/nodes.h

@@ -4,14 +4,19 @@
 #ifndef FEATHER_NODES_H
 #define FEATHER_NODES_H
 
+#include <QObject>
+#include <QJsonObject>
 #include <QTimer>
 #include <QRegularExpression>
 #include <QHostAddress>
+#include <QUrl>
 
 #include "model/NodeModel.h"
 #include "utils/Utils.h"
 #include "utils/config.h"
 
+class Wallet;
+
 enum NodeSource {
     websocket = 0,
     custom

src/utils/os/tails.cpp

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
+#include "tails.h"
+
+#include <QDir>
 #include <QRegularExpression>
 #include <QMessageBox>
 
-#include "tails.h"
 #include "Utils.h"
 
 bool TailsOS::detected = false;

src/utils/os/tails.h

@@ -4,6 +4,8 @@
 #ifndef TAILSOS_H
 #define TAILSOS_H
 
+#include <QString>
+
 class TailsOS
 {
 public:

src/utils/prices.cpp

@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include "utils/prices.h"
+#include "prices.h"
+
+#include <QJsonArray>
+#include <QJsonObject>
 
 Prices::Prices(QObject *parent)
     : QObject(parent)

src/utils/scheduler.h

@@ -4,13 +4,9 @@
 #ifndef FUTURE_SCHEDULER_H
 #define FUTURE_SCHEDULER_H
 
-#include <functional>
-
 #include <QtConcurrent/QtConcurrent>
 #include <QFuture>
-//#include <QJSValue>
 #include <QMutex>
-#include <QMutexLocker>
 #include <QPair>
 #include <QWaitCondition>
 

src/utils/updater/Updater.cpp

@@ -12,7 +12,6 @@
 #include "Utils.h"
 #include "utils/AsyncTask.h"
 #include "utils/Networking.h"
-#include "utils/NetworkManager.h"
 #include "utils/SemanticVersion.h"
 
 Updater::Updater(QObject *parent) :

src/widgets/UrlListConfigureWidget.h

@@ -5,7 +5,6 @@
 #define FEATHER_URLLISTCONFIGUREWIDGET_H
 
 #include <QWidget>
-#include <QTextEdit>
 
 #include "utils/config.h"
 

src/widgets/WalletUnlockWidget.cpp

@@ -8,6 +8,7 @@
 #include <QPushButton>
 
 #include "utils/Utils.h"
+#include "libwalletqt/Wallet.h"
 
 WalletUnlockWidget::WalletUnlockWidget(QWidget *parent, Wallet *wallet)
         : QWidget(parent)

src/widgets/WalletUnlockWidget.h

@@ -5,9 +5,8 @@
 #define FEATHER_WALLETUNLOCKWIDGET_H
 
 #include <QWidget>
-#include <QMenu>
 
-#include "Wallet.h"
+class Wallet;
 
 namespace Ui {
     class WalletUnlockWidget;

src/wizard/PageHardwareDevice.cpp

@@ -3,12 +3,13 @@
 
 #include "PageHardwareDevice.h"
 #include "ui_PageHardwareDevice.h"
-#include "WalletWizard.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QPushButton>
 
+#include "WalletWizard.h"
+
 PageHardwareDevice::PageHardwareDevice(WizardFields *fields, QWidget *parent)
         : QWizardPage(parent)
         , ui(new Ui::PageHardwareDevice)

src/wizard/PageHardwareDevice.h

@@ -4,12 +4,9 @@
 #ifndef FEATHER_PAGEHARDWAREDEVICE_H
 #define FEATHER_PAGEHARDWAREDEVICE_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
-#include <QDir>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageHardwareDevice;

src/wizard/PageMenu.cpp

@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include "WalletWizard.h"
 #include "PageMenu.h"
 #include "ui_PageMenu.h"
 
-#include <QFileDialog>
-
 #include "config-feather.h"
+#include "WalletWizard.h"
 
 PageMenu::PageMenu(WizardFields *fields, WalletKeysFilesModel *wallets, QWidget *parent)
         : QWizardPage(parent)

src/wizard/PageMenu.h

@@ -4,9 +4,10 @@
 #ifndef FEATHER_WIZARDMENU_H
 #define FEATHER_WIZARDMENU_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
+
+class WizardFields;
+class WalletKeysFilesModel;
 
 namespace Ui {
     class PageMenu;

src/wizard/PageNetwork.cpp

@@ -7,6 +7,7 @@
 #include <QtConcurrent/QtConcurrent>
 
 #include "constants.h"
+#include "utils/nodes.h"
 #include "utils/os/Prestium.h"
 #include "Utils.h"
 #include "WalletWizard.h"

src/wizard/PageNetwork.h

@@ -4,11 +4,8 @@
 #ifndef FEATHER_WIZARDNETWORK_H
 #define FEATHER_WIZARDNETWORK_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
-
-#include "utils/nodes.h"
+#include <QFutureWatcher>
 
 namespace Ui {
     class PageNetwork;

src/wizard/PageNetworkProxy.cpp

@@ -3,9 +3,10 @@
 
 #include "PageNetworkProxy.h"
 #include "ui_PageNetworkProxy.h"
-#include "WalletWizard.h"
 
-#include <QSysInfo>
+#include <QTimer>
+
+#include "WalletWizard.h"
 
 PageNetworkProxy::PageNetworkProxy(QWidget *parent)
     : QWizardPage(parent)

src/wizard/PageOpenWallet.cpp

@@ -8,6 +8,7 @@
 
 #include "constants.h"
 #include "WalletWizard.h"
+#include "model/WalletKeysFilesModel.h"
 
 PageOpenWallet::PageOpenWallet(WalletKeysFilesModel *wallets, QWidget *parent)
         : QWizardPage(parent)

src/wizard/PageOpenWallet.h

@@ -7,9 +7,9 @@
 #include <QLabel>
 #include <QStandardItemModel>
 #include <QWizardPage>
-#include <QWidget>
 
-#include "model/WalletKeysFilesModel.h"
+class WalletKeysFilesModel;
+class WalletKeysFilesProxyModel;
 
 namespace Ui {
     class PageOpenWallet;

src/wizard/PageSetPassword.h

@@ -5,9 +5,8 @@
 #define FEATHER_PASSWORD_H
 
 #include <QWizardPage>
-#include <QWidget>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageSetPassword;

src/wizard/PageSetRestoreHeight.cpp

@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include <QValidator>
 #include "PageSetRestoreHeight.h"
 #include "ui_PageSetRestoreHeight.h"
-#include "WalletWizard.h"
-#include "constants.h"
 
+#include <QValidator>
+
+#include "constants.h"
+#include "utils/AppData.h"
 #include "utils/Icons.h"
+#include "WalletWizard.h"
 
 PageSetRestoreHeight::PageSetRestoreHeight(WizardFields *fields, QWidget *parent)
         : QWizardPage(parent)