cleanup includes

diff --git a/monero b/monero
index 14d2ac095df656745e383258f4434ed4968b1c6b..5b9a197de481409ab3dc4cd25c5a1048d20ca09f 160000 (submodule)
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit 14d2ac095df656745e383258f4434ed4968b1c6b
+Subproject commit 5b9a197de481409ab3dc4cd25c5a1048d20ca09f

diff --git a/src/Application.h b/src/Application.h
index 3600334c50b30001126d35943cc6c0d8160cc587..1e6d89b48fedc754c373e6b9b27df6a5101da406 100644 (file)
--- a/src/Application.h
+++ b/src/Application.h
@@ -8,7 +8,6 @@
 #include <QtNetwork/qlocalserver.h>
 
 class QLockFile;
-class QSocketNotifier;
 
 class Application : public QApplication {
     Q_OBJECT

diff --git a/src/ContactsWidget.cpp b/src/ContactsWidget.cpp
index 9ad508efaf7d5fa0d2ddd1921ea75972848eddb9..106f8bba77af85273771cbd381dc750ce407eaa3 100644 (file)
--- a/src/ContactsWidget.cpp
+++ b/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"

diff --git a/src/ContactsWidget.h b/src/ContactsWidget.h
index d6c8291a662892ec398e90ae0f68d73dfa74d05d..395511bff807c6587325a42f96eab88bde5cc0b0 100644 (file)
--- a/src/ContactsWidget.h
+++ b/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;

diff --git a/src/HistoryWidget.cpp b/src/HistoryWidget.cpp
index d5e5939f440f7beb8a7dbf365110c89f38194dba..59a00518849db955c01418fa6a86755e6956e71e 100644 (file)
--- a/src/HistoryWidget.cpp
+++ b/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"

diff --git a/src/HistoryWidget.h b/src/HistoryWidget.h
index f387b07b21a6bd5591327bfb73e197d993d7aae8..44e7b83e72a328be7d19146a7f07674bfa66a646 100644 (file)
--- a/src/HistoryWidget.h
+++ b/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;

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 848f1e3ab0e099e1c970ea9ea4561e2ef8d07d61..e4944a26faa31597d3ef01bc06468f2c939aef4a 100644 (file)
--- a/src/MainWindow.cpp
+++ b/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"
 

diff --git a/src/ReceiveWidget.cpp b/src/ReceiveWidget.cpp
index a4634018d8785aaedaf97a42089167bc9aa2c40e..39aa24b3a7ea9ae0fe7d75d41c863965eed11e94 100644 (file)
--- a/src/ReceiveWidget.cpp
+++ b/src/ReceiveWidget.cpp
@@ -5,7 +5,6 @@
 #include "ui_ReceiveWidget.h"
 
 #include <QMenu>
-#include <QMessageBox>
 
 #include "dialog/PaymentRequestDialog.h"
 #include "dialog/QrCodeDialog.h"

diff --git a/src/ReceiveWidget.h b/src/ReceiveWidget.h
index 43be717be1e4d041644490973c02fedc3558a4bb..28c6e7982f756abcb1ec1f338850a114321324e1 100644 (file)
--- a/src/ReceiveWidget.h
+++ b/src/ReceiveWidget.h
@@ -6,7 +6,6 @@
 
 #include <QMenu>
 #include <QWidget>
-#include <QSvgWidget>
 
 #include "libwalletqt/Subaddress.h"
 #include "libwalletqt/Wallet.h"

diff --git a/src/SendWidget.h b/src/SendWidget.h
index 1fece10881239275e1e14860ef8c17b583138d36..1b310f2b4a14d553e1e8e4cf3027d44cc9a7c6b4 100644 (file)
--- a/src/SendWidget.h
+++ b/src/SendWidget.h
@@ -6,7 +6,7 @@
 
 #include <QWidget>
 
-#include "libwalletqt/Wallet.h"
+class Wallet;
 
 namespace Ui {
     class SendWidget;

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index cbdd3d32cd967675f7a48354549dd58d57735ed9..2f52a8a848a170db1c64c0b1b4d9442bbd91fb1a 100644 (file)
--- a/src/SettingsDialog.cpp
+++ b/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"

diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h
index 604dd9c5917487fa13a4b9b7d6a62018426cf547..3630439c8e06605c74546f56370879a34913c7ea 100644 (file)
--- a/src/SettingsDialog.h
+++ b/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

diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp
index d892fec2b963ec3c3f8bfd53df78813d794ee309..dbd022a2b644ba1c75f9ee8e172f9b3d1ce0f66b 100644 (file)
--- a/src/WindowManager.cpp
+++ b/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)

diff --git a/src/WindowManager.h b/src/WindowManager.h
index beccd5ed7da187f35bfa6de99985f436d9194f91..a694ef791162d50a949682ae7c76ecdb9cd877c1 100644 (file)
--- a/src/WindowManager.h
+++ b/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
 

diff --git a/src/constants.h b/src/constants.h
index 2e01b220a19f3984f7197fd95ac9c66d2588945c..65e3c24f3ad6a23095ba2dd543815cd7ee87e439 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -4,8 +4,7 @@
 #ifndef FEATHER_CONSTANTS_H
 #define FEATHER_CONSTANTS_H
 
-#include <QtGlobal>
-#include <QUrl>
+#include <QString>
 
 #include "networktype.h"
 

diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp
index 354879eb85d55b21a2de3800c4ef5f84111998d6..3ca0ca954c00ee17d3e13cb73515a7392a272c55 100644 (file)
--- a/src/dialog/AboutDialog.cpp
+++ b/src/dialog/AboutDialog.cpp
@@ -5,6 +5,7 @@
 #include "ui_AboutDialog.h"
 
 #include <QMessageBox>
+#include <QDate>
 
 #include "config-feather.h"
 #include "utils/Utils.h"

diff --git a/src/dialog/AboutDialog.h b/src/dialog/AboutDialog.h
index e8820468d43304f5a50040151ebecc6e962a6f7b..b07312c12e1d787b331a62ca5aa636a66961e059 100644 (file)
--- a/src/dialog/AboutDialog.h
+++ b/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 {

diff --git a/src/dialog/AccountSwitcherDialog.cpp b/src/dialog/AccountSwitcherDialog.cpp
index 4c3a6a6c2a564dfd2feda84a17f9a73f14f7afac..c907c21d10524a2eb6f0c91124501529df3857fc 100644 (file)
--- a/src/dialog/AccountSwitcherDialog.cpp
+++ b/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"
 

diff --git a/src/dialog/AccountSwitcherDialog.h b/src/dialog/AccountSwitcherDialog.h
index 1d3dcef65530766af8d60e19c9356982d63542f9..eef7b1a64c2d6e3cc73a6a95f774467d8952d0a1 100644 (file)
--- a/src/dialog/AccountSwitcherDialog.h
+++ b/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 {

diff --git a/src/dialog/AddressCheckerIndexDialog.cpp b/src/dialog/AddressCheckerIndexDialog.cpp
index ae4e3696429e49c2cecd2ea5271a0cdfeb11dec1..ce1670fbb073e6e742f3d29750285ed19c63ecf4 100644 (file)
--- a/src/dialog/AddressCheckerIndexDialog.cpp
+++ b/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)

diff --git a/src/dialog/AddressCheckerIndexDialog.h b/src/dialog/AddressCheckerIndexDialog.h
index 6ab397abbdc24ddbf1bfb6776558cfdc06e4e4d8..b4777c862cc19c32952e4a5ad3ab569195036fcf 100644 (file)
--- a/src/dialog/AddressCheckerIndexDialog.h
+++ b/src/dialog/AddressCheckerIndexDialog.h
@@ -5,7 +5,8 @@
 #define ADDRESSCHECKERINDEXDIALOG_H
 
 #include "components.h"
-#include "Wallet.h"
+
+class Wallet;
 
 namespace Ui {
     class AddressCheckerIndexDialog;

diff --git a/src/dialog/BalanceDialog.h b/src/dialog/BalanceDialog.h
index 759271368526b57b504fbd567d6e3bec180dfc50..f62e08befbf41afed56a5f0e664eb74ba85aa001 100644 (file)
--- a/src/dialog/BalanceDialog.h
+++ b/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"
 

diff --git a/src/dialog/DocsDialog.cpp b/src/dialog/DocsDialog.cpp
index f6ffb78851357730232e57ecce8475e121b3ea8d..c86d2f84134418491ade041bfea76114423135a9 100644 (file)
--- a/src/dialog/DocsDialog.cpp
+++ b/src/dialog/DocsDialog.cpp
@@ -5,6 +5,7 @@
 #include "ui_DocsDialog.h"
 
 #include <QScrollBar>
+#include <QDirIterator>
 
 #include "utils/Utils.h"
 #include "ColorScheme.h"

diff --git a/src/libwalletqt/Coins.h b/src/libwalletqt/Coins.h
index 4c6b252a57545208db8f312ac204858431b6253a..ce875c0dad2a52686f5c3dc46f428022d6324e01 100644 (file)
--- a/src/libwalletqt/Coins.h
+++ b/src/libwalletqt/Coins.h
@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QList>
 #include <QReadWriteLock>
-#include <QDateTime>
 
 #include "Wallet.h"
 

diff --git a/src/libwalletqt/ConstructionInfo.cpp b/src/libwalletqt/ConstructionInfo.cpp
index 588b04aaca362a16052482cfb4d382c0e207fba6..d35a4e068ce8194d5395b35b6d73c21d034688c1 100644 (file)
--- a/src/libwalletqt/ConstructionInfo.cpp
+++ b/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;

diff --git a/src/libwalletqt/ConstructionInfo.h b/src/libwalletqt/ConstructionInfo.h
index 9f044d7cb2a930fa542ad286e0e082eebcb4dca0..906343ca227c7be4d0bd08d54bae97e40059a692 100644 (file)
--- a/src/libwalletqt/ConstructionInfo.h
+++ b/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

diff --git a/src/libwalletqt/Input.h b/src/libwalletqt/Input.h
index 1699b033f1bd7efec80afb62a63ef67bc381a366..756fb72adf264f6438cc59641beae79eba5e2f8c 100644 (file)
--- a/src/libwalletqt/Input.h
+++ b/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

diff --git a/src/libwalletqt/PassphraseHelper.cpp b/src/libwalletqt/PassphraseHelper.cpp
index 747a20b802d8f3b78f99a6beeddbcbea8a888448..fe1d94c3775c6ac8f99aa79d638f17713d2abe19 100644 (file)
--- a/src/libwalletqt/PassphraseHelper.cpp
+++ b/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>();
     }
 }
 

diff --git a/src/libwalletqt/PassphraseHelper.h b/src/libwalletqt/PassphraseHelper.h
index 745ce50738a144dc4dd1f46b8d1ec1fe0b6ffd49..8b082fa895b058fa59a051a4710707342bf8f7dc 100644 (file)
--- a/src/libwalletqt/PassphraseHelper.h
+++ b/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:

diff --git a/src/libwalletqt/PendingTransaction.cpp b/src/libwalletqt/PendingTransaction.cpp
index 85e751daa3bbe72931939fe98b76305ef88eeb2f..a2ce6a55eb2f5b2feefd082c93bde08f25065468 100644 (file)
--- a/src/libwalletqt/PendingTransaction.cpp
+++ b/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());

diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index 754cfcd16658ad4048e7bd1ae2052dd98b5c1138..c5fe0832e100199ec06372f5f894fc9aab7602d3 100644 (file)
--- a/src/libwalletqt/PendingTransaction.h
+++ b/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)
 

diff --git a/src/libwalletqt/PendingTransactionInfo.cpp b/src/libwalletqt/PendingTransactionInfo.cpp
index f8fb4583a8e58461d989f5e3f1ab880f189d379f..cba246ddd01626aa753ff66a6e6566d568f95021 100644 (file)
--- a/src/libwalletqt/PendingTransactionInfo.cpp
+++ b/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;

diff --git a/src/libwalletqt/PendingTransactionInfo.h b/src/libwalletqt/PendingTransactionInfo.h
index 48135e39264e442dbf445b2b20273491fe22a43c..807edbe7bc6ce5ee1ef3d2263ad5d9dae7e1009e 100644 (file)
--- a/src/libwalletqt/PendingTransactionInfo.h
+++ b/src/libwalletqt/PendingTransactionInfo.h
@@ -11,6 +11,10 @@
 class Input;
 class Transfer;
 
+namespace Monero {
+    class PendingTransactionInfo;
+}
+
 class PendingTransactionInfo : public ConstructionInfo
 {
     Q_OBJECT

diff --git a/src/libwalletqt/Ring.h b/src/libwalletqt/Ring.h
index 6e1564f8a024a6b1afd575cb2dea604d3e69f82e..f81b5478300c0cff1a280dd447f9d3dad0b19404 100644 (file)
--- a/src/libwalletqt/Ring.h
+++ b/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
 {

diff --git a/src/libwalletqt/Subaddress.h b/src/libwalletqt/Subaddress.h
index fe7571ca008743710a517c1eaf042ae81a25bf2d..4ea30dfa940d93163bd520137d9ce8e8302fca45 100644 (file)
--- a/src/libwalletqt/Subaddress.h
+++ b/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>
 

diff --git a/src/libwalletqt/UnsignedTransaction.cpp b/src/libwalletqt/UnsignedTransaction.cpp
index c8b56de330b93652cf539a44d9220ef9ddfe7efd..14489ecf9ee12be7f51cc14fb91611404e60054c 100644 (file)
--- a/src/libwalletqt/UnsignedTransaction.cpp
+++ b/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
 {

diff --git a/src/libwalletqt/UnsignedTransaction.h b/src/libwalletqt/UnsignedTransaction.h
index 33e872376978854b186e171f06c20313e5a3baba..06775930011b819f4dbbd7e0584e6d9d67dbc41d 100644 (file)
--- a/src/libwalletqt/UnsignedTransaction.h
+++ b/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)
 

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index b806bd574208100e2b3036f684f10487b46060b9..770718a083d66d812d6fe2c290c014f040c06572 100644 (file)
--- a/src/libwalletqt/Wallet.cpp
+++ b/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);
 }

diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index bf5636b0bbde7733a3e65caa3764264913d1dc17..2da7baffa485f875a8da63a00c46f76c45c36b3a 100644 (file)
--- a/src/libwalletqt/Wallet.h
+++ b/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

diff --git a/src/libwalletqt/WalletListenerImpl.cpp b/src/libwalletqt/WalletListenerImpl.cpp
index 5407be82507aaed7836879a97dbbbbdb3cf133b9..2f6258985f1aa3b4ab714b88f086a1b0d83be989 100644 (file)
--- a/src/libwalletqt/WalletListenerImpl.cpp
+++ b/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);

diff --git a/src/libwalletqt/WalletListenerImpl.h b/src/libwalletqt/WalletListenerImpl.h
index 67d91ea1966c721be930af64c1f9b1b6677e09e4..da0ba11e0d0e33c5efc55c9420efa597303192a0 100644 (file)
--- a/src/libwalletqt/WalletListenerImpl.h
+++ b/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;

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index 32a4783205de793c26708afd2581dd288b2a6c64..92ffe8a885ab5eeb6e70e4f5c351f541ad821263 100644 (file)
--- a/src/libwalletqt/WalletManager.cpp
+++ b/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);

diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 596a03f09f4a97d6e142c5d8a1f94ed6ee713a48..2a43cfc3863ac4c9d71fcbecfc004d250aa81c6f 100644 (file)
--- a/src/libwalletqt/WalletManager.h
+++ b/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>

diff --git a/src/main.cpp b/src/main.cpp
index 1627805b4802dd6f1b6e7aa4aa40361481da74bf..ed516db64e3805091ce590683be53ea02a476e04 100644 (file)
--- a/src/main.cpp
+++ b/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

diff --git a/src/model/CoinsModel.h b/src/model/CoinsModel.h
index d42bbba822f90a327a47bc34507b9bcbdcd35653..39cf4dcfb98a13d12de7cd1355205dbd9f28283e 100644 (file)
--- a/src/model/CoinsModel.h
+++ b/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;

diff --git a/src/model/SubaddressModel.h b/src/model/SubaddressModel.h
index 9ee3cfbdd969aafd6ca1920b50ccabff875732cd..4d0fe97da0845ed3a7ee4d3725d33c5dc95a9d0d 100644 (file)
--- a/src/model/SubaddressModel.h
+++ b/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"
 

diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp
index 1cbc17b5f2a2ce34c05bd7aedb6d46420d24a64e..932b43d3d9fadd14dcdae0362a0d777c08e9feef 100644 (file)
--- a/src/model/TransactionHistoryModel.cpp
+++ b/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"

diff --git a/src/plugins/bounties/BountiesWidget.cpp b/src/plugins/bounties/BountiesWidget.cpp
index d9322c4ba0d1412f231e530aa7e75fb380fa1cab..2a12198bfcc8186048f2b243f0582dc4fdf10cea 100644 (file)
--- a/src/plugins/bounties/BountiesWidget.cpp
+++ b/src/plugins/bounties/BountiesWidget.cpp
@@ -5,6 +5,7 @@
 #include "ui_BountiesWidget.h"
 
 #include <QTableWidget>
+#include <QJsonArray>
 
 #include "BountiesModel.h"
 #include "utils/Utils.h"

diff --git a/src/plugins/crowdfunding/CCSWidget.cpp b/src/plugins/crowdfunding/CCSWidget.cpp
index 0ec9e5738a7558b6c62f3111165f2a4491026383..6a50eb482472c8f40f8ac9ed8c1a5bed0a24065c 100644 (file)
--- a/src/plugins/crowdfunding/CCSWidget.cpp
+++ b/src/plugins/crowdfunding/CCSWidget.cpp
@@ -5,6 +5,7 @@
 #include "ui_CCSWidget.h"
 
 #include <QTableWidget>
+#include <QJsonArray>
 
 #include "CCSProgressDelegate.h"
 #include "utils/Utils.h"

diff --git a/src/plugins/revuo/RevuoWidget.cpp b/src/plugins/revuo/RevuoWidget.cpp
index 64581c408e823e52879fc5a87d36e70ae78e0dac..a2442e38e5c535df0fe34ffdf194a6ff4055b195 100644 (file)
--- a/src/plugins/revuo/RevuoWidget.cpp
+++ b/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"

diff --git a/src/qrcode/scanner/QrCodeScanDialog.cpp b/src/qrcode/scanner/QrCodeScanDialog.cpp
index c1e7852d37d67673e82d375fc87e7a752f96145e..36a78053d3f93d9e4808c7bc87aef3338547a7f4 100644 (file)
--- a/src/qrcode/scanner/QrCodeScanDialog.cpp
+++ b/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)
@@ -34,4 +25,4 @@ QString QrCodeScanDialog::decodedString() {
 QrCodeScanDialog::~QrCodeScanDialog()
 {
 
-}
\ No newline at end of file
+}

diff --git a/src/qrcode/scanner/QrCodeScanDialog.h b/src/qrcode/scanner/QrCodeScanDialog.h
index 5f0668bd09b372cc857323e1e19e34d0b19d4c00..307ad13ecb606f6f224ee1771ddccd809d1c29c5 100644 (file)
--- a/src/qrcode/scanner/QrCodeScanDialog.h
+++ b/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;

diff --git a/src/qrcode/scanner/QrCodeScanWidget.cpp b/src/qrcode/scanner/QrCodeScanWidget.cpp
index e1d941892adfb613a389d593db8591d1a147919c..27d3f7316ebd5d5b25bad446ba420bec4dab458c 100644 (file)
--- a/src/qrcode/scanner/QrCodeScanWidget.cpp
+++ b/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)

diff --git a/src/qrcode/scanner/QrCodeScanWidget.h b/src/qrcode/scanner/QrCodeScanWidget.h
index 700c31678c6293c1ad7d7dabb74941c014f8e9d4..6d16358422c25801f26f577685daffe8a8a3ef59 100644 (file)
--- a/src/qrcode/scanner/QrCodeScanWidget.h
+++ b/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;
 }

diff --git a/src/qrcode/scanner/QrScanThread.cpp b/src/qrcode/scanner/QrScanThread.cpp
index 855188407d13192c265db6eba49a168dd84cd41c..0265cfceff86c38852e36e64f5455b4f26a583d3 100644 (file)
--- a/src/qrcode/scanner/QrScanThread.cpp
+++ b/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)

diff --git a/src/qrcode/scanner/QrScanThread.h b/src/qrcode/scanner/QrScanThread.h
index 50d227e603ca7eb6051d905a10e5a01eda50f344..4e0eaca779621698e24a5bf714401bff13afc168 100644 (file)
--- a/src/qrcode/scanner/QrScanThread.h
+++ b/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
 {

diff --git a/src/qrcode/scanner/URDialog.cpp b/src/qrcode/scanner/URDialog.cpp
index a0226a7da56e40bf34336984552f3e23b774ee53..926879bdd42d6a5f6be6b8636e1817ba6cc1af38 100644 (file)
--- a/src/qrcode/scanner/URDialog.cpp
+++ b/src/qrcode/scanner/URDialog.cpp
@@ -8,7 +8,6 @@
 #include <QInputDialog>
 
 #include "utils/Utils.h"
-#include "WalletManager.h"
 
 URDialog::URDialog(QWidget *parent)
         : WindowModalDialog(parent)

diff --git a/src/qrcode/scanner/URDialog.h b/src/qrcode/scanner/URDialog.h
index 1ef579100f7826a9849554ad50b2f6a85ed044fa..d24785debfa4682a25bb8e633e8c95b540231993 100644 (file)
--- a/src/qrcode/scanner/URDialog.h
+++ b/src/qrcode/scanner/URDialog.h
@@ -4,8 +4,6 @@
 #ifndef FEATHER_URDIALOG_H
 #define FEATHER_URDIALOG_H
 
-#include <QDialog>
-
 #include "components.h"
 
 namespace Ui {

diff --git a/src/qrcode/scanner/URWidget.h b/src/qrcode/scanner/URWidget.h
index da56bbef29a45b0e16df34e2aa068abf72296a37..b64b1eeb13e026f752932a4a86de6eaf320ed352 100644 (file)
--- a/src/qrcode/scanner/URWidget.h
+++ b/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 {

diff --git a/src/utils/AppData.cpp b/src/utils/AppData.cpp
index 08b5d35e280286d6ca30c8bb39debb16d6e82ecd..65103217b49bf2f5f5f8c88571d7d2d8a11a5dcd 100644 (file)
--- a/src/utils/AppData.cpp
+++ b/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"
 

diff --git a/src/utils/AppData.h b/src/utils/AppData.h
index 95f502055b54acc78f7aeeaae24199a716114692..701a01828d3400baa689179a1c7aaed973ca0a90 100644 (file)
--- a/src/utils/AppData.h
+++ b/src/utils/AppData.h
@@ -6,7 +6,6 @@
 
 #include <QObject>
 #include <QPointer>
-#include <QCoreApplication>
 
 #include "prices.h"
 #include "TxFiatHistory.h"

diff --git a/src/utils/EventFilter.cpp b/src/utils/EventFilter.cpp
index 7c018f28af2cd3457f6566bceb4c39ae4e45c151..3419fee61557f2502bb5d2058cd9d08ceafce77f 100644 (file)
--- a/src/utils/EventFilter.cpp
+++ b/src/utils/EventFilter.cpp
@@ -4,7 +4,6 @@
 #include "EventFilter.h"
 
 #include <QKeyEvent>
-#include <QDebug>
 
 EventFilter::EventFilter(QObject *parent)
     : QObject(parent)

diff --git a/src/utils/EventFilter.h b/src/utils/EventFilter.h
index f759b1d15737609cb45cd8bae93b532a765d22e4..8c99fa557b21578abaf0eecac4d509eb9c96684b 100644 (file)
--- a/src/utils/EventFilter.h
+++ b/src/utils/EventFilter.h
@@ -16,7 +16,6 @@ public:
 protected:
     bool eventFilter(QObject *obj, QEvent *ev);
 
-
 signals:
     void userActivity();
 };

diff --git a/src/utils/NetworkManager.cpp b/src/utils/NetworkManager.cpp
index c988ae7f05dde9f0d20f7bf44be1b2ce7a3e958b..04f6edaf9c473fa0f2d764d2d354a072ce886a8a 100644 (file)
--- a/src/utils/NetworkManager.cpp
+++ b/src/utils/NetworkManager.cpp
@@ -5,7 +5,6 @@
 
 #include <QCoreApplication>
 #include <QNetworkProxy>
-#include <QRegularExpression>
 #include <QUrl>
 
 #include "utils/config.h"

diff --git a/src/utils/Networking.cpp b/src/utils/Networking.cpp
index 6be6cdc5e6194f62f4901530f650a0908ba0d9c1..a25a9c63bb7dbfe8028da27dfdfe141d2915b272 100644 (file)
--- a/src/utils/Networking.cpp
+++ b/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"
 

diff --git a/src/utils/Seed.cpp b/src/utils/Seed.cpp
index 852a8dc3954cba27b8cbecc44b4e4971fa0664cd..9b5cdbd1fc7e302f9211fa5a22a444b3db83ed0c 100644 (file)
--- a/src/utils/Seed.cpp
+++ b/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)

diff --git a/src/utils/Seed.h b/src/utils/Seed.h
index 8302a95fe3bbc498313cf3a3cfab13a040660921..8581ea007eb73ba6191cad084ff8c05228ab472f 100644 (file)
--- a/src/utils/Seed.h
+++ b/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 {

diff --git a/src/utils/SemanticVersion.h b/src/utils/SemanticVersion.h
index a2fefd86577ac07040883755b20c17ebfc3c517b..03f0ede7af470b1c912da4502c6e9f9541fe2c0f 100644 (file)
--- a/src/utils/SemanticVersion.h
+++ b/src/utils/SemanticVersion.h
@@ -5,6 +5,7 @@
 #define FEATHER_SEMANTICVERSION_H
 
 #include <QObject>
+#include <QRegularExpression>
 
 struct SemanticVersion
 {

diff --git a/src/utils/TorManager.cpp b/src/utils/TorManager.cpp
index 3ec1db6d8dee39f267eddd129a17994d1f521f38..e3b7f526711ab100203a51f96bb94b33effe109b 100644 (file)
--- a/src/utils/TorManager.cpp
+++ b/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"

diff --git a/src/utils/TorManager.h b/src/utils/TorManager.h
index 2c38ab8611b81d04f461479ac95729b3c43b62d1..5d0334a36fc0800649b191c825720fa66616c190 100644 (file)
--- a/src/utils/TorManager.h
+++ b/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

diff --git a/src/utils/TxFiatHistory.cpp b/src/utils/TxFiatHistory.cpp
index ebaf00f6e8e800bfeca93ad84d523acbc35e7eae..cb9ae349245ce0dea8e22781b5e9955bcbf660eb 100644 (file)
--- a/src/utils/TxFiatHistory.cpp
+++ b/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)

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index e85f615d47601307bbe3539f650b87047558c3ba..ed26b42479a1d4f95eb309ba25a15d964a14f825 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/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 {

diff --git a/src/utils/Utils.h b/src/utils/Utils.h
index e9a1fba8a0d4a09589d640e3b9b7a0c1a2653e40..ce24b7389b18ed1485c0d851f075c7b996a52c49 100644 (file)
--- a/src/utils/Utils.h
+++ b/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

diff --git a/src/utils/WebsocketClient.cpp b/src/utils/WebsocketClient.cpp
index 85b60309aefb75ca6f74a0bfa60df882d1c19a9b..879263e87ff196b88a26f873759681ba0fd78f09 100644 (file)
--- a/src/utils/WebsocketClient.cpp
+++ b/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)

diff --git a/src/utils/WebsocketNotifier.cpp b/src/utils/WebsocketNotifier.cpp
index b3fbc2275f1ab849ee00e69fbb69fb6f9b4dbcd7..3232f11d04407aad6012ddf6f64c9ada90a92740 100644 (file)
--- a/src/utils/WebsocketNotifier.cpp
+++ b/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"
 

diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index 722eb5595ccad2f36578a76a81cf64e3e5b096b7..a17addfad9e78d353021d61b4b45f0ac94e07193 100644 (file)
--- a/src/utils/config.cpp
+++ b/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"
 

diff --git a/src/utils/daemonrpc.cpp b/src/utils/daemonrpc.cpp
index 644ef9a50848eaf94769de6b064ba09b29868370..656db29af596bc6d40e985c9bbee75b6886ca6b6 100644 (file)
--- a/src/utils/daemonrpc.cpp
+++ b/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))

diff --git a/src/utils/daemonrpc.h b/src/utils/daemonrpc.h
index fddfce9b11cccb81837e96c87d6ccd909cd647ce..d53d0981b45fc5235a2a91faf0264771f309c763 100644 (file)
--- a/src/utils/daemonrpc.h
+++ b/src/utils/daemonrpc.h
@@ -5,6 +5,7 @@
 #define FEATHER_DAEMON_RPC_H
 
 #include <QObject>
+#include <QJsonObject>
 
 #include "utils/Networking.h"
 

diff --git a/src/utils/networktype.h b/src/utils/networktype.h
index fb5242a545f80e920b0b0c5d3c15361258899985..fc7118c3826d94e34edfc5c6fd38685d248a233a 100644 (file)
--- a/src/utils/networktype.h
+++ b/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)
 };

diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp
index a31acc2f00f4016a52668b3eb18c3513cf61239c..e8550dd91896907351db447627015564414eea9e 100644 (file)
--- a/src/utils/nodes.cpp
+++ b/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"

diff --git a/src/utils/nodes.h b/src/utils/nodes.h
index 920fda9139ecad623b0fcf6733842d5ddd78c23f..77bca0d9071c1c2665919b1cbc49bddfa21d2b33 100644 (file)
--- a/src/utils/nodes.h
+++ b/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

diff --git a/src/utils/os/tails.cpp b/src/utils/os/tails.cpp
index 73d5603c8eac12c9ae4ae8b3e86fa924606f61b6..1cbe9374707640cd9a920598a23d0d134161a5a2 100644 (file)
--- a/src/utils/os/tails.cpp
+++ b/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;

diff --git a/src/utils/os/tails.h b/src/utils/os/tails.h
index 49c6ad9aa744473ad090628a38e6529cbfb0bf35..d30e1dccd8564aafd4a3c6dc5c1442ae7ab395d7 100644 (file)
--- a/src/utils/os/tails.h
+++ b/src/utils/os/tails.h
@@ -4,6 +4,8 @@
 #ifndef TAILSOS_H
 #define TAILSOS_H
 
+#include <QString>
+
 class TailsOS
 {
 public:

diff --git a/src/utils/prices.cpp b/src/utils/prices.cpp
index 5eb2dfeb242d39adca0a00526f62b048861152f6..1ee9c20754213db65946fef1756d76912d337486 100644 (file)
--- a/src/utils/prices.cpp
+++ b/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)

diff --git a/src/utils/scheduler.h b/src/utils/scheduler.h
index 996923c495d30365b80fd39228e1bd2eb99fa3a7..2be44118d5b6efbd7b172320e599e5b802c5d2eb 100644 (file)
--- a/src/utils/scheduler.h
+++ b/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>
 

diff --git a/src/utils/updater/Updater.cpp b/src/utils/updater/Updater.cpp
index 708a3c50b8a3e58eda67d92c7c87bb2a0cdebce2..b448e899d0f0876f7b4d61486500eb9a9607a266 100644 (file)
--- a/src/utils/updater/Updater.cpp
+++ b/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) :

diff --git a/src/widgets/UrlListConfigureWidget.h b/src/widgets/UrlListConfigureWidget.h
index b84bd546290416b747ffbe31160183ab13a96081..4642cfc86cb54292df2e16eac4db828717dcdc5d 100644 (file)
--- a/src/widgets/UrlListConfigureWidget.h
+++ b/src/widgets/UrlListConfigureWidget.h
@@ -5,7 +5,6 @@
 #define FEATHER_URLLISTCONFIGUREWIDGET_H
 
 #include <QWidget>
-#include <QTextEdit>
 
 #include "utils/config.h"
 

diff --git a/src/widgets/WalletUnlockWidget.cpp b/src/widgets/WalletUnlockWidget.cpp
index 3e6e1405912952c1923c6ea06c9afe6a97ccec04..e4e1f43f70c9983e0467bd051a2d37332b474123 100644 (file)
--- a/src/widgets/WalletUnlockWidget.cpp
+++ b/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)

diff --git a/src/widgets/WalletUnlockWidget.h b/src/widgets/WalletUnlockWidget.h
index dfbaabee7c8ce6a11bd448e7d5cd1f62e7b8431e..d6efa8d4f08bf92915284fb7cb83a1891384090c 100644 (file)
--- a/src/widgets/WalletUnlockWidget.h
+++ b/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;

diff --git a/src/wizard/PageHardwareDevice.cpp b/src/wizard/PageHardwareDevice.cpp
index b1c749cab8e66e425d3d6dc7b31751fd0a540caf..3c444fb9d0dffa2a14a9af56a79f1bd5a965d22f 100644 (file)
--- a/src/wizard/PageHardwareDevice.cpp
+++ b/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)

diff --git a/src/wizard/PageHardwareDevice.h b/src/wizard/PageHardwareDevice.h
index aa5d703edfcd7eb01391ec70c024e9e2225f58fb..0100b1e5246c78604a97243056352fc5a471f395 100644 (file)
--- a/src/wizard/PageHardwareDevice.h
+++ b/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;

diff --git a/src/wizard/PageMenu.cpp b/src/wizard/PageMenu.cpp
index ac337690fc4cf4e33df0e303dd1f6f152dc75641..e318c0627389aa39ec70f195fa9f64b8c8685ca0 100644 (file)
--- a/src/wizard/PageMenu.cpp
+++ b/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)

diff --git a/src/wizard/PageMenu.h b/src/wizard/PageMenu.h
index de18e06d30144341bedd2096e3677efde40b4665..0c3db978d3452f0e86d3547451022225d8e13193 100644 (file)
--- a/src/wizard/PageMenu.h
+++ b/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;

diff --git a/src/wizard/PageNetwork.cpp b/src/wizard/PageNetwork.cpp
index 3f57c0a551d522418b7936deea8c5720f3aa77f9..08da1e123cc90a363861c39f344c8ab4952322e1 100644 (file)
--- a/src/wizard/PageNetwork.cpp
+++ b/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"

diff --git a/src/wizard/PageNetwork.h b/src/wizard/PageNetwork.h
index e59b4378ba55aa1e42ceaf686e37be5cee3f61fd..6a55ac5f1a0e961d4d3d9e0b988f03f3144b38c7 100644 (file)
--- a/src/wizard/PageNetwork.h
+++ b/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;

diff --git a/src/wizard/PageNetworkProxy.cpp b/src/wizard/PageNetworkProxy.cpp
index 7f6e8c07e9bd655850931ed582f8d8cc70da9f30..10e1d6d263642f2a4eaa042725f3b68ab37cf4db 100644 (file)
--- a/src/wizard/PageNetworkProxy.cpp
+++ b/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)

diff --git a/src/wizard/PageOpenWallet.cpp b/src/wizard/PageOpenWallet.cpp
index a290698017691ef38b44bc05cb1208a47a1197d7..bb76227d2f93833b5340ab3cd795063855fbdba9 100644 (file)
--- a/src/wizard/PageOpenWallet.cpp
+++ b/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)

diff --git a/src/wizard/PageOpenWallet.h b/src/wizard/PageOpenWallet.h
index 6c4ad1bbd3f27301bf3dceec7107d0c1527009dc..3db31f21abf2b96230ac2da3e7999faed865072a 100644 (file)
--- a/src/wizard/PageOpenWallet.h
+++ b/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;

diff --git a/src/wizard/PageSetPassword.h b/src/wizard/PageSetPassword.h
index 6c276be8f41e27e2269da278852c8cc0e8613b4d..d3d9a87875af8d290692093f3ad7abc0d850c60b 100644 (file)
--- a/src/wizard/PageSetPassword.h
+++ b/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;

diff --git a/src/wizard/PageSetRestoreHeight.cpp b/src/wizard/PageSetRestoreHeight.cpp
index 10ac6b9498804100c60b2cea142334ceec1beb82..a2d279cb77020092ee4ec7a55fd080ef066e00a4 100644 (file)
--- a/src/wizard/PageSetRestoreHeight.cpp
+++ b/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)

diff --git a/src/wizard/PageSetRestoreHeight.h b/src/wizard/PageSetRestoreHeight.h
index 449fdc571493ec6739f78bc4d1b7f8074410399d..0335cecb4b0055664f26a0b0988eab92acf1cf16 100644 (file)
--- a/src/wizard/PageSetRestoreHeight.h
+++ b/src/wizard/PageSetRestoreHeight.h
@@ -5,9 +5,8 @@
 #define FEATHER_PAGESETRESTOREHEIGHT_H
 
 #include <QWizardPage>
-#include <QWidget>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageSetRestoreHeight;

diff --git a/src/wizard/PageSetSeedPassphrase.h b/src/wizard/PageSetSeedPassphrase.h
index 25a7e920d812bdcea2fb9016b920d418cd013db0..821507f34583fbe4cc0b3968eebbedd08c68cf36 100644 (file)
--- a/src/wizard/PageSetSeedPassphrase.h
+++ b/src/wizard/PageSetSeedPassphrase.h
@@ -5,9 +5,8 @@
 #define FEATHER_PAGESETSEEDPASSPHRASE_H
 
 #include <QWizardPage>
-#include <QWidget>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageSetSeedPassphrase;

diff --git a/src/wizard/PageSetSubaddressLookahead.h b/src/wizard/PageSetSubaddressLookahead.h
index fc7a6d380d9326bbb6293f5ffe2ce520a9d995b2..64860c02a61f661023e2341f31b512accdb4894e 100644 (file)
--- a/src/wizard/PageSetSubaddressLookahead.h
+++ b/src/wizard/PageSetSubaddressLookahead.h
@@ -5,9 +5,8 @@
 #define FEATHER_PAGESETSUBADDRESSLOOKAHEAD_H
 
 #include <QWizardPage>
-#include <QWidget>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageSetSubaddressLookahead;

diff --git a/src/wizard/PageWalletFile.h b/src/wizard/PageWalletFile.h
index 32e5159020f0285e80e2d1518a769f4e3e657f57..d8226372f9853b1873af4e78c19ce56f02f50e76 100644 (file)
--- a/src/wizard/PageWalletFile.h
+++ b/src/wizard/PageWalletFile.h
@@ -4,10 +4,9 @@
 #ifndef FEATHER_CREATEWALLET_H
 #define FEATHER_CREATEWALLET_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
-#include <QDir>
+
+class WizardFields;
 
 namespace Ui {
     class PageWalletFile;

diff --git a/src/wizard/PageWalletRestoreKeys.h b/src/wizard/PageWalletRestoreKeys.h
index 6eafe34e7ccc6e159c470161d83e8a44e66e49f0..90f5b461db3ee65515cdbbaabfe885473a4d3dad 100644 (file)
--- a/src/wizard/PageWalletRestoreKeys.h
+++ b/src/wizard/PageWalletRestoreKeys.h
@@ -4,13 +4,9 @@
 #ifndef FEATHER_WIZARDVIEWONLY_H
 #define FEATHER_WIZARDVIEWONLY_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
-#include <QTextEdit>
-#include <QCompleter>
 
-#include "WalletWizard.h"
+class WizardFields;
 
 namespace Ui {
     class PageWalletRestoreKeys;

diff --git a/src/wizard/PageWalletRestoreSeed.cpp b/src/wizard/PageWalletRestoreSeed.cpp
index e8a2c0fcc9a8148f3bc727eb4a2bcff07841a579..624efdb7962a8d555fa547cd2d8cfee337d9d70f 100644 (file)
--- a/src/wizard/PageWalletRestoreSeed.cpp
+++ b/src/wizard/PageWalletRestoreSeed.cpp
@@ -7,7 +7,6 @@
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
-#include <QPlainTextEdit>
 #include <QPushButton>
 #include <QShortcut>
 

diff --git a/src/wizard/PageWalletRestoreSeed.h b/src/wizard/PageWalletRestoreSeed.h
index e2fdee03bcacd675780eb4dc2cc289ff087e5a39..2c3bc8361856da748a2dda6c55d4fc01275ddd8a 100644 (file)
--- a/src/wizard/PageWalletRestoreSeed.h
+++ b/src/wizard/PageWalletRestoreSeed.h
@@ -4,13 +4,9 @@
 #ifndef FEATHER_WIZARDRESTORE_H
 #define FEATHER_WIZARDRESTORE_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
-#include <QTextEdit>
 #include <QCompleter>
-
-#include "utils/textedit.h"
+#include <QStringListModel>
 
 namespace Ui {
     class PageWalletRestoreSeed;

diff --git a/src/wizard/PageWalletSeed.cpp b/src/wizard/PageWalletSeed.cpp
index 165d7c1537bda09e809adf448b2186e9ca3546f5..82f74574e85ad844fbab613f91ad3104528ea78c 100644 (file)
--- a/src/wizard/PageWalletSeed.cpp
+++ b/src/wizard/PageWalletSeed.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include "WalletWizard.h"
 #include "PageWalletSeed.h"
 #include "ui_PageWalletSeed.h"
 
@@ -10,7 +9,9 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QShortcut>
+#include <QTimer>
 
+#include "WalletWizard.h"
 #include "constants.h"
 #include "Seed.h"
 #include "Icons.h"

diff --git a/src/wizard/PageWalletSeed.h b/src/wizard/PageWalletSeed.h
index a06d01339fdf932d67b729008add05b852385787..474d95eab5d27a67bcdcb65698ac461452490671 100644 (file)
--- a/src/wizard/PageWalletSeed.h
+++ b/src/wizard/PageWalletSeed.h
@@ -4,11 +4,11 @@
 #ifndef FEATHER_CREATEWALLETSEED_H
 #define FEATHER_CREATEWALLETSEED_H
 
-#include <QLabel>
 #include <QWizardPage>
-#include <QWidget>
 
-#include "utils/Utils.h"
+#include "utils/Seed.h"
+
+class WizardFields;
 
 namespace Ui {
     class PageWalletSeed;

diff --git a/src/wizard/WalletWizard.cpp b/src/wizard/WalletWizard.cpp
index e60bfa811683b3fca418425bca1763dfe6e2d603..760f9e94ad51bc92a2fa8e972aed513bc6d40a9e 100644 (file)
--- a/src/wizard/WalletWizard.cpp
+++ b/src/wizard/WalletWizard.cpp
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // SPDX-FileCopyrightText: 2020-2024 The Monero Project
 
-#include "utils/Utils.h"
-
 #include "WalletWizard.h"
+
+#include <QPushButton>
+
 #include "PageMenu.h"
 #include "PageOpenWallet.h"
 #include "PagePlugins.h"
@@ -21,10 +22,7 @@
 #include "PageNetworkWebsocket.h"
 #include "constants.h"
 #include "WindowManager.h"
-
-#include <QLineEdit>
-#include <QVBoxLayout>
-#include <QScreen>
+#include "utils/AppData.h"
 
 WalletWizard::WalletWizard(QWidget *parent)
     : QWizard(parent)

diff --git a/src/wizard/WalletWizard.h b/src/wizard/WalletWizard.h
index 92cd77d32de62649ba48f7f5d3104aa58843c183..1cc705c39c5984ab3ac70607ad3553ba633cda2c 100644 (file)
--- a/src/wizard/WalletWizard.h
+++ b/src/wizard/WalletWizard.h
@@ -5,8 +5,6 @@
 #define FEATHER_WALLETWIZARD_H
 
 #include <QWizard>
-#include <QLabel>
-#include <QRadioButton>
 
 #include "model/WalletKeysFilesModel.h"
 #include "utils/RestoreHeightLookup.h"

diff --git a/src/wizard/offline_tx_signing/OfflineTxSigningWizard.h b/src/wizard/offline_tx_signing/OfflineTxSigningWizard.h
index 38bad016ea70f1d56a2b62a0fc3059c06b0863a9..50e59d60ebe688f026dd9f9b43c7b30a60968fca 100644 (file)
--- a/src/wizard/offline_tx_signing/OfflineTxSigningWizard.h
+++ b/src/wizard/offline_tx_signing/OfflineTxSigningWizard.h
@@ -5,9 +5,9 @@
 #define FEATHER_OFFLINETXSIGNINGWIZARD_H
 
 #include <QWizard>
-#include "Wallet.h"
-
 #include <QFileDialog>
+
+#include "Wallet.h"
 #include "qrcode/scanner/QrCodeScanWidget.h"
 
 struct TxWizardFields {

diff --git a/src/wizard/offline_tx_signing/PageOTS_Import.h b/src/wizard/offline_tx_signing/PageOTS_Import.h
index 69351da6218ce8e55f8a929a5a0752c68cbb971d..62b62797443b9dd1455744b52469dbaa719dbee3 100644 (file)
--- a/src/wizard/offline_tx_signing/PageOTS_Import.h
+++ b/src/wizard/offline_tx_signing/PageOTS_Import.h
@@ -22,7 +22,6 @@ public:
     void initializePage() override;
     bool validatePage() override;
     bool isComplete() const override;
-    bool openFile(std::string &data);
 
 private slots:
     void onScanFinished(bool success);

diff --git a/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.cpp b/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.cpp
index f76ef7360fba28123fc0dbbd69548bcb835dd21f..fdcc685c87409e9fe7acf9b9013a54e34cefb284 100644 (file)
--- a/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.cpp
+++ b/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.cpp
@@ -6,7 +6,6 @@
 #include "OfflineTxSigningWizard.h"
 
 #include <QCheckBox>
-#include <QFileDialog>
 
 #include "utils/config.h"
 #include "utils/Icons.h"

diff --git a/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.h b/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.h
index 8fe312dffae27a39baf02ed56ef2afa7077f0159..cb22bdf53bb6b127fc3a3bb19a77823d3c3d56c8 100644 (file)
--- a/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.h
+++ b/src/wizard/offline_tx_signing/PageOTS_ImportKeyImages.h
@@ -26,7 +26,6 @@ private slots:
     void importFromStr(const std::string &data) override;
     
 private:
-    void onSuccess();
     bool proceed();
 };
 

diff --git a/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp b/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp
index 3ee389bea6da3ee2dd7cb867a19c71860bf0bef9..68f834960f6d6c60e4d162de8b9a8c46399a57a6 100644 (file)
--- a/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp
+++ b/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp
@@ -8,7 +8,6 @@
 #include <QFileDialog>
 
 #include "dialog/TxConfAdvDialog.h"
-#include "utils/config.h"
 #include "utils/Icons.h"
 #include "utils/Utils.h"
 

diff --git a/src/wizard/offline_tx_signing/PageOTS_ImportSignedTx.cpp b/src/wizard/offline_tx_signing/PageOTS_ImportSignedTx.cpp
index df5b9070ea52a07d5e4fc93f59204d55d5fef411..f4e99bde03d67edb56b163b36a57c964c14fe94e 100644 (file)
--- a/src/wizard/offline_tx_signing/PageOTS_ImportSignedTx.cpp
+++ b/src/wizard/offline_tx_signing/PageOTS_ImportSignedTx.cpp
@@ -9,7 +9,6 @@
 
 #include "dialog/TxConfDialog.h"
 #include "dialog/TxConfAdvDialog.h"
-#include "utils/config.h"
 #include "utils/Icons.h"
 #include "utils/Utils.h"