cleanup includes

src/utils/AppData.cpp

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

src/utils/AppData.h

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

src/utils/EventFilter.cpp

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

src/utils/EventFilter.h

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

src/utils/NetworkManager.cpp

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

src/utils/Networking.cpp

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

src/utils/Seed.cpp

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

src/utils/Seed.h

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

src/utils/SemanticVersion.h

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

src/utils/TorManager.cpp

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

src/utils/TorManager.h

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

src/utils/TxFiatHistory.cpp

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

src/utils/Utils.cpp

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

src/utils/Utils.h

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

src/utils/WebsocketClient.cpp

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

src/utils/WebsocketNotifier.cpp

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

src/utils/config.cpp

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

src/utils/daemonrpc.cpp

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

src/utils/daemonrpc.h

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

src/utils/networktype.h

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

src/utils/nodes.cpp

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

src/utils/nodes.h

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

src/utils/os/tails.cpp

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

src/utils/os/tails.h

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

src/utils/prices.cpp

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

src/utils/scheduler.h

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

src/utils/updater/Updater.cpp

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