Skip to content

Commit

Permalink
Merge #2957: [Refactor] Remove 'settings' prefix from GUI settings fi…
Browse files Browse the repository at this point in the history
…le names

25bad3f Refactor: Sanitize settings ui forms (Fuzzbawls)
0223281 Refactor: Sanitize settings source files (Fuzzbawls)

Pull request description:

  Followup to #2936 that strips the `settings` filename prefix from GUI settings source files.

  This cleans the header include gards to be more readable. The one exception is `settingswidget` as that is aptly descriptive as-is.

ACKs for top commit: 25bad3f
  Duddino:
    utACK 25bad3f
  Liquid369:
    ACK 25bad3f

Tree-SHA512: a2a56bb5c15f0952b4f50f36520a96b5d17b18a1709c372f12b990ac721bfbe0a17892d9598eb7da88250237a284df345588f0eb3dd4b34dc8e81c3564dc37be
  • Loading branch information
Fuzzbawls committed Jan 21, 2025
2 parents f71ebf8 + 25bad3f commit bd0f25c
Show file tree
Hide file tree
Showing 39 changed files with 152 additions and 142 deletions.
88 changes: 44 additions & 44 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ QT_FORMS_UI = \
qt/pivx/forms/createproposaldialog.ui \
qt/pivx/forms/proposalinfodialog.ui \
qt/pivx/forms/governancewidget.ui \
qt/pivx/settings/forms/settingsbackupwallet.ui \
qt/pivx/settings/forms/settingsexportcsv.ui \
qt/pivx/settings/forms/settingsbittoolwidget.ui \
qt/pivx/settings/forms/settingsconsolewidget.ui \
qt/pivx/settings/forms/settingsdisplayoptionswidget.ui \
qt/pivx/settings/forms/settingsfaqwidget.ui \
qt/pivx/settings/forms/settingsinformationwidget.ui \
qt/pivx/settings/forms/settingsmainoptionswidget.ui \
qt/pivx/settings/forms/settingssignmessagewidgets.ui \
qt/pivx/settings/forms/settingswalletoptionswidget.ui \
qt/pivx/settings/forms/settingswalletrepairwidget.ui \
qt/pivx/settings/forms/backupwallet.ui \
qt/pivx/settings/forms/exportcsv.ui \
qt/pivx/settings/forms/bittoolwidget.ui \
qt/pivx/settings/forms/consolewidget.ui \
qt/pivx/settings/forms/displayoptionswidget.ui \
qt/pivx/settings/forms/faqwidget.ui \
qt/pivx/settings/forms/informationwidget.ui \
qt/pivx/settings/forms/mainoptionswidget.ui \
qt/pivx/settings/forms/signmessagewidgets.ui \
qt/pivx/settings/forms/walletoptionswidget.ui \
qt/pivx/settings/forms/walletrepairwidget.ui \
qt/pivx/settings/forms/settingswidget.ui \
qt/pivx/forms/welcomecontentwidget.ui \
qt/pivx/forms/splash.ui
Expand Down Expand Up @@ -143,17 +143,17 @@ QT_MOC_CPP = \
qt/pivx/moc_createproposaldialog.cpp \
qt/pivx/moc_proposalinfodialog.cpp \
qt/pivx/moc_governancewidget.cpp \
qt/pivx/settings/moc_settingsbackupwallet.cpp \
qt/pivx/settings/moc_settingsexportcsv.cpp \
qt/pivx/settings/moc_settingsbittoolwidget.cpp \
qt/pivx/settings/moc_settingsconsolewidget.cpp \
qt/pivx/settings/moc_settingsdisplayoptionswidget.cpp \
qt/pivx/settings/moc_settingsfaqwidget.cpp \
qt/pivx/settings/moc_settingsinformationwidget.cpp \
qt/pivx/settings/moc_settingsmainoptionswidget.cpp \
qt/pivx/settings/moc_settingssignmessagewidgets.cpp \
qt/pivx/settings/moc_settingswalletoptionswidget.cpp \
qt/pivx/settings/moc_settingswalletrepairwidget.cpp \
qt/pivx/settings/moc_backupwallet.cpp \
qt/pivx/settings/moc_exportcsv.cpp \
qt/pivx/settings/moc_bittoolwidget.cpp \
qt/pivx/settings/moc_consolewidget.cpp \
qt/pivx/settings/moc_displayoptionswidget.cpp \
qt/pivx/settings/moc_faqwidget.cpp \
qt/pivx/settings/moc_informationwidget.cpp \
qt/pivx/settings/moc_mainoptionswidget.cpp \
qt/pivx/settings/moc_signmessagewidgets.cpp \
qt/pivx/settings/moc_walletoptionswidget.cpp \
qt/pivx/settings/moc_walletrepairwidget.cpp \
qt/pivx/settings/moc_settingswidget.cpp \
qt/pivx/moc_welcomecontentwidget.cpp \
qt/pivx/moc_splash.cpp
Expand Down Expand Up @@ -259,17 +259,17 @@ BITCOIN_QT_H = \
qt/pivx/createproposaldialog.h \
qt/pivx/proposalinfodialog.h \
qt/pivx/governancewidget.h \
qt/pivx/settings/settingsbackupwallet.h \
qt/pivx/settings/settingsexportcsv.h \
qt/pivx/settings/settingsbittoolwidget.h \
qt/pivx/settings/settingsconsolewidget.h \
qt/pivx/settings/settingsdisplayoptionswidget.h \
qt/pivx/settings/settingsfaqwidget.h \
qt/pivx/settings/settingsinformationwidget.h \
qt/pivx/settings/settingsmainoptionswidget.h \
qt/pivx/settings/settingssignmessagewidgets.h \
qt/pivx/settings/settingswalletoptionswidget.h \
qt/pivx/settings/settingswalletrepairwidget.h \
qt/pivx/settings/backupwallet.h \
qt/pivx/settings/exportcsv.h \
qt/pivx/settings/bittoolwidget.h \
qt/pivx/settings/consolewidget.h \
qt/pivx/settings/displayoptionswidget.h \
qt/pivx/settings/faqwidget.h \
qt/pivx/settings/informationwidget.h \
qt/pivx/settings/mainoptionswidget.h \
qt/pivx/settings/signmessagewidgets.h \
qt/pivx/settings/walletoptionswidget.h \
qt/pivx/settings/walletrepairwidget.h \
qt/pivx/settings/settingswidget.h \
qt/pivx/welcomecontentwidget.h \
qt/pivx/splash.h
Expand Down Expand Up @@ -598,17 +598,17 @@ BITCOIN_QT_WALLET_CPP = \
qt/pivx/createproposaldialog.cpp \
qt/pivx/proposalinfodialog.cpp \
qt/pivx/governancewidget.cpp \
qt/pivx/settings/settingsbackupwallet.cpp \
qt/pivx/settings/settingsexportcsv.cpp \
qt/pivx/settings/settingsbittoolwidget.cpp \
qt/pivx/settings/settingsconsolewidget.cpp \
qt/pivx/settings/settingsdisplayoptionswidget.cpp \
qt/pivx/settings/settingsfaqwidget.cpp \
qt/pivx/settings/settingsinformationwidget.cpp \
qt/pivx/settings/settingsmainoptionswidget.cpp \
qt/pivx/settings/settingssignmessagewidgets.cpp \
qt/pivx/settings/settingswalletoptionswidget.cpp \
qt/pivx/settings/settingswalletrepairwidget.cpp \
qt/pivx/settings/backupwallet.cpp \
qt/pivx/settings/exportcsv.cpp \
qt/pivx/settings/bittoolwidget.cpp \
qt/pivx/settings/consolewidget.cpp \
qt/pivx/settings/displayoptionswidget.cpp \
qt/pivx/settings/faqwidget.cpp \
qt/pivx/settings/informationwidget.cpp \
qt/pivx/settings/mainoptionswidget.cpp \
qt/pivx/settings/signmessagewidgets.cpp \
qt/pivx/settings/walletoptionswidget.cpp \
qt/pivx/settings/walletrepairwidget.cpp \
qt/pivx/settings/settingswidget.cpp \
qt/pivx/welcomecontentwidget.cpp \
qt/pivx/splash.cpp
Expand Down
22 changes: 11 additions & 11 deletions src/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@ SET(QT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/pivx/createproposaldialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalinfodialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancewidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbackupwallet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbittoolwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsconsolewidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsdisplayoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsfaqwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsinformationwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsmainoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingssignmessagewidgets.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswalletoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswalletrepairwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsexportcsv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/backupwallet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/bittoolwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/consolewidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/displayoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/faqwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/informationwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/mainoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/signmessagewidgets.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletoptionswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletrepairwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/exportcsv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/welcomecontentwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/splash.cpp
Expand Down
14 changes: 7 additions & 7 deletions src/qt/pivx/pivxgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
#include <QSystemTrayIcon>
#include <QLabel>

#include "qt/pivx/navmenuwidget.h"
#include "qt/pivx/topbar.h"
#include "qt/pivx/dashboardwidget.h"
#include "qt/pivx/send.h"
#include "qt/pivx/receivewidget.h"
#include "qt/pivx/addresseswidget.h"
#include "qt/pivx/coldstakingwidget.h"
#include "qt/pivx/dashboardwidget.h"
#include "qt/pivx/governancewidget.h"
#include "qt/pivx/masternodeswidget.h"
#include "qt/pivx/snackbar.h"
#include "qt/pivx/navmenuwidget.h"
#include "qt/pivx/receivewidget.h"
#include "qt/pivx/send.h"
#include "qt/pivx/settings/faqwidget.h"
#include "qt/pivx/settings/settingswidget.h"
#include "qt/pivx/settings/settingsfaqwidget.h"
#include "qt/pivx/snackbar.h"
#include "qt/pivx/topbar.h"
#include "qt/rpcconsole.h"

namespace interfaces {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsbackupwallet.h"
#include "qt/pivx/settings/backupwallet.h"

#include "qt/pivx/settings/forms/ui_settingsbackupwallet.h"
#include "qt/pivx/settings/forms/ui_backupwallet.h"

#include "guiinterface.h"
#include "guiutil.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
#ifndef PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H
#define PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H

#include <QWidget>
#include "qt/pivx/pwidget.h"
Expand All @@ -28,4 +28,4 @@ private Q_SLOTS:
Ui::SettingsBackupWallet *ui;
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
#endif // PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsbittoolwidget.h"
#include "qt/pivx/settings/forms/ui_settingsbittoolwidget.h"
#include "qt/pivx/settings/bittoolwidget.h"
#include "qt/pivx/settings/forms/ui_bittoolwidget.h"

#include "qt/pivx/qtutils.h"

#include "guiutil.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
#ifndef PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H

#include <QWidget>
#include "qt/pivx/pwidget.h"
Expand Down Expand Up @@ -44,4 +44,4 @@ public Q_SLOTS:
void resizeMenu();
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
#endif // PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsconsolewidget.h"
#include "qt/pivx/settings/forms/ui_settingsconsolewidget.h"
#include "qt/pivx/settings/consolewidget.h"
#include "qt/pivx/settings/forms/ui_consolewidget.h"

#include "qt/pivx/qtutils.h"
#include "qt/rpcexecutor.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
#ifndef PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H

#include <QWidget>
#include "qt/pivx/pwidget.h"
Expand Down Expand Up @@ -71,4 +71,4 @@ private Q_SLOTS:

};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
#endif // PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsdisplayoptionswidget.h"
#include "qt/pivx/settings/forms/ui_settingsdisplayoptionswidget.h"
#include <QListView>
#include <QSettings>
#include <QDir>
#include "guiutil.h"
#include "qt/pivx/settings/displayoptionswidget.h"
#include "qt/pivx/settings/forms/ui_displayoptionswidget.h"

#include "bitcoinunits.h"
#include "clientmodel.h"
#include "guiutil.h"
#include "optionsmodel.h"
#include "bitcoinunits.h"
#include "qt/pivx/qtutils.h"

#include <QDir>
#include <QListView>
#include <QSettings>

SettingsDisplayOptionsWidget::SettingsDisplayOptionsWidget(PIVXGUI* _window, QWidget *parent) :
PWidget(_window,parent),
ui(new Ui::SettingsDisplayOptionsWidget)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
#ifndef PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H

#include <QWidget>
#include <QDataWidgetMapper>
Expand Down Expand Up @@ -36,4 +36,4 @@ public Q_SLOTS:
Ui::SettingsDisplayOptionsWidget *ui;
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
#endif // PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsexportcsv.h"
#include "qt/pivx/settings/forms/ui_settingsexportcsv.h"
#include <QFile>
#include "qt/pivx/settings/exportcsv.h"
#include "qt/pivx/settings/forms/ui_exportcsv.h"

#include "csvmodelwriter.h"
#include "guiinterface.h"
#include "guiutil.h"
#include "optionsmodel.h"
#include "qt/pivx/qtutils.h"
#include "guiinterface.h"

#include <QFile>

SettingsExportCSV::SettingsExportCSV(PIVXGUI* _window, QWidget *parent) :
PWidget(_window, parent),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
#ifndef PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H
#define PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H

#include <QWidget>
#include "qt/pivx/pwidget.h"
Expand Down Expand Up @@ -33,4 +33,4 @@ private Q_SLOTS:
QSortFilterProxyModel* addressFilter{nullptr};
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
#endif // PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
#include "config/pivx-config.h"
#endif

#include "qt/pivx/settings/settingsfaqwidget.h"
#include "qt/pivx/settings/forms/ui_settingsfaqwidget.h"
#include "qt/pivx/settings/faqwidget.h"
#include "qt/pivx/settings/forms/ui_faqwidget.h"

#include "qt/pivx/mnmodel.h"
#include "qt/pivx/qtutils.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
#ifndef PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H

#include <QDialog>

Expand Down Expand Up @@ -70,4 +70,4 @@ private Q_SLOTS:
}
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
#endif // PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or https://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/settingsinformationwidget.h"
#include "qt/pivx/settings/forms/ui_settingsinformationwidget.h"
#include "qt/pivx/settings/informationwidget.h"
#include "qt/pivx/settings/forms/ui_informationwidget.h"

#include "clientmodel.h"
#include "chainparams.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
#ifndef PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H
#define PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H

#include <QWidget>
#include "qt/pivx/pwidget.h"
Expand Down Expand Up @@ -45,4 +45,4 @@ public Q_SLOTS:
void updateNetworkState(int numConnections);
};

#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
#endif // PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H
Loading

0 comments on commit bd0f25c

Please sign in to comment.