Widgets: cleanup

diff --git a/src/mainwindow.h b/src/mainwindow.h
index f7a441fc35c7c759ea9ac0bb9bb8d083748322ec..efbf13af286f816ccc507294aa99cb1d1ba807e0 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -7,7 +7,6 @@
 #include <QMainWindow>
 #include <QSystemTrayIcon>
 #include <QMenu>
-#include <utility>
 
 #include "appcontext.h"
 #include "components.h"
@@ -31,8 +30,8 @@
 #include "model/CoinsProxyModel.h"
 #include "utils/networking.h"
 #include "utils/config.h"
-#include "widgets/ccswidget.h"
-#include "widgets/redditwidget.h"
+#include "widgets/CCSWidget.h"
+#include "widgets/RedditWidget.h"
 #include "widgets/TickerWidget.h"
 #include "wizard/WalletWizard.h"
 
@@ -49,7 +48,7 @@
 #endif
 
 #ifdef HAS_XMRIG
-#include "widgets/xmrigwidget.h"
+#include "widgets/XMRigWidget.h"
 #endif
 
 namespace Ui {

diff --git a/src/sendwidget.h b/src/sendwidget.h
index 2b2f0b8cf9cf69268f4a5a3cb332c0440bb95c3b..3f340fce7ef05047daa42cb373638a210ea67514 100644 (file)
--- a/src/sendwidget.h
+++ b/src/sendwidget.h
@@ -5,8 +5,9 @@
 #define FEATHER_SENDWIDGET_H
 
 #include <QWidget>
+
 #include "appcontext.h"
-#include "widgets/ccswidget.h"
+#include "widgets/CCSWidget.h"
 
 namespace Ui {
     class SendWidget;

diff --git a/src/settings.h b/src/settings.h
index 8c9c48cea4f6f202a1ef1f11488cccdeaec53874..4cbf18c1200d13038b3283fe7f000f4a6d569451 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -4,12 +4,12 @@
 #ifndef FEATHER_SETTINGS_H
 #define FEATHER_SETTINGS_H
 
+#include <QAbstractButton>
 #include <QDialog>
 #include <QSettings>
-#include <QAbstractButton>
 
 #include "appcontext.h"
-#include "widgets/nodewidget.h"
+#include "widgets/NodeWidget.h"
 
 namespace Ui {
     class Settings;

diff --git a/src/settings.ui b/src/settings.ui
index 533afdf87e162ec5fdf58a95e04911a92f238582..554d5e303a662a45cc2336846aad61ef04333e08 100644 (file)
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -670,7 +670,7 @@
   <customwidget>
    <class>NodeWidget</class>
    <extends>QWidget</extends>
-   <header>widgets/nodewidget.h</header>
+   <header>widgets/NodeWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/widgets/ccsprogressdelegate.cpp b/src/widgets/CCSProgressDelegate.cpp
similarity index 93%
rename from src/widgets/ccsprogressdelegate.cpp
rename to src/widgets/CCSProgressDelegate.cpp
index 18c39b36cb3be9e21f23260d2aeff8da37341c14..dfed0ca34787998e7857a0e2898115b02e566d4f 100644 (file)
--- a/src/widgets/ccsprogressdelegate.cpp
+++ b/src/widgets/CCSProgressDelegate.cpp
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "ccsprogressdelegate.h"
+#include "CCSProgressDelegate.h"
 
 #include <QApplication>
 
 CCSProgressDelegate::CCSProgressDelegate(CCSModel *model, QWidget *parent)
-    : QStyledItemDelegate(parent)
-    , m_model(model)
+        : QStyledItemDelegate(parent)
+        , m_model(model)
 {
 }
 

diff --git a/src/widgets/ccsprogressdelegate.h b/src/widgets/CCSProgressDelegate.h
similarity index 99%
rename from src/widgets/ccsprogressdelegate.h
rename to src/widgets/CCSProgressDelegate.h
index c2fd13ebddb6893e17ca873780efe65396fe6a2e..1ad23b1da86a67a4a295e73e9930daf8ea2c8587 100644 (file)
--- a/src/widgets/ccsprogressdelegate.h
+++ b/src/widgets/CCSProgressDelegate.h
@@ -5,6 +5,7 @@
 #define FEATHER_CSSPROGRESSDELEGATE_H
 
 #include <QStyledItemDelegate>
+
 #include "model/CCSModel.h"
 
 class CCSProgressDelegate : public QStyledItemDelegate

diff --git a/src/widgets/ccswidget.cpp b/src/widgets/CCSWidget.cpp
similarity index 87%
rename from src/widgets/ccswidget.cpp
rename to src/widgets/CCSWidget.cpp
index 443c37dcf2d37362985c0f28fbf100b3616730e0..a80571af31c453c39482093876579da1bb46b96a 100644 (file)
--- a/src/widgets/ccswidget.cpp
+++ b/src/widgets/CCSWidget.cpp
@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "CCSWidget.h"
+#include "ui_CCSWidget.h"
+
+#include <QDesktopServices>
 #include <QStandardItemModel>
 #include <QTableWidget>
-#include <QDesktopServices>
 
-#include "ccswidget.h"
-#include "ui_ccswidget.h"
-#include "ccsprogressdelegate.h"
+#include "CCSProgressDelegate.h"
 
-CCSWidget::CCSWidget(QWidget *parent) :
-        QWidget(parent),
-        ui(new Ui::CSSWidget),
-        m_model(new CCSModel(this)),
-        m_contextMenu(new QMenu(this))
+CCSWidget::CCSWidget(QWidget *parent)
+        : QWidget(parent)
+        , ui(new Ui::CSSWidget)
+        , m_model(new CCSModel(this))
+        , m_contextMenu(new QMenu(this))
 {
     ui->setupUi(this);
     auto progressDelegate = new CCSProgressDelegate(m_model, this);

diff --git a/src/widgets/ccswidget.h b/src/widgets/CCSWidget.h
similarity index 100%
rename from src/widgets/ccswidget.h
rename to src/widgets/CCSWidget.h
index 5b77d8dd3d6c8085260a9436f6a70d1825312152..21332e81cd11f08193c038fc5c54fcb92ff6d80e 100644 (file)
--- a/src/widgets/ccswidget.h
+++ b/src/widgets/CCSWidget.h
@@ -4,15 +4,15 @@
 #ifndef FEATHER_CSSWIDGET_H
 #define FEATHER_CSSWIDGET_H
 
+#include <QItemDelegate>
 #include <QMenu>
 #include <QObject>
-#include <QWidget>
 #include <QProgressBar>
-#include <QItemDelegate>
+#include <QWidget>
 
-#include "widgets/CCSEntry.h"
-#include "model/CCSModel.h"
 #include "appcontext.h"
+#include "model/CCSModel.h"
+#include "widgets/CCSEntry.h"
 
 namespace Ui {
     class CSSWidget;

diff --git a/src/widgets/ccswidget.ui b/src/widgets/CCSWidget.ui
similarity index 100%
rename from src/widgets/ccswidget.ui
rename to src/widgets/CCSWidget.ui

diff --git a/src/widgets/LocalMoneroWidget.cpp b/src/widgets/LocalMoneroWidget.cpp
index ffbb6155cc7bdce41392b4980de3ab50577e8fc9..5fb70f30a607872853627dd26ce225e5aac6e71f 100644 (file)
--- a/src/widgets/LocalMoneroWidget.cpp
+++ b/src/widgets/LocalMoneroWidget.cpp
@@ -3,19 +3,20 @@
 
 #include "LocalMoneroWidget.h"
 #include "ui_LocalMoneroWidget.h"
+
+#include <QMessageBox>
+#include <QMenu>
+
+#include "dialog/LocalMoneroInfoDialog.h"
 #include "utils/ColorScheme.h"
 #include "utils/Icons.h"
 #include "utils/NetworkManager.h"
 #include "utils/WebsocketNotifier.h"
-#include "dialog/LocalMoneroInfoDialog.h"
-
-#include <QMessageBox>
-#include <QMenu>
 
 LocalMoneroWidget::LocalMoneroWidget(QWidget *parent, QSharedPointer<AppContext> ctx)
-    : QWidget(parent)
-    , ui(new Ui::LocalMoneroWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::LocalMoneroWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 

diff --git a/src/widgets/LocalMoneroWidget.h b/src/widgets/LocalMoneroWidget.h
index baa0d7a259334f325c838657feaf4a0d9bdcd67c..d5d6acc305846a2c77bd31375b30682f1ddbd6ae 100644 (file)
--- a/src/widgets/LocalMoneroWidget.h
+++ b/src/widgets/LocalMoneroWidget.h
@@ -6,8 +6,8 @@
 
 #include <QWidget>
 
-#include "appcontext.h"
 #include "api/LocalMoneroApi.h"
+#include "appcontext.h"
 #include "model/LocalMoneroModel.h"
 
 namespace Ui {

diff --git a/src/widgets/nodewidget.cpp b/src/widgets/NodeWidget.cpp
similarity index 98%
rename from src/widgets/nodewidget.cpp
rename to src/widgets/NodeWidget.cpp
index af630955e8ed708a97c217f188635797f5bdb911..23d6afa02b5970238098aa3f6d04bfc40fb9e9f1 100644 (file)
--- a/src/widgets/nodewidget.cpp
+++ b/src/widgets/NodeWidget.cpp
@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "NodeWidget.h"
+#include "ui_NodeWidget.h"
+
+#include <QAction>
+#include <QDesktopServices>
 #include <QInputDialog>
-#include <QTableWidget>
+#include <QMenu>
 #include <QMessageBox>
-#include <QDesktopServices>
+#include <QTableWidget>
 
 #include "model/NodeModel.h"
-#include "nodewidget.h"
-#include "ui_nodewidget.h"
-#include "mainwindow.h"
 #include "utils/Icons.h"
 
 NodeWidget::NodeWidget(QWidget *parent)

diff --git a/src/widgets/nodewidget.h b/src/widgets/NodeWidget.h
similarity index 96%
rename from src/widgets/nodewidget.h
rename to src/widgets/NodeWidget.h
index 348bac4305ba9ceafec1ebe871dc85e208d55f44..0d3a78116b6f168827f0d12fbfcb773b0955dc9e 100644 (file)
--- a/src/widgets/nodewidget.h
+++ b/src/widgets/NodeWidget.h
@@ -4,9 +4,10 @@
 #ifndef FEATHER_NODEWIDGET_H
 #define FEATHER_NODEWIDGET_H
 
-#include <QWidget>
-#include <QTreeView>
 #include <QItemSelection>
+#include <QTreeView>
+#include <QWidget>
+
 #include "appcontext.h"
 #include "model/NodeModel.h"
 #include "utils/nodes.h"
@@ -44,10 +45,13 @@ signals:
     void nodeSourceChanged(NodeSource nodeSource);
 
 private:
+    void showContextMenu(const QPoint &pos, const FeatherNode &node);
+    FeatherNode selectedNode();
+
     QScopedPointer<Ui::NodeWidget> ui;
     QSharedPointer<AppContext> m_ctx;
-    NodeModel* m_customModel;
-    NodeModel* m_wsModel;
+    NodeModel  *m_customModel;
+    NodeModel *m_wsModel;
 
     QTreeView *m_activeView;
 
@@ -55,9 +59,6 @@ private:
     QAction *m_contextActionRemove;
     QAction *m_contextActionOpenStatusURL;
     QAction *m_contextActionCopy;
-
-    void showContextMenu(const QPoint &pos, const FeatherNode &node);
-    FeatherNode selectedNode();
 };
 
 #endif // FEATHER_NODEWIDGET_H

diff --git a/src/widgets/nodewidget.ui b/src/widgets/NodeWidget.ui
similarity index 100%
rename from src/widgets/nodewidget.ui
rename to src/widgets/NodeWidget.ui

diff --git a/src/widgets/PayToEdit.cpp b/src/widgets/PayToEdit.cpp
index f19a6e36d88da92261de2b909b1df1cbe99b4d9d..a63f41dc9603a6002bae35ceba61551967fcee2f 100644 (file)
--- a/src/widgets/PayToEdit.cpp
+++ b/src/widgets/PayToEdit.cpp
@@ -7,10 +7,8 @@
 #include <QtGlobal>
 #include <QScrollBar>
 
-#include "utils/utils.h"
-#include "model/ModelUtils.h"
-
 #include "libwalletqt/WalletManager.h"
+#include "model/ModelUtils.h"
 
 PayToEdit::PayToEdit(QWidget *parent) : QPlainTextEdit(parent)
 {

diff --git a/src/widgets/redditwidget.cpp b/src/widgets/RedditWidget.cpp
similarity index 90%
rename from src/widgets/redditwidget.cpp
rename to src/widgets/RedditWidget.cpp
index c0e1411819c1e289c35aa01d4f3cc287949104de..cbdcc3dbc0d91780693672f1f75401047aa50f70 100644 (file)
--- a/src/widgets/redditwidget.cpp
+++ b/src/widgets/RedditWidget.cpp
@@ -1,21 +1,22 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "RedditWidget.h"
+#include "ui_RedditWidget.h"
+
+#include <QDesktopServices>
 #include <QStandardItemModel>
 #include <QTableWidget>
-#include <QDesktopServices>
 
 #include "model/RedditModel.h"
-#include "redditwidget.h"
-#include "ui_redditwidget.h"
 #include "utils/utils.h"
 #include "utils/config.h"
 
-RedditWidget::RedditWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::RedditWidget),
-    m_model(new RedditModel(this)),
-    m_contextMenu(new QMenu(this))
+RedditWidget::RedditWidget(QWidget *parent)
+        : QWidget(parent)
+        , ui(new Ui::RedditWidget)
+        , m_model(new RedditModel(this))
+        , m_contextMenu(new QMenu(this))
 {
     ui->setupUi(this);
     ui->tableView->setModel(m_model);

diff --git a/src/widgets/redditwidget.h b/src/widgets/RedditWidget.h
similarity index 100%
rename from src/widgets/redditwidget.h
rename to src/widgets/RedditWidget.h
index 38603558d915ea2810de8c166bf0474a0e06e656..0fdfdf93a93eff5fdd48852ddb525eab71338197 100644 (file)
--- a/src/widgets/redditwidget.h
+++ b/src/widgets/RedditWidget.h
@@ -4,9 +4,9 @@
 #ifndef FEATHER_REDDITWIDGET_H
 #define FEATHER_REDDITWIDGET_H
 
+#include <QItemSelection>
 #include <QMenu>
 #include <QWidget>
-#include <QItemSelection>
 
 #include "model/RedditModel.h"
 

diff --git a/src/widgets/redditwidget.ui b/src/widgets/RedditWidget.ui
similarity index 100%
rename from src/widgets/redditwidget.ui
rename to src/widgets/RedditWidget.ui

diff --git a/src/widgets/RestoreHeightWidget.cpp b/src/widgets/RestoreHeightWidget.cpp
index eb70052ae09942ebdbc5b1dfe4b080fd079ef14d..0edb09e2dfc9259e2a3b34b50a61a33fabce4c38 100644 (file)
--- a/src/widgets/RestoreHeightWidget.cpp
+++ b/src/widgets/RestoreHeightWidget.cpp
@@ -10,8 +10,8 @@
 #include "constants.h"
 
 RestoreHeightWidget::RestoreHeightWidget(QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::RestoreHeightWidget)
+        : QWidget(parent)
+        , ui(new Ui::RestoreHeightWidget)
 {
     ui->setupUi(this);
 

diff --git a/src/widgets/TickerWidget.cpp b/src/widgets/TickerWidget.cpp
index a8f656c950799e0c102dd0d62fa07d1fbcd633e4..ec9984087dfa2cbb7498a0cf7e924d3ad2e7d9c6 100644 (file)
--- a/src/widgets/TickerWidget.cpp
+++ b/src/widgets/TickerWidget.cpp
@@ -8,9 +8,9 @@
 #include "utils/AppData.h"
 
 TickerWidgetBase::TickerWidgetBase(QWidget *parent, QSharedPointer<AppContext> ctx)
-    : QWidget(parent)
-    , ui(new Ui::TickerWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::TickerWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 
@@ -50,8 +50,8 @@ void TickerWidgetBase::setFiatText(double amount, const QString &fiatCurrency) {
 
 // BalanceTickerWidget
 BalanceTickerWidget::BalanceTickerWidget(QWidget *parent, QSharedPointer<AppContext> ctx, bool totalBalance)
-    : TickerWidgetBase(parent, std::move(ctx))
-    , m_totalBalance(totalBalance)
+        : TickerWidgetBase(parent, std::move(ctx))
+        , m_totalBalance(totalBalance)
 {
     if (totalBalance)
         this->setTitle("Total balance");
@@ -76,8 +76,8 @@ void BalanceTickerWidget::updateDisplay() {
 
 // PriceTickerWidget
 PriceTickerWidget::PriceTickerWidget(QWidget *parent, QSharedPointer<AppContext> ctx, QString symbol)
-    : TickerWidgetBase(parent, std::move(ctx))
-    , m_symbol(std::move(symbol))
+        : TickerWidgetBase(parent, std::move(ctx))
+        , m_symbol(std::move(symbol))
 {
     this->setTitle(m_symbol);
 

diff --git a/src/widgets/xmrigwidget.cpp b/src/widgets/XMRigWidget.cpp
similarity index 97%
rename from src/widgets/xmrigwidget.cpp
rename to src/widgets/XMRigWidget.cpp
index c67556dfae280e3a7cd50ff68600169c80ba38ef..87be728d18610908aa07ba3390a774f4f37d716f 100644 (file)
--- a/src/widgets/xmrigwidget.cpp
+++ b/src/widgets/XMRigWidget.cpp
@@ -1,24 +1,25 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include <QStandardItemModel>
-#include <QTableWidget>
-#include <QMessageBox>
+#include "XMRigWidget.h"
+#include "ui_XMRigWidget.h"
+
 #include <QDesktopServices>
-#include <QScrollBar>
 #include <QFileDialog>
+#include <QMessageBox>
+#include <QScrollBar>
+#include <QStandardItemModel>
+#include <QTableWidget>
 
-#include "xmrigwidget.h"
-#include "ui_xmrigwidget.h"
 #include "utils/Icons.h"
 
 XMRigWidget::XMRigWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::XMRigWidget)
-    , m_ctx(std::move(ctx))
-    , m_XMRig(new XmRig(Config::defaultConfigDir().path()))
-    , m_model(new QStandardItemModel(this))
-    , m_contextMenu(new QMenu(this))
+        : QWidget(parent)
+        , ui(new Ui::XMRigWidget)
+        , m_ctx(std::move(ctx))
+        , m_XMRig(new XmRig(Config::defaultConfigDir().path()))
+        , m_model(new QStandardItemModel(this))
+        , m_contextMenu(new QMenu(this))
 {
     ui->setupUi(this);
 

diff --git a/src/widgets/xmrigwidget.h b/src/widgets/XMRigWidget.h
similarity index 100%
rename from src/widgets/xmrigwidget.h
rename to src/widgets/XMRigWidget.h
index 7cb35193cf56a4950982a141335a8e5ba7e19271..e91e50a1d83b7e9aada00d99d62dac8d5869d065 100644 (file)
--- a/src/widgets/xmrigwidget.h
+++ b/src/widgets/XMRigWidget.h
@@ -8,9 +8,9 @@
 #include <QWidget>
 #include <QItemSelection>
 
+#include "appcontext.h"
 #include "utils/xmrig.h"
 #include "utils/config.h"
-#include "appcontext.h"
 
 namespace Ui {
     class XMRigWidget;

diff --git a/src/widgets/xmrigwidget.ui b/src/widgets/XMRigWidget.ui
similarity index 100%
rename from src/widgets/xmrigwidget.ui
rename to src/widgets/XMRigWidget.ui