Skip to content

Commit

Permalink
Refactor: Sanitize settings ui forms
Browse files Browse the repository at this point in the history
Remove the 'settings' prefix from settings ui forms as it is redundant.
  • Loading branch information
Fuzzbawls committed Jan 14, 2025
1 parent 0223281 commit 25bad3f
Show file tree
Hide file tree
Showing 24 changed files with 34 additions and 25 deletions.
22 changes: 11 additions & 11 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
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/backupwallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#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
3 changes: 2 additions & 1 deletion src/qt/pivx/settings/bittoolwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

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

#include "qt/pivx/qtutils.h"
#include "qt/pivx/settings/forms/ui_settingsbittoolwidget.h"

#include "guiutil.h"
#include "walletmodel.h"
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/consolewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

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

#include "qt/pivx/qtutils.h"
#include "qt/rpcexecutor.h"
Expand Down
4 changes: 3 additions & 1 deletion src/qt/pivx/settings/displayoptionswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#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 "qt/pivx/qtutils.h"
#include "qt/pivx/settings/forms/ui_settingsdisplayoptionswidget.h"

#include <QDir>
#include <QListView>
#include <QSettings>
Expand Down
4 changes: 3 additions & 1 deletion src/qt/pivx/settings/exportcsv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#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 "qt/pivx/settings/forms/ui_settingsexportcsv.h"

#include <QFile>

SettingsExportCSV::SettingsExportCSV(PIVXGUI* _window, QWidget *parent) :
Expand Down
5 changes: 3 additions & 2 deletions src/qt/pivx/settings/faqwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
#include "config/pivx-config.h"
#endif

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

#include "qt/pivx/mnmodel.h"
#include "qt/pivx/qtutils.h"
#include "qt/pivx/settings/faqwidget.h"
#include "qt/pivx/settings/forms/ui_settingsfaqwidget.h"

#include <QScrollBar>
#include <QMetaObject>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/informationwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// file COPYING or https://www.opensource.org/licenses/mit-license.php.

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

#include "clientmodel.h"
#include "chainparams.h"
Expand Down
3 changes: 1 addition & 2 deletions src/qt/pivx/settings/mainoptionswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/mainoptionswidget.h"
#include "QListView"
#include "qt/pivx/settings/forms/ui_settingsmainoptionswidget.h"
#include "qt/pivx/settings/forms/ui_mainoptionswidget.h"

#if defined(HAVE_CONFIG_H)
#include "config/pivx-config.h"
Expand Down
3 changes: 2 additions & 1 deletion src/qt/pivx/settings/networkwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/networkwidget.h"
#include "qt/pivx/settings/forms/ui_networkwidget.h"

#include "optionsmodel.h"
#include "qt/pivx/qtutils.h"
#include "qt/pivx/settings/forms/ui_settingsnetworkwidget.h"

SettingsNetworkWidget::SettingsNetworkWidget(PIVXGUI* _window, QWidget *parent) :
PWidget(_window, parent),
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/signmessagewidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/signmessagewidgets.h"
#include "qt/pivx/settings/forms/ui_signmessagewidgets.h"

#include "key_io.h"
#include "messagesigner.h"
#include "qt/askpassphrasedialog.h"
#include "qt/pivx/settings/forms/ui_settingssignmessagewidgets.h"
#include "qt/pivx/qtutils.h"
#include "qt/walletmodel.h"
#include "util/validation.h"
Expand Down
4 changes: 3 additions & 1 deletion src/qt/pivx/settings/walletoptionswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/walletoptionswidget.h"
#include "qt/pivx/settings/forms/ui_walletoptionswidget.h"

#include "clientmodel.h"
#include "optionsmodel.h"
#include "qt/pivx/qtutils.h"
#include "qt/pivx/settings/forms/ui_settingswalletoptionswidget.h"

#include <QListView>

SettingsWalletOptionsWidget::SettingsWalletOptionsWidget(PIVXGUI* _window, QWidget *parent) :
Expand Down
3 changes: 2 additions & 1 deletion src/qt/pivx/settings/walletrepairwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include "qt/pivx/settings/walletrepairwidget.h"
#include "qt/pivx/settings/forms/ui_walletrepairwidget.h"

#include "qt/pivx/qtutils.h"
#include "qt/pivx/settings/forms/ui_settingswalletrepairwidget.h"

SettingsWalletRepairWidget::SettingsWalletRepairWidget(PIVXGUI* _window, QWidget *parent) :
PWidget(_window, parent),
Expand Down

0 comments on commit 25bad3f

Please sign in to comment.