Dialogs: format includes

2025-03-12 09:37:47 +00:00 · 2021-06-27 16:33:18 +02:00 · 2021-06-27 16:33:18 +02:00 · ef2f8092df
commit ef2f8092df
parent 8dd7164154
45 changed files with 79 additions and 55 deletions
--- a/src/dialog/AboutDialog.cpp
+++ b/src/dialog/AboutDialog.cpp
@ -3,8 +3,9 @@

 #include "AboutDialog.h"
 #include "ui_AboutDialog.h"
-#include "utils/utils.h"
+
 #include "config-feather.h"
+#include "utils/utils.h"

 AboutDialog::AboutDialog(QWidget *parent)
        : QDialog(parent)
--- a/src/dialog/AboutDialog.h
+++ b/src/dialog/AboutDialog.h
@ -4,7 +4,6 @@
 #ifndef FEATHER_ABOUT_H
 #define FEATHER_ABOUT_H

-#include <QAbstractButton>
 #include <QDialog>
 #include <QStringListModel>

--- a/src/dialog/AccountSwitcherDialog.cpp
+++ b/src/dialog/AccountSwitcherDialog.cpp
@ -4,11 +4,12 @@
 #include "AccountSwitcherDialog.h"
 #include "ui_AccountSwitcherDialog.h"

-#include "libwalletqt/SubaddressAccount.h"
-#include "utils/Icons.h"
-#include "model/ModelUtils.h"
 #include <QMenu>

+#include "libwalletqt/SubaddressAccount.h"
+#include "model/ModelUtils.h"
+#include "utils/Icons.h"
+
 AccountSwitcherDialog::AccountSwitcherDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
    : QDialog(parent)
    , ui(new Ui::AccountSwitcherDialog)
--- a/src/dialog/AccountSwitcherDialog.h
+++ b/src/dialog/AccountSwitcherDialog.h
@ -5,8 +5,8 @@
 #define FEATHER_ACCOUNTSWITCHERDIALOG_H

 #include <QDialog>
-#include "appcontext.h"

+#include "appcontext.h"
 #include "model/SubaddressAccountModel.h"

 namespace Ui {
--- a/src/dialog/BalanceDialog.h
+++ b/src/dialog/BalanceDialog.h
@ -4,10 +4,10 @@
 #ifndef FEATHER_BALANCEDIALOG_H
 #define FEATHER_BALANCEDIALOG_H

-#include "libwalletqt/Wallet.h"
-
 #include <QDialog>

+#include "libwalletqt/Wallet.h"
+
 namespace Ui {
    class BalanceDialog;
 }
--- a/src/dialog/CalcConfigDialog.cpp
+++ b/src/dialog/CalcConfigDialog.cpp
@ -3,6 +3,7 @@

 #include "CalcConfigDialog.h"
 #include "ui_CalcConfigDialog.h"
+
 #include "AppData.h"
 #include "utils/config.h"

--- a/src/dialog/ContactsDialog.cpp
+++ b/src/dialog/ContactsDialog.cpp
@ -5,8 +5,8 @@
 #include "ContactsDialog.h"

 ContactsDialog::ContactsDialog(QWidget *parent, const QString &address, const QString &name)
-    : QDialog(parent)
-    , ui(new Ui::ContactsDialog)
+        : QDialog(parent)
+        , ui(new Ui::ContactsDialog)
 {
    ui->setupUi(this);
    setMinimumWidth(400);
--- a/src/dialog/DebugInfoDialog.cpp
+++ b/src/dialog/DebugInfoDialog.cpp
@ -3,11 +3,12 @@

 #include "DebugInfoDialog.h"
 #include "ui_DebugInfoDialog.h"
+
 #include "config-feather.h"
-#include "utils/WebsocketClient.h"
-#include "utils/TorManager.h"
-#include "utils/WebsocketNotifier.h"
 #include "utils/os/tails.h"
+#include "utils/TorManager.h"
+#include "utils/WebsocketClient.h"
+#include "utils/WebsocketNotifier.h"

 DebugInfoDialog::DebugInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
        : QDialog(parent)
--- a/src/dialog/DebugInfoDialog.h
+++ b/src/dialog/DebugInfoDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_DEBUGINFODIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"
 #include "libwalletqt/Wallet.h"

--- a/src/dialog/KeysDialog.h
+++ b/src/dialog/KeysDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_KEYSDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"

 namespace Ui {
--- a/src/dialog/LocalMoneroInfoDialog.h
+++ b/src/dialog/LocalMoneroInfoDialog.h
@ -6,6 +6,7 @@

 #include <QDialog>
 #include <QLabel>
+
 #include "model/LocalMoneroModel.h"

 namespace Ui {
--- a/src/dialog/OutputInfoDialog.cpp
+++ b/src/dialog/OutputInfoDialog.cpp
@ -3,6 +3,7 @@

 #include "OutputInfoDialog.h"
 #include "ui_OutputInfoDialog.h"
+
 #include "model/ModelUtils.h"
 #include "utils/utils.h"

--- a/src/dialog/OutputInfoDialog.h
+++ b/src/dialog/OutputInfoDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_OUTPUTINFODIALOG_H

 #include <QDialog>
+
 #include "libwalletqt/Coins.h"
 #include "libwalletqt/CoinsInfo.h"

--- a/src/dialog/OutputSweepDialog.cpp
+++ b/src/dialog/OutputSweepDialog.cpp
@ -3,6 +3,7 @@

 #include "OutputSweepDialog.h"
 #include "ui_OutputSweepDialog.h"
+
 #include "libwalletqt/WalletManager.h"

 OutputSweepDialog::OutputSweepDialog(QWidget *parent, CoinsInfo* coin)
--- a/src/dialog/OutputSweepDialog.h
+++ b/src/dialog/OutputSweepDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_OUTPUTSWEEPDIALOG_H

 #include <QDialog>
+
 #include "libwalletqt/CoinsInfo.h"

 namespace Ui {
--- a/src/dialog/PasswordChangeDialog.h
+++ b/src/dialog/PasswordChangeDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_PASSWORDCHANGEDIALOG_H

 #include <QDialog>
+
 #include "libwalletqt/Wallet.h"

 namespace Ui {
--- a/src/dialog/PasswordDialog.cpp
+++ b/src/dialog/PasswordDialog.cpp
@ -3,6 +3,7 @@

 #include "PasswordDialog.h"
 #include "ui_PasswordDialog.h"
+
 #include "utils/Icons.h"

 PasswordDialog::PasswordDialog(const QString &walletName, bool incorrectPassword, QWidget *parent)
--- a/src/dialog/QrCodeDialog.h
+++ b/src/dialog/QrCodeDialog.h
@ -3,6 +3,7 @@

 #ifndef FEATHER_QRCODEDIALOG_H
 #define FEATHER_QRCODEDIALOG_H
+
 #include <QDialog>

 #include "qrcode/QrCode.h"
--- a/src/dialog/RestoreHeightDialog.h
+++ b/src/dialog/RestoreHeightDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_RESTOREHEIGHTDIALOG_H

 #include <QDialog>
+
 #include "widgets/RestoreHeightWidget.h"

 class RestoreHeightDialog : public QDialog
--- a/src/dialog/SeedDialog.cpp
+++ b/src/dialog/SeedDialog.cpp
@ -1,8 +1,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.

-#include "ui_SeedDialog.h"
 #include "SeedDialog.h"
+#include "ui_SeedDialog.h"
+
 #include "constants.h"

 SeedDialog::SeedDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
--- a/src/dialog/SeedDialog.h
+++ b/src/dialog/SeedDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_SEEDDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"

 namespace Ui {
--- a/src/dialog/SignVerifyDialog.cpp
+++ b/src/dialog/SignVerifyDialog.cpp
@ -3,10 +3,11 @@

 #include "SignVerifyDialog.h"
 #include "ui_SignVerifyDialog.h"
-#include "utils/utils.h"

 #include <QMessageBox>

+#include "utils/utils.h"
+
 SignVerifyDialog::SignVerifyDialog(Wallet *wallet, QWidget *parent)
        : QDialog(parent)
        , ui(new Ui::SignVerifyDialog)
--- a/src/dialog/SignVerifyDialog.h
+++ b/src/dialog/SignVerifyDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_SIGNVERIFYDIALOG_H

 #include <QDialog>
+
 #include "libwalletqt/Wallet.h"

 namespace Ui {
--- a/src/dialog/SplashDialog.cpp
+++ b/src/dialog/SplashDialog.cpp
@ -3,6 +3,7 @@

 #include "SplashDialog.h"
 #include "ui_SplashDialog.h"
+
 #include "utils/Icons.h"

 SplashDialog::SplashDialog(QWidget *parent)
--- a/src/dialog/TorInfoDialog.cpp
+++ b/src/dialog/TorInfoDialog.cpp
@ -4,14 +4,14 @@
 #include "TorInfoDialog.h"
 #include "ui_TorInfoDialog.h"

-#include <QPushButton>
 #include <QDesktopServices>
-#include <QMessageBox>
 #include <QInputDialog>
+#include <QMessageBox>
+#include <QPushButton>

-#include "utils/TorManager.h"
-#include "utils/os/tails.h"
 #include "utils/Icons.h"
+#include "utils/os/tails.h"
+#include "utils/TorManager.h"

 TorInfoDialog::TorInfoDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
        : QDialog(parent)
--- a/src/dialog/TorInfoDialog.h
+++ b/src/dialog/TorInfoDialog.h
@ -5,7 +5,6 @@
 #define FEATHER_TORINFODIALOG_H

 #include <QDialog>
-#include <QAbstractButton>

 #include "appcontext.h"

--- a/src/dialog/TxBroadcastDialog.cpp
+++ b/src/dialog/TxBroadcastDialog.cpp
@ -3,10 +3,11 @@

 #include "TxBroadcastDialog.h"
 #include "ui_TxBroadcastDialog.h"
-#include "utils/NetworkManager.h"

 #include <QMessageBox>

+#include "utils/NetworkManager.h"
+
 TxBroadcastDialog::TxBroadcastDialog(QWidget *parent, QSharedPointer<AppContext> ctx, const QString &transactionHex)
        : QDialog(parent)
        , ui(new Ui::TxBroadcastDialog)
--- a/src/dialog/TxBroadcastDialog.h
+++ b/src/dialog/TxBroadcastDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_TXBROADCASTDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"
 #include "utils/daemonrpc.h"

--- a/src/dialog/TxConfAdvDialog.cpp
+++ b/src/dialog/TxConfAdvDialog.cpp
@ -4,15 +4,15 @@
 #include "TxConfAdvDialog.h"
 #include "ui_TxConfAdvDialog.h"

-#include "qrcode/QrCode.h"
-#include "dialog/QrCodeDialog.h"
-#include "libwalletqt/Transfer.h"
-#include "libwalletqt/Input.h"
-#include "model/ModelUtils.h"
-
 #include <QFileDialog>
 #include <QMessageBox>

+#include "dialog/QrCodeDialog.h"
+#include "libwalletqt/Input.h"
+#include "libwalletqt/Transfer.h"
+#include "model/ModelUtils.h"
+#include "qrcode/QrCode.h"
+
 TxConfAdvDialog::TxConfAdvDialog(QSharedPointer<AppContext> ctx, const QString &description, QWidget *parent)
    : QDialog(parent)
    , ui(new Ui::TxConfAdvDialog)
--- a/src/dialog/TxConfAdvDialog.h
+++ b/src/dialog/TxConfAdvDialog.h
@ -5,13 +5,12 @@
 #define FEATHER_TXCONFADVDIALOG_H

 #include <QDialog>
-#include <QStandardItemModel>
-#include <QAbstractButton>
 #include <QMenu>
+#include <QStandardItemModel>
 #include <QTextCharFormat>

-#include "libwalletqt/PendingTransaction.h"
 #include "appcontext.h"
+#include "libwalletqt/PendingTransaction.h"

 namespace Ui {
    class TxConfAdvDialog;
--- a/src/dialog/TxConfDialog.cpp
+++ b/src/dialog/TxConfDialog.cpp
@ -6,9 +6,9 @@

 #include <QMessageBox>

+#include "constants.h"
 #include "model/ModelUtils.h"
 #include "TxConfAdvDialog.h"
-#include "constants.h"
 #include "utils/AppData.h"
 #include "utils/ColorScheme.h"

--- a/src/dialog/TxConfDialog.h
+++ b/src/dialog/TxConfDialog.h
@ -5,9 +5,10 @@
 #define FEATHER_TXCONFDIALOG_H

 #include <QDialog>
+
+#include "appcontext.h"
 #include "libwalletqt/PendingTransaction.h"
 #include "libwalletqt/WalletManager.h"
-#include "appcontext.h"

 namespace Ui {
    class TxConfDialog;
--- a/src/dialog/TxImportDialog.cpp
+++ b/src/dialog/TxImportDialog.cpp
@ -3,10 +3,11 @@

 #include "TxImportDialog.h"
 #include "ui_TxImportDialog.h"
-#include "utils/NetworkManager.h"

 #include <QMessageBox>

+#include "utils/NetworkManager.h"
+
 TxImportDialog::TxImportDialog(QWidget *parent, QSharedPointer<AppContext> ctx)
        : QDialog(parent)
        , ui(new Ui::TxImportDialog)
--- a/src/dialog/TxImportDialog.h
+++ b/src/dialog/TxImportDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_TXIMPORTDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"
 #include "utils/daemonrpc.h"

--- a/src/dialog/TxInfoDialog.cpp
+++ b/src/dialog/TxInfoDialog.cpp
@ -4,19 +4,17 @@
 #include "TxInfoDialog.h"
 #include "ui_TxInfoDialog.h"

-#include "libwalletqt/CoinsInfo.h"
-#include "libwalletqt/WalletManager.h"
-#include "libwalletqt/Transfer.h"
-#include "libwalletqt/TransactionHistory.h"
-#include "utils.h"
-#include "utils/ColorScheme.h"
-#include "model/ModelUtils.h"
-#include "config.h"
-#include "appcontext.h"
-
 #include <QMessageBox>
 #include <QScrollBar>

+#include "appcontext.h"
+#include "config.h"
+#include "libwalletqt/TransactionHistory.h"
+#include "libwalletqt/Transfer.h"
+#include "libwalletqt/WalletManager.h"
+#include "model/ModelUtils.h"
+#include "utils.h"
+
 TxInfoDialog::TxInfoDialog(QSharedPointer<AppContext> ctx, TransactionInfo *txInfo, QWidget *parent)
    : QDialog(parent)
    , ui(new Ui::TxInfoDialog)
--- a/src/dialog/TxInfoDialog.h
+++ b/src/dialog/TxInfoDialog.h
@ -7,6 +7,7 @@
 #include <QDialog>
 #include <QTextCharFormat>
 #include <QtSvg/QSvgWidget>
+
 #include "appcontext.h"
 #include "dialog/TxProofDialog.h"

--- a/src/dialog/TxProofDialog.cpp
+++ b/src/dialog/TxProofDialog.cpp
@ -7,8 +7,8 @@
 #include <QMessageBox>

 #include "libwalletqt/Transfer.h"
-#include "utils/utils.h"
 #include "utils/Icons.h"
+#include "utils/utils.h"

 TxProofDialog::TxProofDialog(QWidget *parent, QSharedPointer<AppContext> ctx, TransactionInfo *txInfo)
    : QDialog(parent)
--- a/src/dialog/TxProofDialog.h
+++ b/src/dialog/TxProofDialog.h
@ -6,8 +6,8 @@

 #include <QDialog>

-#include "libwalletqt/TransactionInfo.h"
 #include "appcontext.h"
+#include "libwalletqt/TransactionInfo.h"

 namespace Ui {
    class TxProofDialog;
--- a/src/dialog/UpdateDialog.cpp
+++ b/src/dialog/UpdateDialog.cpp
@ -5,11 +5,10 @@
 #include "ui_UpdateDialog.h"

 #include <QFileDialog>
-#include <utility>

+#include "utils/AsyncTask.h"
 #include "utils/networking.h"
 #include "utils/NetworkManager.h"
-#include "utils/AsyncTask.h"
 #include "utils/Updater.h"
 #include "utils/utils.h"

--- a/src/dialog/VerifyProofDialog.cpp
+++ b/src/dialog/VerifyProofDialog.cpp
@ -4,12 +4,12 @@
 #include "VerifyProofDialog.h"
 #include "ui_VerifyProofDialog.h"

-#include "libwalletqt/WalletManager.h"
-#include "utils/utils.h"
-#include "model/ModelUtils.h"
-
 #include <QMessageBox>

+#include "libwalletqt/WalletManager.h"
+#include "model/ModelUtils.h"
+#include "utils/utils.h"
+
 VerifyProofDialog::VerifyProofDialog(Wallet *wallet, QWidget *parent)
        : QDialog(parent)
        , ui(new Ui::VerifyProofDialog)
--- a/src/dialog/VerifyProofDialog.h
+++ b/src/dialog/VerifyProofDialog.h
@ -6,6 +6,7 @@

 #include <QDialog>
 #include <QIcon>
+
 #include "libwalletqt/Wallet.h"

 namespace Ui {
--- a/src/dialog/ViewOnlyDialog.cpp
+++ b/src/dialog/ViewOnlyDialog.cpp
@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.

+#include "ViewOnlyDialog.h"
+#include "ui_ViewOnlyDialog.h"
+
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

-#include "ViewOnlyDialog.h"
-#include "ui_ViewOnlyDialog.h"
-
 ViewOnlyDialog::ViewOnlyDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
    : QDialog(parent)
    , ui(new Ui::ViewOnlyDialog)
--- a/src/dialog/ViewOnlyDialog.h
+++ b/src/dialog/ViewOnlyDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_VIEWONLYDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"

 namespace Ui {
--- a/src/dialog/WalletCacheDebugDialog.cpp
+++ b/src/dialog/WalletCacheDebugDialog.cpp
@ -3,10 +3,11 @@

 #include "WalletCacheDebugDialog.h"
 #include "ui_WalletCacheDebugDialog.h"
-#include "model/ModelUtils.h"

 #include <QRadioButton>

+#include "model/ModelUtils.h"
+
 WalletCacheDebugDialog::WalletCacheDebugDialog(QSharedPointer<AppContext> ctx, QWidget *parent)
        : QDialog(parent)
        , ui(new Ui::WalletCacheDebugDialog)
--- a/src/dialog/WalletCacheDebugDialog.h
+++ b/src/dialog/WalletCacheDebugDialog.h
@ -5,6 +5,7 @@
 #define FEATHER_WALLETCACHEDEBUGDIALOG_H

 #include <QDialog>
+
 #include "appcontext.h"

 namespace Ui {