From 8ab420b8024f0be3642f3e433bbe99bc5025c7f0 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 1 Oct 2024 22:17:54 +0200 Subject: [PATCH] cleanup includes --- monero | 2 +- src/Application.h | 1 - src/ContactsWidget.cpp | 3 ++ src/ContactsWidget.h | 6 ++-- src/HistoryWidget.cpp | 2 ++ src/HistoryWidget.h | 6 ++-- src/MainWindow.cpp | 3 +- src/ReceiveWidget.cpp | 1 - src/ReceiveWidget.h | 1 - src/SendWidget.h | 2 +- src/SettingsDialog.cpp | 1 + src/SettingsDialog.h | 6 +--- src/WindowManager.cpp | 6 ++++ src/WindowManager.h | 13 ++++--- src/constants.h | 3 +- src/dialog/AboutDialog.cpp | 1 + src/dialog/AboutDialog.h | 3 -- src/dialog/AccountSwitcherDialog.cpp | 1 + src/dialog/AccountSwitcherDialog.h | 4 +-- src/dialog/AddressCheckerIndexDialog.cpp | 1 + src/dialog/AddressCheckerIndexDialog.h | 3 +- src/dialog/BalanceDialog.h | 2 -- src/dialog/DocsDialog.cpp | 1 + src/libwalletqt/Coins.h | 1 - src/libwalletqt/ConstructionInfo.cpp | 1 + src/libwalletqt/ConstructionInfo.h | 5 ++- src/libwalletqt/Input.h | 6 +--- src/libwalletqt/PassphraseHelper.cpp | 6 ++-- src/libwalletqt/PassphraseHelper.h | 4 +-- src/libwalletqt/PendingTransaction.cpp | 2 ++ src/libwalletqt/PendingTransaction.h | 11 +++--- src/libwalletqt/PendingTransactionInfo.cpp | 1 + src/libwalletqt/PendingTransactionInfo.h | 4 +++ src/libwalletqt/Ring.h | 3 -- src/libwalletqt/Subaddress.h | 4 +-- src/libwalletqt/UnsignedTransaction.cpp | 4 ++- src/libwalletqt/UnsignedTransaction.h | 13 ++++--- src/libwalletqt/Wallet.cpp | 23 +++++++++++- src/libwalletqt/Wallet.h | 36 ++++++++++--------- src/libwalletqt/WalletListenerImpl.cpp | 2 +- src/libwalletqt/WalletListenerImpl.h | 2 +- src/libwalletqt/WalletManager.cpp | 3 +- src/libwalletqt/WalletManager.h | 2 -- src/main.cpp | 5 +++ src/model/CoinsModel.h | 5 --- src/model/SubaddressModel.h | 4 --- src/model/TransactionHistoryModel.cpp | 1 - src/plugins/bounties/BountiesWidget.cpp | 1 + src/plugins/crowdfunding/CCSWidget.cpp | 1 + src/plugins/revuo/RevuoWidget.cpp | 2 ++ src/qrcode/scanner/QrCodeScanDialog.cpp | 11 +----- src/qrcode/scanner/QrCodeScanDialog.h | 6 ---- src/qrcode/scanner/QrCodeScanWidget.cpp | 3 ++ src/qrcode/scanner/QrCodeScanWidget.h | 5 ++- src/qrcode/scanner/QrScanThread.cpp | 3 +- src/qrcode/scanner/QrScanThread.h | 6 ---- src/qrcode/scanner/URDialog.cpp | 1 - src/qrcode/scanner/URDialog.h | 2 -- src/qrcode/scanner/URWidget.h | 1 - src/utils/AppData.cpp | 3 ++ src/utils/AppData.h | 1 - src/utils/EventFilter.cpp | 1 - src/utils/EventFilter.h | 1 - src/utils/NetworkManager.cpp | 1 - src/utils/Networking.cpp | 5 +-- src/utils/Seed.cpp | 10 +++++- src/utils/Seed.h | 10 ++---- src/utils/SemanticVersion.h | 1 + src/utils/TorManager.cpp | 3 +- src/utils/TorManager.h | 9 +++-- src/utils/TxFiatHistory.cpp | 3 ++ src/utils/Utils.cpp | 10 +++++- src/utils/Utils.h | 7 ++-- src/utils/WebsocketClient.cpp | 5 ++- src/utils/WebsocketNotifier.cpp | 2 -- src/utils/config.cpp | 4 +++ src/utils/daemonrpc.cpp | 3 ++ src/utils/daemonrpc.h | 1 + src/utils/networktype.h | 7 ++-- src/utils/nodes.cpp | 4 +-- src/utils/nodes.h | 5 +++ src/utils/os/tails.cpp | 4 ++- src/utils/os/tails.h | 2 ++ src/utils/prices.cpp | 5 ++- src/utils/scheduler.h | 4 --- src/utils/updater/Updater.cpp | 1 - src/widgets/UrlListConfigureWidget.h | 1 - src/widgets/WalletUnlockWidget.cpp | 1 + src/widgets/WalletUnlockWidget.h | 3 +- src/wizard/PageHardwareDevice.cpp | 3 +- src/wizard/PageHardwareDevice.h | 5 +-- src/wizard/PageMenu.cpp | 4 +-- src/wizard/PageMenu.h | 5 +-- src/wizard/PageNetwork.cpp | 1 + src/wizard/PageNetwork.h | 5 +-- src/wizard/PageNetworkProxy.cpp | 5 +-- src/wizard/PageOpenWallet.cpp | 1 + src/wizard/PageOpenWallet.h | 4 +-- src/wizard/PageSetPassword.h | 3 +- src/wizard/PageSetRestoreHeight.cpp | 8 +++-- src/wizard/PageSetRestoreHeight.h | 3 +- src/wizard/PageSetSeedPassphrase.h | 3 +- src/wizard/PageSetSubaddressLookahead.h | 3 +- src/wizard/PageWalletFile.h | 5 ++- src/wizard/PageWalletRestoreKeys.h | 6 +--- src/wizard/PageWalletRestoreSeed.cpp | 1 - src/wizard/PageWalletRestoreSeed.h | 6 +--- src/wizard/PageWalletSeed.cpp | 3 +- src/wizard/PageWalletSeed.h | 6 ++-- src/wizard/WalletWizard.cpp | 10 +++--- src/wizard/WalletWizard.h | 2 -- .../OfflineTxSigningWizard.h | 4 +-- .../offline_tx_signing/PageOTS_Import.h | 1 - .../PageOTS_ImportKeyImages.cpp | 1 - .../PageOTS_ImportKeyImages.h | 1 - .../PageOTS_ImportOffline.cpp | 1 - .../PageOTS_ImportSignedTx.cpp | 1 - 117 files changed, 250 insertions(+), 230 deletions(-) diff --git a/monero b/monero index 14d2ac09..5b9a197d 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 14d2ac095df656745e383258f4434ed4968b1c6b +Subproject commit 5b9a197de481409ab3dc4cd25c5a1048d20ca09f diff --git a/src/Application.h b/src/Application.h index 3600334c..1e6d89b4 100644 --- a/src/Application.h +++ b/src/Application.h @@ -8,7 +8,6 @@ #include class QLockFile; -class QSocketNotifier; class Application : public QApplication { Q_OBJECT diff --git a/src/ContactsWidget.cpp b/src/ContactsWidget.cpp index 9ad508ef..106f8bba 100644 --- a/src/ContactsWidget.cpp +++ b/src/ContactsWidget.cpp @@ -7,7 +7,10 @@ #include #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 d6c8291a..395511bf 100644 --- a/src/ContactsWidget.h +++ b/src/ContactsWidget.h @@ -8,9 +8,9 @@ #include #include -#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 d5e5939f..59a00518 100644 --- 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 f387b07b..44e7b83e 100644 --- a/src/HistoryWidget.h +++ b/src/HistoryWidget.h @@ -7,10 +7,8 @@ #include #include -#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 848f1e3a..e4944a26 100644 --- 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 a4634018..39aa24b3 100644 --- a/src/ReceiveWidget.cpp +++ b/src/ReceiveWidget.cpp @@ -5,7 +5,6 @@ #include "ui_ReceiveWidget.h" #include -#include #include "dialog/PaymentRequestDialog.h" #include "dialog/QrCodeDialog.h" diff --git a/src/ReceiveWidget.h b/src/ReceiveWidget.h index 43be717b..28c6e798 100644 --- a/src/ReceiveWidget.h +++ b/src/ReceiveWidget.h @@ -6,7 +6,6 @@ #include #include -#include #include "libwalletqt/Subaddress.h" #include "libwalletqt/Wallet.h" diff --git a/src/SendWidget.h b/src/SendWidget.h index 1fece108..1b310f2b 100644 --- a/src/SendWidget.h +++ b/src/SendWidget.h @@ -6,7 +6,7 @@ #include -#include "libwalletqt/Wallet.h" +class Wallet; namespace Ui { class SendWidget; diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index cbdd3d32..2f52a8a8 100644 --- 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 604dd9c5..3630439c 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -4,17 +4,13 @@ #ifndef FEATHER_SettingsDIALOG_H #define FEATHER_SettingsDIALOG_H - -#include #include -#include - -#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 d892fec2..dbd022a2 100644 --- 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 beccd5ed..a694ef79 100644 --- a/src/WindowManager.h +++ b/src/WindowManager.h @@ -5,17 +5,20 @@ #define FEATHER_WINDOWMANAGER_H #include +#include -#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 2e01b220..65e3c24f 100644 --- a/src/constants.h +++ b/src/constants.h @@ -4,8 +4,7 @@ #ifndef FEATHER_CONSTANTS_H #define FEATHER_CONSTANTS_H -#include -#include +#include #include "networktype.h" diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp index 354879eb..3ca0ca95 100644 --- a/src/dialog/AboutDialog.cpp +++ b/src/dialog/AboutDialog.cpp @@ -5,6 +5,7 @@ #include "ui_AboutDialog.h" #include +#include #include "config-feather.h" #include "utils/Utils.h" diff --git a/src/dialog/AboutDialog.h b/src/dialog/AboutDialog.h index e8820468..b07312c1 100644 --- a/src/dialog/AboutDialog.h +++ b/src/dialog/AboutDialog.h @@ -4,9 +4,6 @@ #ifndef FEATHER_ABOUT_H #define FEATHER_ABOUT_H -#include -#include - #include "components.h" namespace Ui { diff --git a/src/dialog/AccountSwitcherDialog.cpp b/src/dialog/AccountSwitcherDialog.cpp index 4c3a6a6c..c907c21d 100644 --- 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 1d3dcef6..eef7b1a6 100644 --- a/src/dialog/AccountSwitcherDialog.h +++ b/src/dialog/AccountSwitcherDialog.h @@ -4,10 +4,8 @@ #ifndef FEATHER_ACCOUNTSWITCHERDIALOG_H #define FEATHER_ACCOUNTSWITCHERDIALOG_H -#include - -#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 ae4e3696..ce1670fb 100644 --- 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 6ab397ab..b4777c86 100644 --- 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 75927136..f62e08be 100644 --- a/src/dialog/BalanceDialog.h +++ b/src/dialog/BalanceDialog.h @@ -4,8 +4,6 @@ #ifndef FEATHER_BALANCEDIALOG_H #define FEATHER_BALANCEDIALOG_H -#include - #include "components.h" #include "libwalletqt/Wallet.h" diff --git a/src/dialog/DocsDialog.cpp b/src/dialog/DocsDialog.cpp index f6ffb788..c86d2f84 100644 --- a/src/dialog/DocsDialog.cpp +++ b/src/dialog/DocsDialog.cpp @@ -5,6 +5,7 @@ #include "ui_DocsDialog.h" #include +#include #include "utils/Utils.h" #include "ColorScheme.h" diff --git a/src/libwalletqt/Coins.h b/src/libwalletqt/Coins.h index 4c6b252a..ce875c0d 100644 --- a/src/libwalletqt/Coins.h +++ b/src/libwalletqt/Coins.h @@ -9,7 +9,6 @@ #include #include #include -#include #include "Wallet.h" diff --git a/src/libwalletqt/ConstructionInfo.cpp b/src/libwalletqt/ConstructionInfo.cpp index 588b04aa..d35a4e06 100644 --- a/src/libwalletqt/ConstructionInfo.cpp +++ b/src/libwalletqt/ConstructionInfo.cpp @@ -5,6 +5,7 @@ #include "Input.h" #include "Transfer.h" +#include quint64 ConstructionInfo::unlockTime() const { return m_unlockTime; diff --git a/src/libwalletqt/ConstructionInfo.h b/src/libwalletqt/ConstructionInfo.h index 9f044d7c..906343ca 100644 --- a/src/libwalletqt/ConstructionInfo.h +++ b/src/libwalletqt/ConstructionInfo.h @@ -4,13 +4,16 @@ #ifndef FEATHER_CONSTRUCTIONINFO_H #define FEATHER_CONSTRUCTIONINFO_H -#include #include #include 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 1699b033..756fb72a 100644 --- a/src/libwalletqt/Input.h +++ b/src/libwalletqt/Input.h @@ -4,15 +4,11 @@ #ifndef FEATHER_INPUT_H #define FEATHER_INPUT_H -#include #include -#include 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 747a20b8..fe1d94c3 100644 --- a/src/libwalletqt/PassphraseHelper.cpp +++ b/src/libwalletqt/PassphraseHelper.cpp @@ -4,7 +4,7 @@ #include "PassphraseHelper.h" #include -Monero::optional PassphraseHelper::onDevicePassphraseRequest(bool & on_device) +std::optional PassphraseHelper::onDevicePassphraseRequest(bool & on_device) { qDebug() << __FUNCTION__; QMutexLocker locker(&m_mutex_pass); @@ -26,9 +26,9 @@ Monero::optional PassphraseHelper::onDevicePassphraseRequest(bool & if (!on_device) { auto tmpPass = m_passphrase.toStdString(); m_passphrase = QString(); - return Monero::optional(tmpPass); + return std::optional(tmpPass); } else { - return Monero::optional(); + return std::optional(); } } diff --git a/src/libwalletqt/PassphraseHelper.h b/src/libwalletqt/PassphraseHelper.h index 745ce507..8b082fa8 100644 --- 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 #include #include #include -#include /** * 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 onDevicePassphraseRequest(bool & on_device); + std::optional 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 85e751da..a2ce6a55 100644 --- a/src/libwalletqt/PendingTransaction.cpp +++ b/src/libwalletqt/PendingTransaction.cpp @@ -5,6 +5,8 @@ #include +#include + PendingTransaction::Status PendingTransaction::status() const { return static_cast(m_pimpl->status()); diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h index 754cfcd1..c5fe0832 100644 --- a/src/libwalletqt/PendingTransaction.h +++ b/src/libwalletqt/PendingTransaction.h @@ -7,18 +7,21 @@ #include #include -#include #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 f8fb4583..cba246dd 100644 --- 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 quint64 PendingTransactionInfo::fee() const { return m_fee; diff --git a/src/libwalletqt/PendingTransactionInfo.h b/src/libwalletqt/PendingTransactionInfo.h index 48135e39..807edbe7 100644 --- 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 6e1564f8..f81b5478 100644 --- a/src/libwalletqt/Ring.h +++ b/src/libwalletqt/Ring.h @@ -4,10 +4,7 @@ #ifndef FEATHER_RINGS_H #define FEATHER_RINGS_H -#include #include -#include -#include class Ring : public QObject { diff --git a/src/libwalletqt/Subaddress.h b/src/libwalletqt/Subaddress.h index fe7571ca..4ea30dfa 100644 --- a/src/libwalletqt/Subaddress.h +++ b/src/libwalletqt/Subaddress.h @@ -4,10 +4,8 @@ #ifndef SUBADDRESS_H #define SUBADDRESS_H -#include - -#include #include +#include #include #include diff --git a/src/libwalletqt/UnsignedTransaction.cpp b/src/libwalletqt/UnsignedTransaction.cpp index c8b56de3..14489ecf 100644 --- 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 + +#include "ConstructionInfo.h" +#include UnsignedTransaction::Status UnsignedTransaction::status() const { diff --git a/src/libwalletqt/UnsignedTransaction.h b/src/libwalletqt/UnsignedTransaction.h index 33e87237..06775930 100644 --- a/src/libwalletqt/UnsignedTransaction.h +++ b/src/libwalletqt/UnsignedTransaction.h @@ -6,7 +6,12 @@ #include -#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 b806bd57..770718a0 100644 --- 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 subaddr_indices; - Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? Monero::optional() : Monero::optional(amount), constants::mixin, + Monero::PendingTransaction *ptImpl = m_walletImpl->createTransaction(address.toStdString(), "", all ? std::optional() : std::optional(amount), constants::mixin, static_cast(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 bf5636b0..2da7baff 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -4,24 +4,28 @@ #ifndef WALLET_H #define WALLET_H -#include #include #include -#include -#include #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 + +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 m_selectedInputs; }; - - #endif // WALLET_H diff --git a/src/libwalletqt/WalletListenerImpl.cpp b/src/libwalletqt/WalletListenerImpl.cpp index 5407be82..2f625898 100644 --- 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 WalletListenerImpl::onDevicePassphraseRequest(bool & on_device) +std::optional 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 67d91ea1..da0ba11e 100644 --- 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 onDevicePassphraseRequest(bool & on_device) override; + virtual std::optional onDevicePassphraseRequest(bool & on_device) override; private: Wallet * m_wallet; diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 32a47832..92ffe8a8 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -5,6 +5,7 @@ #include "Wallet.h" #include "utils/ScopeGuard.h" +#include class WalletPassphraseListenerImpl : public Monero::WalletListener, public PassphraseReceiver { @@ -24,7 +25,7 @@ public: m_phelper.onPassphraseEntered(passphrase, enter_on_device, entry_abort); } - Monero::optional onDevicePassphraseRequest(bool & on_device) override + std::optional 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 596a03f0..2a43cfc3 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -4,8 +4,6 @@ #ifndef WALLETMANAGER_H #define WALLETMANAGER_H -#include - #include #include #include diff --git a/src/main.cpp b/src/main.cpp index 1627805b..ed516db6 100644 --- 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 + #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 +#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 d42bbba8..39cf4dcf 100644 --- a/src/model/CoinsModel.h +++ b/src/model/CoinsModel.h @@ -4,12 +4,7 @@ #ifndef FEATHER_COINSMODEL_H #define FEATHER_COINSMODEL_H -#include - #include -#include -#include -#include class Coins; class CoinsInfo; diff --git a/src/model/SubaddressModel.h b/src/model/SubaddressModel.h index 9ee3cfbd..4d0fe97d 100644 --- a/src/model/SubaddressModel.h +++ b/src/model/SubaddressModel.h @@ -4,11 +4,7 @@ #ifndef SUBADDRESSMODEL_H #define SUBADDRESSMODEL_H -#include - #include -#include -#include #include "rows/SubaddressRow.h" diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 1cbc17b5..932b43d3 100644 --- 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 d9322c4b..2a12198b 100644 --- a/src/plugins/bounties/BountiesWidget.cpp +++ b/src/plugins/bounties/BountiesWidget.cpp @@ -5,6 +5,7 @@ #include "ui_BountiesWidget.h" #include +#include #include "BountiesModel.h" #include "utils/Utils.h" diff --git a/src/plugins/crowdfunding/CCSWidget.cpp b/src/plugins/crowdfunding/CCSWidget.cpp index 0ec9e573..6a50eb48 100644 --- a/src/plugins/crowdfunding/CCSWidget.cpp +++ b/src/plugins/crowdfunding/CCSWidget.cpp @@ -5,6 +5,7 @@ #include "ui_CCSWidget.h" #include +#include #include "CCSProgressDelegate.h" #include "utils/Utils.h" diff --git a/src/plugins/revuo/RevuoWidget.cpp b/src/plugins/revuo/RevuoWidget.cpp index 64581c40..a2442e38 100644 --- a/src/plugins/revuo/RevuoWidget.cpp +++ b/src/plugins/revuo/RevuoWidget.cpp @@ -4,6 +4,8 @@ #include "RevuoWidget.h" #include "ui_RevuoWidget.h" +#include + #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 c1e7852d..36a78053 100644 --- a/src/qrcode/scanner/QrCodeScanDialog.cpp +++ b/src/qrcode/scanner/QrCodeScanDialog.cpp @@ -4,15 +4,6 @@ #include "QrCodeScanDialog.h" #include "ui_QrCodeScanDialog.h" -#include -#include -#include -#include -#include -#include - -#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 5f0668bd..307ad13e 100644 --- a/src/qrcode/scanner/QrCodeScanDialog.h +++ b/src/qrcode/scanner/QrCodeScanDialog.h @@ -5,13 +5,7 @@ #define FEATHER_QRCODESCANDIALOG_H #include -#include #include -#include -#include -#include - -#include "QrScanThread.h" namespace Ui { class QrCodeScanDialog; diff --git a/src/qrcode/scanner/QrCodeScanWidget.cpp b/src/qrcode/scanner/QrCodeScanWidget.cpp index e1d94189..27d3f731 100644 --- a/src/qrcode/scanner/QrCodeScanWidget.cpp +++ b/src/qrcode/scanner/QrCodeScanWidget.cpp @@ -8,8 +8,11 @@ #include #include +#include + #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 700c3167..6d163584 100644 --- a/src/qrcode/scanner/QrCodeScanWidget.h +++ b/src/qrcode/scanner/QrCodeScanWidget.h @@ -11,11 +11,10 @@ #include #include -#include "QrScanThread.h" - -#include #include +class QrScanThread; + namespace Ui { class QrCodeScanWidget; } diff --git a/src/qrcode/scanner/QrScanThread.cpp b/src/qrcode/scanner/QrScanThread.cpp index 85518840..0265cfce 100644 --- 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 #include +#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 50d227e6..4e0eaca7 100644 --- a/src/qrcode/scanner/QrScanThread.h +++ b/src/qrcode/scanner/QrScanThread.h @@ -7,12 +7,6 @@ #include #include #include -#include -#include - -#include - -#include "qrcode/utils/QrCodeUtils.h" class QrScanThread : public QThread { diff --git a/src/qrcode/scanner/URDialog.cpp b/src/qrcode/scanner/URDialog.cpp index a0226a7d..926879bd 100644 --- a/src/qrcode/scanner/URDialog.cpp +++ b/src/qrcode/scanner/URDialog.cpp @@ -8,7 +8,6 @@ #include #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 1ef57910..d24785de 100644 --- 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 - #include "components.h" namespace Ui { diff --git a/src/qrcode/scanner/URWidget.h b/src/qrcode/scanner/URWidget.h index da56bbef..b64b1eeb 100644 --- a/src/qrcode/scanner/URWidget.h +++ b/src/qrcode/scanner/URWidget.h @@ -8,7 +8,6 @@ #include #include "qrcode/QrCode.h" -#include "widgets/QrCodeWidget.h" #include namespace Ui { diff --git a/src/utils/AppData.cpp b/src/utils/AppData.cpp index 08b5d35e..65103217 100644 --- 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 + #include "config.h" #include "WebsocketNotifier.h" diff --git a/src/utils/AppData.h b/src/utils/AppData.h index 95f50205..701a0182 100644 --- a/src/utils/AppData.h +++ b/src/utils/AppData.h @@ -6,7 +6,6 @@ #include #include -#include #include "prices.h" #include "TxFiatHistory.h" diff --git a/src/utils/EventFilter.cpp b/src/utils/EventFilter.cpp index 7c018f28..3419fee6 100644 --- a/src/utils/EventFilter.cpp +++ b/src/utils/EventFilter.cpp @@ -4,7 +4,6 @@ #include "EventFilter.h" #include -#include EventFilter::EventFilter(QObject *parent) : QObject(parent) diff --git a/src/utils/EventFilter.h b/src/utils/EventFilter.h index f759b1d1..8c99fa55 100644 --- 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 c988ae7f..04f6edaf 100644 --- a/src/utils/NetworkManager.cpp +++ b/src/utils/NetworkManager.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "utils/config.h" diff --git a/src/utils/Networking.cpp b/src/utils/Networking.cpp index 6be6cdc5..a25a9c63 100644 --- 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 #include +#include -#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 852a8dc3..9b5cdbd1 100644 --- 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 #include "Seed.h" +#include "constants.h" +#include "monero_seed/monero_seed.hpp" +#include "polyseed/polyseed.h" +#include "utils/AppData.h" + +#include +#include +#include + 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 8302a95f..8581ea00 100644 --- 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 #include #include -#include -#include +#include "networktype.h" struct Seed { enum Type { diff --git a/src/utils/SemanticVersion.h b/src/utils/SemanticVersion.h index a2fefd86..03f0ede7 100644 --- a/src/utils/SemanticVersion.h +++ b/src/utils/SemanticVersion.h @@ -5,6 +5,7 @@ #define FEATHER_SEMANTICVERSION_H #include +#include struct SemanticVersion { diff --git a/src/utils/TorManager.cpp b/src/utils/TorManager.cpp index 3ec1db6d..e3b7f526 100644 --- a/src/utils/TorManager.cpp +++ b/src/utils/TorManager.cpp @@ -3,7 +3,8 @@ #include "utils/TorManager.h" -#include +#include +#include #include "utils/config.h" #include "utils/Utils.h" diff --git a/src/utils/TorManager.h b/src/utils/TorManager.h index 2c38ab86..5d0334a3 100644 --- a/src/utils/TorManager.h +++ b/src/utils/TorManager.h @@ -4,11 +4,10 @@ #ifndef FEATHER_TOR_H #define FEATHER_TOR_H -#include -#include -#include -#include -#include +#include +#include +#include + #include "utils/SemanticVersion.h" class TorManager : public QObject diff --git a/src/utils/TxFiatHistory.cpp b/src/utils/TxFiatHistory.cpp index ebaf00f6..cb9ae349 100644 --- 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 + #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 e85f615d..ed26b424 100644 --- 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 #include #include @@ -9,14 +11,20 @@ #include #include #include +#include +#include +#include +#include +#include +#include #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 e9a1fba8..ce24b738 100644 --- a/src/utils/Utils.h +++ b/src/utils/Utils.h @@ -5,13 +5,16 @@ #define FEATHER_UTILS_H #include -#include #include #include +#include +#include +#include -#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 85b60309..879263e8 100644 --- a/src/utils/WebsocketClient.cpp +++ b/src/utils/WebsocketClient.cpp @@ -4,9 +4,12 @@ #include "WebsocketClient.h" #include -#include "utils/Utils.h" +#include +#include +#include #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 b3fbc227..3232f11d 100644 --- 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 722eb559..a17addfa 100644 --- 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 +#include + #include "utils/Utils.h" #include "utils/os/tails.h" diff --git a/src/utils/daemonrpc.cpp b/src/utils/daemonrpc.cpp index 644ef9a5..656db29a 100644 --- a/src/utils/daemonrpc.cpp +++ b/src/utils/daemonrpc.cpp @@ -3,6 +3,9 @@ #include "daemonrpc.h" +#include +#include + 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 fddfce9b..d53d0981 100644 --- a/src/utils/daemonrpc.h +++ b/src/utils/daemonrpc.h @@ -5,6 +5,7 @@ #define FEATHER_DAEMON_RPC_H #include +#include #include "utils/Networking.h" diff --git a/src/utils/networktype.h b/src/utils/networktype.h index fb5242a5..fc7118c3 100644 --- a/src/utils/networktype.h +++ b/src/utils/networktype.h @@ -4,7 +4,6 @@ #pragma once #include -#include 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 a31acc2f..e8550dd9 100644 --- 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 - #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 920fda91..77bca0d9 100644 --- a/src/utils/nodes.h +++ b/src/utils/nodes.h @@ -4,14 +4,19 @@ #ifndef FEATHER_NODES_H #define FEATHER_NODES_H +#include +#include #include #include #include +#include #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 73d5603c..1cbe9374 100644 --- 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 #include #include -#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 49c6ad9a..d30e1dcc 100644 --- a/src/utils/os/tails.h +++ b/src/utils/os/tails.h @@ -4,6 +4,8 @@ #ifndef TAILSOS_H #define TAILSOS_H +#include + class TailsOS { public: diff --git a/src/utils/prices.cpp b/src/utils/prices.cpp index 5eb2dfeb..1ee9c207 100644 --- 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 +#include Prices::Prices(QObject *parent) : QObject(parent) diff --git a/src/utils/scheduler.h b/src/utils/scheduler.h index 996923c4..2be44118 100644 --- a/src/utils/scheduler.h +++ b/src/utils/scheduler.h @@ -4,13 +4,9 @@ #ifndef FUTURE_SCHEDULER_H #define FUTURE_SCHEDULER_H -#include - #include #include -//#include #include -#include #include #include diff --git a/src/utils/updater/Updater.cpp b/src/utils/updater/Updater.cpp index 708a3c50..b448e899 100644 --- 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 b84bd546..4642cfc8 100644 --- a/src/widgets/UrlListConfigureWidget.h +++ b/src/widgets/UrlListConfigureWidget.h @@ -5,7 +5,6 @@ #define FEATHER_URLLISTCONFIGUREWIDGET_H #include -#include #include "utils/config.h" diff --git a/src/widgets/WalletUnlockWidget.cpp b/src/widgets/WalletUnlockWidget.cpp index 3e6e1405..e4e1f43f 100644 --- a/src/widgets/WalletUnlockWidget.cpp +++ b/src/widgets/WalletUnlockWidget.cpp @@ -8,6 +8,7 @@ #include #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 dfbaabee..d6efa8d4 100644 --- a/src/widgets/WalletUnlockWidget.h +++ b/src/widgets/WalletUnlockWidget.h @@ -5,9 +5,8 @@ #define FEATHER_WALLETUNLOCKWIDGET_H #include -#include -#include "Wallet.h" +class Wallet; namespace Ui { class WalletUnlockWidget; diff --git a/src/wizard/PageHardwareDevice.cpp b/src/wizard/PageHardwareDevice.cpp index b1c749ca..3c444fb9 100644 --- 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 #include #include +#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 aa5d703e..0100b1e5 100644 --- a/src/wizard/PageHardwareDevice.h +++ b/src/wizard/PageHardwareDevice.h @@ -4,12 +4,9 @@ #ifndef FEATHER_PAGEHARDWAREDEVICE_H #define FEATHER_PAGEHARDWAREDEVICE_H -#include #include -#include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageHardwareDevice; diff --git a/src/wizard/PageMenu.cpp b/src/wizard/PageMenu.cpp index ac337690..e318c062 100644 --- 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 - #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 de18e06d..0c3db978 100644 --- a/src/wizard/PageMenu.h +++ b/src/wizard/PageMenu.h @@ -4,9 +4,10 @@ #ifndef FEATHER_WIZARDMENU_H #define FEATHER_WIZARDMENU_H -#include #include -#include + +class WizardFields; +class WalletKeysFilesModel; namespace Ui { class PageMenu; diff --git a/src/wizard/PageNetwork.cpp b/src/wizard/PageNetwork.cpp index 3f57c0a5..08da1e12 100644 --- a/src/wizard/PageNetwork.cpp +++ b/src/wizard/PageNetwork.cpp @@ -7,6 +7,7 @@ #include #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 e59b4378..6a55ac5f 100644 --- a/src/wizard/PageNetwork.h +++ b/src/wizard/PageNetwork.h @@ -4,11 +4,8 @@ #ifndef FEATHER_WIZARDNETWORK_H #define FEATHER_WIZARDNETWORK_H -#include #include -#include - -#include "utils/nodes.h" +#include namespace Ui { class PageNetwork; diff --git a/src/wizard/PageNetworkProxy.cpp b/src/wizard/PageNetworkProxy.cpp index 7f6e8c07..10e1d6d2 100644 --- 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 +#include + +#include "WalletWizard.h" PageNetworkProxy::PageNetworkProxy(QWidget *parent) : QWizardPage(parent) diff --git a/src/wizard/PageOpenWallet.cpp b/src/wizard/PageOpenWallet.cpp index a2906980..bb76227d 100644 --- 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 6c4ad1bb..3db31f21 100644 --- a/src/wizard/PageOpenWallet.h +++ b/src/wizard/PageOpenWallet.h @@ -7,9 +7,9 @@ #include #include #include -#include -#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 6c276be8..d3d9a878 100644 --- a/src/wizard/PageSetPassword.h +++ b/src/wizard/PageSetPassword.h @@ -5,9 +5,8 @@ #define FEATHER_PASSWORD_H #include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageSetPassword; diff --git a/src/wizard/PageSetRestoreHeight.cpp b/src/wizard/PageSetRestoreHeight.cpp index 10ac6b94..a2d279cb 100644 --- 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 #include "PageSetRestoreHeight.h" #include "ui_PageSetRestoreHeight.h" -#include "WalletWizard.h" -#include "constants.h" +#include + +#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 449fdc57..0335cecb 100644 --- a/src/wizard/PageSetRestoreHeight.h +++ b/src/wizard/PageSetRestoreHeight.h @@ -5,9 +5,8 @@ #define FEATHER_PAGESETRESTOREHEIGHT_H #include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageSetRestoreHeight; diff --git a/src/wizard/PageSetSeedPassphrase.h b/src/wizard/PageSetSeedPassphrase.h index 25a7e920..821507f3 100644 --- a/src/wizard/PageSetSeedPassphrase.h +++ b/src/wizard/PageSetSeedPassphrase.h @@ -5,9 +5,8 @@ #define FEATHER_PAGESETSEEDPASSPHRASE_H #include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageSetSeedPassphrase; diff --git a/src/wizard/PageSetSubaddressLookahead.h b/src/wizard/PageSetSubaddressLookahead.h index fc7a6d38..64860c02 100644 --- a/src/wizard/PageSetSubaddressLookahead.h +++ b/src/wizard/PageSetSubaddressLookahead.h @@ -5,9 +5,8 @@ #define FEATHER_PAGESETSUBADDRESSLOOKAHEAD_H #include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageSetSubaddressLookahead; diff --git a/src/wizard/PageWalletFile.h b/src/wizard/PageWalletFile.h index 32e51590..d8226372 100644 --- a/src/wizard/PageWalletFile.h +++ b/src/wizard/PageWalletFile.h @@ -4,10 +4,9 @@ #ifndef FEATHER_CREATEWALLET_H #define FEATHER_CREATEWALLET_H -#include #include -#include -#include + +class WizardFields; namespace Ui { class PageWalletFile; diff --git a/src/wizard/PageWalletRestoreKeys.h b/src/wizard/PageWalletRestoreKeys.h index 6eafe34e..90f5b461 100644 --- a/src/wizard/PageWalletRestoreKeys.h +++ b/src/wizard/PageWalletRestoreKeys.h @@ -4,13 +4,9 @@ #ifndef FEATHER_WIZARDVIEWONLY_H #define FEATHER_WIZARDVIEWONLY_H -#include #include -#include -#include -#include -#include "WalletWizard.h" +class WizardFields; namespace Ui { class PageWalletRestoreKeys; diff --git a/src/wizard/PageWalletRestoreSeed.cpp b/src/wizard/PageWalletRestoreSeed.cpp index e8a2c0fc..624efdb7 100644 --- a/src/wizard/PageWalletRestoreSeed.cpp +++ b/src/wizard/PageWalletRestoreSeed.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include diff --git a/src/wizard/PageWalletRestoreSeed.h b/src/wizard/PageWalletRestoreSeed.h index e2fdee03..2c3bc836 100644 --- a/src/wizard/PageWalletRestoreSeed.h +++ b/src/wizard/PageWalletRestoreSeed.h @@ -4,13 +4,9 @@ #ifndef FEATHER_WIZARDRESTORE_H #define FEATHER_WIZARDRESTORE_H -#include #include -#include -#include #include - -#include "utils/textedit.h" +#include namespace Ui { class PageWalletRestoreSeed; diff --git a/src/wizard/PageWalletSeed.cpp b/src/wizard/PageWalletSeed.cpp index 165d7c15..82f74574 100644 --- 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 #include #include +#include +#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 a06d0133..474d95ea 100644 --- a/src/wizard/PageWalletSeed.h +++ b/src/wizard/PageWalletSeed.h @@ -4,11 +4,11 @@ #ifndef FEATHER_CREATEWALLETSEED_H #define FEATHER_CREATEWALLETSEED_H -#include #include -#include -#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 e60bfa81..760f9e94 100644 --- 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 + #include "PageMenu.h" #include "PageOpenWallet.h" #include "PagePlugins.h" @@ -21,10 +22,7 @@ #include "PageNetworkWebsocket.h" #include "constants.h" #include "WindowManager.h" - -#include -#include -#include +#include "utils/AppData.h" WalletWizard::WalletWizard(QWidget *parent) : QWizard(parent) diff --git a/src/wizard/WalletWizard.h b/src/wizard/WalletWizard.h index 92cd77d3..1cc705c3 100644 --- a/src/wizard/WalletWizard.h +++ b/src/wizard/WalletWizard.h @@ -5,8 +5,6 @@ #define FEATHER_WALLETWIZARD_H #include -#include -#include #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 38bad016..50e59d60 100644 --- 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 -#include "Wallet.h" - #include + +#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 69351da6..62b62797 100644 --- 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 f76ef736..fdcc685c 100644 --- 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 -#include #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 8fe312df..cb22bdf5 100644 --- 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 3ee389be..68f83496 100644 --- a/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp +++ b/src/wizard/offline_tx_signing/PageOTS_ImportOffline.cpp @@ -8,7 +8,6 @@ #include #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 df5b9070..f4e99bde 100644 --- 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" -- 2.52.0