Widgets: cleanup

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/CCSWidget.h"
-#include "widgets/redditwidget.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 {

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;

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;

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>

src/widgets/CCSProgressDelegate.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "ccsprogressdelegate.h"
+#include "CCSProgressDelegate.h"
 
 #include <QApplication>
 

src/widgets/CCSProgressDelegate.h

@@ -5,6 +5,7 @@
 #define FEATHER_CSSPROGRESSDELEGATE_H
 
 #include <QStyledItemDelegate>
+
 #include "model/CCSModel.h"
 
 class CCSProgressDelegate : public QStyledItemDelegate

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 "CCSProgressDelegate.h"
-#include "ui_ccswidget.h"
-#include "ccsprogressdelegate.h"
 
-CCSWidget::CCSWidget(QWidget *parent) :
+CCSWidget::CCSWidget(QWidget *parent)
-        QWidget(parent),
+        : QWidget(parent)
-        ui(new Ui::CSSWidget),
+        , ui(new Ui::CSSWidget)
-        m_model(new CCSModel(this)),
+        , m_model(new CCSModel(this))
-        m_contextMenu(new QMenu(this))
+        , m_contextMenu(new QMenu(this))
 {
     ui->setupUi(this);
     auto progressDelegate = new CCSProgressDelegate(m_model, this);

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;

src/widgets/LocalMoneroWidget.cpp

@@ -3,14 +3,15 @@
 
 #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)

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 {

src/widgets/NodeWidget.cpp

@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include <QInputDialog>
+#include "NodeWidget.h"
-#include <QTableWidget>
+#include "ui_NodeWidget.h"
-#include <QMessageBox>
+
+#include <QAction>
 #include <QDesktopServices>
+#include <QInputDialog>
+#include <QMenu>
+#include <QMessageBox>
+#include <QTableWidget>
 
 #include "model/NodeModel.h"
-#include "nodewidget.h"
-#include "ui_nodewidget.h"
-#include "mainwindow.h"
 #include "utils/Icons.h"
 
 NodeWidget::NodeWidget(QWidget *parent)

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,6 +45,9 @@ 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;
@@ -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

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)
 {

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) :
+RedditWidget::RedditWidget(QWidget *parent)
-    QWidget(parent),
+        : QWidget(parent)
-    ui(new Ui::RedditWidget),
+        , ui(new Ui::RedditWidget)
-    m_model(new RedditModel(this)),
+        , m_model(new RedditModel(this))
-    m_contextMenu(new QMenu(this))
+        , m_contextMenu(new QMenu(this))
 {
     ui->setupUi(this);
     ui->tableView->setModel(m_model);

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"
 

src/widgets/XMRigWidget.cpp

@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "XMRigWidget.h"
+#include "ui_XMRigWidget.h"
+
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QScrollBar>
 #include <QStandardItemModel>
 #include <QTableWidget>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QScrollBar>
-#include <QFileDialog>
 
-#include "xmrigwidget.h"
-#include "ui_xmrigwidget.h"
 #include "utils/Icons.h"
 
 XMRigWidget::XMRigWidget(QSharedPointer<AppContext> ctx, QWidget *parent)

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;