Widgets: rename & cleanup

diff --git a/src/calcwidget.cpp b/src/CalcWidget.cpp
similarity index 98%
rename from src/calcwidget.cpp
rename to src/CalcWidget.cpp
index 626dac051fcda14496dc074fd21bc37b674012af..f773716787535ecbd9c54a22f200ba6708728fa6 100644 (file)
--- a/src/calcwidget.cpp
+++ b/src/CalcWidget.cpp
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "CalcWidget.h"
+#include "ui_CalcWidget.h"
+
 #include <QList>
 
-#include "calcwidget.h"
-#include "ui_calcwidget.h"
-#include "utils/ColorScheme.h"
+#include "dialog/CalcConfigDialog.h"
 #include "utils/AppData.h"
+#include "utils/ColorScheme.h"
 #include "utils/config.h"
-#include "dialog/CalcConfigDialog.h"
 
 CalcWidget::CalcWidget(QWidget *parent)
     : QWidget(parent)

diff --git a/src/calcwidget.h b/src/CalcWidget.h
similarity index 100%
rename from src/calcwidget.h
rename to src/CalcWidget.h

diff --git a/src/calcwidget.ui b/src/CalcWidget.ui
similarity index 100%
rename from src/calcwidget.ui
rename to src/CalcWidget.ui

diff --git a/src/calcwindow.cpp b/src/CalcWindow.cpp
similarity index 87%
rename from src/calcwindow.cpp
rename to src/CalcWindow.cpp
index 77a92605a273a6f4d985c30caf7f2f76a831e5c0..1b55c1deb80d8cab79fe98dd2cd206f3c3ff90eb 100644 (file)
--- a/src/calcwindow.cpp
+++ b/src/CalcWindow.cpp
@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "calcwindow.h"
-#include "mainwindow.h"
-#include "utils/Icons.h"
-#include "utils/AppData.h"
+#include "CalcWindow.h"
+#include "ui_CalcWindow.h"
 
-#include "ui_calcwindow.h"
+#include "utils/AppData.h"
+#include "utils/Icons.h"
 
 CalcWindow::CalcWindow(QWidget *parent)
     : QMainWindow(parent)

diff --git a/src/calcwindow.h b/src/CalcWindow.h
similarity index 100%
rename from src/calcwindow.h
rename to src/CalcWindow.h

diff --git a/src/calcwindow.ui b/src/CalcWindow.ui
similarity index 97%
rename from src/calcwindow.ui
rename to src/CalcWindow.ui
index 1d490cfe44e140c5bbd9d46623a6329e9b289548..2447bbabb68a0ee65a2229d6973f8a3636e8344a 100644 (file)
--- a/src/calcwindow.ui
+++ b/src/CalcWindow.ui
@@ -37,7 +37,7 @@
   <customwidget>
    <class>CalcWidget</class>
    <extends>QWidget</extends>
-   <header>calcwidget.h</header>
+   <header>CalcWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/coinswidget.cpp b/src/CoinsWidget.cpp
similarity index 97%
rename from src/coinswidget.cpp
rename to src/CoinsWidget.cpp
index e7026de3e30c1916b63940bfa147abd51d018422..4620737465724e7296a7bae39ce9c6040ff97eb3 100644 (file)
--- a/src/coinswidget.cpp
+++ b/src/CoinsWidget.cpp
@@ -1,22 +1,21 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "coinswidget.h"
-#include "ui_coinswidget.h"
+#include "CoinsWidget.h"
+#include "ui_CoinsWidget.h"
+
+#include <QMessageBox>
+
 #include "dialog/OutputInfoDialog.h"
 #include "dialog/OutputSweepDialog.h"
-#include "mainwindow.h"
 #include "utils/Icons.h"
 
-#include <QClipboard>
-#include <QMessageBox>
-
 CoinsWidget::CoinsWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::CoinsWidget)
-    , m_ctx(std::move(ctx))
-    , m_headerMenu(new QMenu(this))
-    , m_copyMenu(new QMenu("Copy",this))
+        : QWidget(parent)
+        , ui(new Ui::CoinsWidget)
+        , m_ctx(std::move(ctx))
+        , m_headerMenu(new QMenu(this))
+        , m_copyMenu(new QMenu("Copy",this))
 {
     ui->setupUi(this);
 

diff --git a/src/coinswidget.h b/src/CoinsWidget.h
similarity index 100%
rename from src/coinswidget.h
rename to src/CoinsWidget.h
index a9c418eff0196a93bbaf1a1b6bd39472e26db43b..87515d653d8de5b4042e67df848dda24e8273359 100644 (file)
--- a/src/coinswidget.h
+++ b/src/CoinsWidget.h
@@ -4,15 +4,15 @@
 #ifndef FEATHER_COINSWIDGET_H
 #define FEATHER_COINSWIDGET_H
 
+#include <QMenu>
+#include <QWidget>
+#include <QtSvg/QSvgWidget>
+
 #include "appcontext.h"
 #include "model/CoinsModel.h"
 #include "model/CoinsProxyModel.h"
 #include "libwalletqt/Coins.h"
 
-#include <QMenu>
-#include <QWidget>
-#include <QtSvg/QSvgWidget>
-
 namespace Ui {
     class CoinsWidget;
 }

diff --git a/src/coinswidget.ui b/src/CoinsWidget.ui
similarity index 100%
rename from src/coinswidget.ui
rename to src/CoinsWidget.ui

diff --git a/src/contactswidget.cpp b/src/ContactsWidget.cpp
similarity index 96%
rename from src/contactswidget.cpp
rename to src/ContactsWidget.cpp
index 6075bb444c3519b4d44cea253b67de8090eb1273..a4616e07a2672aa9578d74ac99da2c5fcc517200 100644 (file)
--- a/src/contactswidget.cpp
+++ b/src/ContactsWidget.cpp
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "contactswidget.h"
-#include "ui_contactswidget.h"
+#include "ContactsWidget.h"
+#include "ui_ContactsWidget.h"
+
+#include <QMessageBox>
+
 #include "dialog/ContactsDialog.h"
-#include "model/ModelUtils.h"
-#include "mainwindow.h"
 #include "libwalletqt/AddressBook.h"
+#include "model/ModelUtils.h"
 #include "utils/Icons.h"
 
-#include <QMessageBox>
-
 ContactsWidget::ContactsWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::ContactsWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::ContactsWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 

diff --git a/src/contactswidget.h b/src/ContactsWidget.h
similarity index 100%
rename from src/contactswidget.h
rename to src/ContactsWidget.h
index fb513632bc806a3918aa45d84ef930f4f5876e4b..e800a0ea73016452d17c8e00db0de63e5b312252 100644 (file)
--- a/src/contactswidget.h
+++ b/src/ContactsWidget.h
@@ -4,13 +4,13 @@
 #ifndef FEATHER_CONTACTSWIDGET_H
 #define FEATHER_CONTACTSWIDGET_H
 
-#include "model/AddressBookModel.h"
-#include "model/AddressBookProxyModel.h"
-#include "appcontext.h"
-
 #include <QWidget>
 #include <QMenu>
 
+#include "appcontext.h"
+#include "model/AddressBookModel.h"
+#include "model/AddressBookProxyModel.h"
+
 namespace Ui {
 class ContactsWidget;
 }

diff --git a/src/contactswidget.ui b/src/ContactsWidget.ui
similarity index 100%
rename from src/contactswidget.ui
rename to src/ContactsWidget.ui

diff --git a/src/historywidget.cpp b/src/HistoryWidget.cpp
similarity index 95%
rename from src/historywidget.cpp
rename to src/HistoryWidget.cpp
index e2c9c3ecf475908da725d16f987afd4597d50863..41191b5b79bbaf46ee35720fccb9fd0ee4bfdb0d 100644 (file)
--- a/src/historywidget.cpp
+++ b/src/HistoryWidget.cpp
@@ -1,23 +1,24 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "historywidget.h"
-#include "ui_historywidget.h"
+#include "HistoryWidget.h"
+#include "ui_HistoryWidget.h"
+
+#include <QMessageBox>
+
+#include "appcontext.h"
 #include "dialog/TxInfoDialog.h"
 #include "dialog/TxProofDialog.h"
-#include "utils/Icons.h"
 #include "utils/config.h"
-#include "appcontext.h"
-
-#include <QMessageBox>
+#include "utils/Icons.h"
 
 HistoryWidget::HistoryWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::HistoryWidget)
-    , m_ctx(std::move(ctx))
-    , m_contextMenu(new QMenu(this))
-    , m_copyMenu(new QMenu("Copy", this))
-    , m_model(m_ctx->wallet->historyModel())
+        : QWidget(parent)
+        , ui(new Ui::HistoryWidget)
+        , m_ctx(std::move(ctx))
+        , m_contextMenu(new QMenu(this))
+        , m_copyMenu(new QMenu("Copy", this))
+        , m_model(m_ctx->wallet->historyModel())
 {
     ui->setupUi(this);
     m_contextMenu->addMenu(m_copyMenu);

diff --git a/src/historywidget.h b/src/HistoryWidget.h
similarity index 100%
rename from src/historywidget.h
rename to src/HistoryWidget.h
index 05434c6f1391b0693e460071a4fa920726045875..3a414dd85a09c10f593cce168e463f08b423b10d 100644 (file)
--- a/src/historywidget.h
+++ b/src/HistoryWidget.h
@@ -4,15 +4,15 @@
 #ifndef FEATHER_HISTORYWIDGET_H
 #define FEATHER_HISTORYWIDGET_H
 
-#include "model/TransactionHistoryModel.h"
-#include "model/TransactionHistoryProxyModel.h"
-#include "libwalletqt/Coins.h"
-#include "libwalletqt/Wallet.h"
-#include "appcontext.h"
-
 #include <QWidget>
 #include <QMenu>
 
+#include "appcontext.h"
+#include "libwalletqt/Coins.h"
+#include "libwalletqt/Wallet.h"
+#include "model/TransactionHistoryModel.h"
+#include "model/TransactionHistoryProxyModel.h"
+
 namespace Ui {
     class HistoryWidget;
 }

diff --git a/src/historywidget.ui b/src/HistoryWidget.ui
similarity index 100%
rename from src/historywidget.ui
rename to src/HistoryWidget.ui

diff --git a/src/mainwindow.cpp b/src/MainWindow.cpp
similarity index 99%
rename from src/mainwindow.cpp
rename to src/MainWindow.cpp
index 353407f85812a5d37ea5b2205464fa3e2b5ecb5c..50d13c0c68ca48edde221af03166e43a3be06e9b 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/MainWindow.cpp
@@ -1,38 +1,38 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "MainWindow.h"
+#include "ui_MainWindow.h"
 
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 
 #include "config-feather.h"
-#include "dialog/TxConfDialog.h"
-#include "dialog/TxConfAdvDialog.h"
+#include "constants.h"
+#include "dialog/AccountSwitcherDialog.h"
+#include "dialog/BalanceDialog.h"
 #include "dialog/DebugInfoDialog.h"
-#include "dialog/WalletInfoDialog.h"
+#include "dialog/PasswordDialog.h"
 #include "dialog/TorInfoDialog.h"
-#include "dialog/ViewOnlyDialog.h"
 #include "dialog/TxBroadcastDialog.h"
+#include "dialog/TxConfAdvDialog.h"
+#include "dialog/TxConfDialog.h"
 #include "dialog/TxImportDialog.h"
-#include "dialog/PasswordDialog.h"
-#include "dialog/BalanceDialog.h"
+#include "dialog/ViewOnlyDialog.h"
+#include "dialog/WalletInfoDialog.h"
 #include "dialog/WalletCacheDebugDialog.h"
 #include "dialog/UpdateDialog.h"
-#include "dialog/AccountSwitcherDialog.h"
-#include "constants.h"
 #include "libwalletqt/AddressBook.h"
-#include "utils/AsyncTask.h"
 #include "utils/AppData.h"
+#include "utils/AsyncTask.h"
 #include "utils/ColorScheme.h"
-#include "utils/SemanticVersion.h"
-#include "utils/NetworkManager.h"
 #include "utils/Icons.h"
-#include "utils/WebsocketNotifier.h"
-#include "utils/Updater.h"
+#include "utils/NetworkManager.h"
 #include "utils/os/tails.h"
+#include "utils/SemanticVersion.h"
 #include "utils/TorManager.h"
+#include "utils/Updater.h"
+#include "utils/WebsocketNotifier.h"
 
 MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *parent)
     : QMainWindow(parent)

diff --git a/src/mainwindow.h b/src/MainWindow.h
similarity index 97%
rename from src/mainwindow.h
rename to src/MainWindow.h
index efbf13af286f816ccc507294aa99cb1d1ba807e0..6d33806dc07770d974de1c8a7702e58c4dc514b5 100644 (file)
--- a/src/mainwindow.h
+++ b/src/MainWindow.h
@@ -10,8 +10,8 @@
 
 #include "appcontext.h"
 #include "components.h"
-#include "calcwindow.h"
-#include "settings.h"
+#include "CalcWindow.h"
+#include "SettingsDialog.h"
 
 #include "dialog/AboutDialog.h"
 #include "dialog/SignVerifyDialog.h"
@@ -35,11 +35,11 @@
 #include "widgets/TickerWidget.h"
 #include "wizard/WalletWizard.h"
 
-#include "contactswidget.h"
-#include "historywidget.h"
-#include "sendwidget.h"
-#include "receivewidget.h"
-#include "coinswidget.h"
+#include "ContactsWidget.h"
+#include "HistoryWidget.h"
+#include "SendWidget.h"
+#include "ReceiveWidget.h"
+#include "CoinsWidget.h"
 
 #include "WindowManager.h"
 

diff --git a/src/mainwindow.ui b/src/MainWindow.ui
similarity index 99%
rename from src/mainwindow.ui
rename to src/MainWindow.ui
index 8748ebf5ecd79da3df244f1f9fb16ce804b2e9b2..4386c2e4123cbc2896ece138ab1b0521604d0626 100644 (file)
--- a/src/mainwindow.ui
+++ b/src/MainWindow.ui
@@ -803,7 +803,7 @@
   <customwidget>
    <class>CalcWidget</class>
    <extends>QWidget</extends>
-   <header>calcwidget.h</header>
+   <header>CalcWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/receivewidget.cpp b/src/ReceiveWidget.cpp
similarity index 98%
rename from src/receivewidget.cpp
rename to src/ReceiveWidget.cpp
index 373bc54c9b10767f93132823212b892186778af9..2dbeba5269dd460b32656d7301659e58e4d30eac 100644 (file)
--- a/src/receivewidget.cpp
+++ b/src/ReceiveWidget.cpp
@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "ui_receivewidget.h"
-#include "receivewidget.h"
-#include "model/ModelUtils.h"
-#include "dialog/QrCodeDialog.h"
-#include "utils/Icons.h"
+#include "ReceiveWidget.h"
+#include "ui_ReceiveWidget.h"
 
 #include <QMenu>
 #include <QMessageBox>
 
+#include "dialog/QrCodeDialog.h"
+#include "model/ModelUtils.h"
+#include "utils/Icons.h"
+
 ReceiveWidget::ReceiveWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::ReceiveWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::ReceiveWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 

diff --git a/src/receivewidget.h b/src/ReceiveWidget.h
similarity index 99%
rename from src/receivewidget.h
rename to src/ReceiveWidget.h
index 5957b874d2bb89515d1c6d50bb40e8b69712b62c..23ee78b1b287f21c662d804dc49cc174042a2566 100644 (file)
--- a/src/receivewidget.h
+++ b/src/ReceiveWidget.h
@@ -4,14 +4,15 @@
 #ifndef FEATHER_RECEIVEWIDGET_H
 #define FEATHER_RECEIVEWIDGET_H
 
+#include <QMenu>
+#include <QWidget>
+#include <QtSvg/QSvgWidget>
+
 #include "appcontext.h"
-#include "qrcode/QrCode.h"
 #include "libwalletqt/Subaddress.h"
 #include "model/SubaddressProxyModel.h"
 #include "model/SubaddressModel.h"
-
-#include <QWidget>
-#include <QtSvg/QSvgWidget>
+#include "qrcode/QrCode.h"
 
 namespace Ui {
     class ReceiveWidget;

diff --git a/src/receivewidget.ui b/src/ReceiveWidget.ui
similarity index 100%
rename from src/receivewidget.ui
rename to src/ReceiveWidget.ui

diff --git a/src/sendwidget.cpp b/src/SendWidget.cpp
similarity index 99%
rename from src/sendwidget.cpp
rename to src/SendWidget.cpp
index 7e6a0d44bda9d4c63563c5e7693f611c98dc13f1..32dbda01a4d3157fe6e2b961ddbd07e8adbb8c2f 100644 (file)
--- a/src/sendwidget.cpp
+++ b/src/SendWidget.cpp
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "SendWidget.h"
+#include "ui_SendWidget.h"
+
 #include <QMessageBox>
-#include "sendwidget.h"
-#include "mainwindow.h"
-#include "ui_sendwidget.h"
+
+#include "ColorScheme.h"
 #include "constants.h"
 #include "utils/AppData.h"
 #include "Icons.h"
-#include "ColorScheme.h"
 
 #ifdef WITH_SCANNER
 #include "qrcode_scanner/QrCodeScanDialog.h"

diff --git a/src/sendwidget.h b/src/SendWidget.h
similarity index 100%
rename from src/sendwidget.h
rename to src/SendWidget.h

diff --git a/src/sendwidget.ui b/src/SendWidget.ui
similarity index 100%
rename from src/sendwidget.ui
rename to src/SendWidget.ui

diff --git a/src/settings.cpp b/src/SettingsDialog.cpp
similarity index 98%
rename from src/settings.cpp
rename to src/SettingsDialog.cpp
index e29c4e9f73e80bc5dc29b0973a457ac75c6531ca..d948f96e23e447f8c365967cd61dafc30f94e869 100644 (file)
--- a/src/settings.cpp
+++ b/src/SettingsDialog.cpp
@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "settings.h"
-#include "ui_settings.h"
-#include "mainwindow.h"
+#include "SettingsDialog.h"
+#include "ui_SettingsDialog.h"
 
 #include <QFileDialog>
 
 Settings::Settings(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
-    , ui(new Ui::Settings)
-    , m_ctx(std::move(ctx))
+        : QDialog(parent)
+        , ui(new Ui::Settings)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 

diff --git a/src/settings.h b/src/SettingsDialog.h
similarity index 100%
rename from src/settings.h
rename to src/SettingsDialog.h

diff --git a/src/settings.ui b/src/SettingsDialog.ui
similarity index 100%
rename from src/settings.ui
rename to src/SettingsDialog.ui

diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp
index df0bf12395ffc416169cabbdaead7477247ac289..82d19baa68755f9833f58d12b7f87ba42bd3bd7b 100644 (file)
--- a/src/WindowManager.cpp
+++ b/src/WindowManager.cpp
@@ -2,16 +2,17 @@
 // Copyright (c) 2020-2021, The Monero Project.
 
 #include "WindowManager.h"
+
+#include <QMessageBox>
+
 #include "constants.h"
 #include "dialog/PasswordDialog.h"
 #include "dialog/SplashDialog.h"
-#include "utils/WebsocketNotifier.h"
-#include "utils/os/tails.h"
 #include "utils/Icons.h"
 #include "utils/NetworkManager.h"
+#include "utils/os/tails.h"
 #include "utils/TorManager.h"
-
-#include <QMessageBox>
+#include "utils/WebsocketNotifier.h"
 
 WindowManager::WindowManager() {
     m_walletManager = WalletManager::instance();

diff --git a/src/WindowManager.h b/src/WindowManager.h
index ffcd636e73b19bccaf6694c9a2f852a5247fceb1..4a1acb22adb4d968ee0d76ccc86c144e719d3511 100644 (file)
--- a/src/WindowManager.h
+++ b/src/WindowManager.h
@@ -5,11 +5,12 @@
 #define FEATHER_WINDOWMANAGER_H
 
 #include <QObject>
+
+#include "dialog/TorInfoDialog.h"
 #include "libwalletqt/WalletManager.h"
 #include "libwalletqt/Wallet.h"
+#include "MainWindow.h"
 #include "wizard/WalletWizard.h"
-#include "dialog/TorInfoDialog.h"
-#include "mainwindow.h"
 
 class MainWindow;
 class WindowManager : public QObject {

diff --git a/src/main.cpp b/src/main.cpp
index 62fdb9fdb6aa1d5af2b6494538c8ed9baadd9390..46fef9605236bfd6ebaf72573cdd790eecf384de 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,10 +6,10 @@
 #include <QtCore>
 #include <QtGui>
 
+#include "cli.h"
 #include "config-feather.h"
 #include "constants.h"
-#include "mainwindow.h"
-#include "cli.h"
+#include "MainWindow.h"
 #include "WindowManager.h"
 
 #if defined(Q_OS_WIN)