Skip to content

Commit b7f6a89

Browse files
committed
Merge #686: clang-tidy: Force checks for headers in src/qt
7b7cd11 clang-tidy, qt: Force checks for headers in `src/qt` (Hennadii Stepanov) 69eacf2 clang-tidy, qt: Fix `modernize-use-default-member-init` in headers (Hennadii Stepanov) Pull request description: This PR split from bitcoin/bitcoin#26705 and contains only changes in `src/qt`. Effectively, it fixes the clang-tidy's `modernize-use-default-member-init` errors, and forces clang-tidy checks for all headers in the `src/qt` directory. ACKs for top commit: jarolrod: ACK 7b7cd11 Tree-SHA512: 79525bb0f31ae7cad88c781e55091a21467c0485ddc1ed03ad62e051480fda3b3710619ea11af480437edba3c6e038f7c40edc6b373e3a37408c006d11b34686
2 parents 10a5f19 + 7b7cd11 commit b7f6a89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+109
-167
lines changed

src/.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ readability-redundant-string-init,
2828
CheckOptions:
2929
- key: performance-move-const-arg.CheckTriviallyCopyableMove
3030
value: false
31+
HeaderFilterRegex: './qt'

src/qt/addressbookpage.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
6464
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
6565
QDialog(parent, GUIUtil::dialog_flags),
6666
ui(new Ui::AddressBookPage),
67-
model(nullptr),
6867
mode(_mode),
6968
tab(_tab)
7069
{

src/qt/addressbookpage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public Q_SLOTS:
4949

5050
private:
5151
Ui::AddressBookPage *ui;
52-
AddressTableModel *model;
52+
AddressTableModel* model{nullptr};
5353
Mode mode;
5454
Tabs tab;
5555
QString returnValue;

src/qt/askpassphrasedialog.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureStri
2323
QDialog(parent, GUIUtil::dialog_flags),
2424
ui(new Ui::AskPassphraseDialog),
2525
mode(_mode),
26-
model(nullptr),
27-
fCapsLock(false),
2826
m_passphrase_out(passphrase_out)
2927
{
3028
ui->setupUi(this);

src/qt/askpassphrasedialog.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class AskPassphraseDialog : public QDialog
3838
private:
3939
Ui::AskPassphraseDialog *ui;
4040
Mode mode;
41-
WalletModel *model;
42-
bool fCapsLock;
41+
WalletModel* model{nullptr};
42+
bool fCapsLock{false};
4343
SecureString* m_passphrase_out;
4444

4545
private Q_SLOTS:

src/qt/bitcoin.cpp

+2-8
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,8 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
228228
static int qt_argc = 1;
229229
static const char* qt_argv = "bitcoin-qt";
230230

231-
BitcoinApplication::BitcoinApplication():
232-
QApplication(qt_argc, const_cast<char **>(&qt_argv)),
233-
optionsModel(nullptr),
234-
clientModel(nullptr),
235-
window(nullptr),
236-
pollShutdownTimer(nullptr),
237-
returnValue(0),
238-
platformStyle(nullptr)
231+
BitcoinApplication::BitcoinApplication()
232+
: QApplication(qt_argc, const_cast<char**>(&qt_argv))
239233
{
240234
// Qt runs setlocale(LC_ALL, "") on initialization.
241235
RegisterMetaTypes();

src/qt/bitcoin.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ public Q_SLOTS:
9696

9797
private:
9898
std::optional<InitExecutor> m_executor;
99-
OptionsModel *optionsModel;
100-
ClientModel *clientModel;
101-
BitcoinGUI *window;
102-
QTimer *pollShutdownTimer;
99+
OptionsModel* optionsModel{nullptr};
100+
ClientModel* clientModel{nullptr};
101+
BitcoinGUI* window{nullptr};
102+
QTimer* pollShutdownTimer{nullptr};
103103
#ifdef ENABLE_WALLET
104104
PaymentServer* paymentServer{nullptr};
105105
WalletController* m_wallet_controller{nullptr};
106106
#endif
107-
int returnValue;
108-
const PlatformStyle *platformStyle;
107+
int returnValue{0};
108+
const PlatformStyle* platformStyle{nullptr};
109109
std::unique_ptr<QWidget> shutdownWindow;
110110
SplashScreen* m_splash = nullptr;
111111
std::unique_ptr<interfaces::Node> m_node;

src/qt/bitcoinamountfield.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,8 @@ class AmountSpinBox: public QAbstractSpinBox
217217

218218
#include <qt/bitcoinamountfield.moc>
219219

220-
BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
221-
QWidget(parent),
222-
amount(nullptr)
220+
BitcoinAmountField::BitcoinAmountField(QWidget* parent)
221+
: QWidget(parent)
223222
{
224223
amount = new AmountSpinBox(this);
225224
amount->setLocale(QLocale::c());

src/qt/bitcoinamountfield.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class BitcoinAmountField: public QWidget
7474
bool eventFilter(QObject *object, QEvent *event) override;
7575

7676
private:
77-
AmountSpinBox *amount;
77+
AmountSpinBox* amount{nullptr};
7878
QValueComboBox *unit;
7979

8080
private Q_SLOTS:

src/qt/bitcoingui.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1541,10 +1541,8 @@ bool BitcoinGUI::isPrivacyModeActivated() const
15411541
return m_mask_values_action->isChecked();
15421542
}
15431543

1544-
UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *platformStyle)
1545-
: optionsModel(nullptr),
1546-
menu(nullptr),
1547-
m_platform_style{platformStyle}
1544+
UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle* platformStyle)
1545+
: m_platform_style{platformStyle}
15481546
{
15491547
createContextMenu();
15501548
setToolTip(tr("Unit to show amounts in. Click to select another unit."));

src/qt/bitcoingui.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ class UnitDisplayStatusBarControl : public QLabel
333333
void changeEvent(QEvent* e) override;
334334

335335
private:
336-
OptionsModel *optionsModel;
337-
QMenu* menu;
336+
OptionsModel* optionsModel{nullptr};
337+
QMenu* menu{nullptr};
338338
const PlatformStyle* m_platform_style;
339339

340340
/** Shows context menu with Display Unit options by the mouse coordinates */

src/qt/clientmodel.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ ClientModel::ClientModel(interfaces::Node& node, OptionsModel *_optionsModel, QO
3434
QObject(parent),
3535
m_node(node),
3636
optionsModel(_optionsModel),
37-
peerTableModel(nullptr),
38-
banTableModel(nullptr),
3937
m_thread(new QThread(this))
4038
{
4139
cachedBestHeaderHeight = -1;

src/qt/clientmodel.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class ClientModel : public QObject
104104
std::unique_ptr<interfaces::Handler> m_handler_notify_block_tip;
105105
std::unique_ptr<interfaces::Handler> m_handler_notify_header_tip;
106106
OptionsModel *optionsModel;
107-
PeerTableModel *peerTableModel;
107+
PeerTableModel* peerTableModel{nullptr};
108108
PeerTableSortProxy* m_peer_table_sort_proxy{nullptr};
109-
BanTableModel *banTableModel;
109+
BanTableModel* banTableModel{nullptr};
110110

111111
//! A thread to interact with m_node asynchronously
112112
QThread* const m_thread;

src/qt/csvmodelwriter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <QFile>
99
#include <QTextStream>
1010

11-
CSVModelWriter::CSVModelWriter(const QString &_filename, QObject *parent) :
12-
QObject(parent),
13-
filename(_filename), model(nullptr)
11+
CSVModelWriter::CSVModelWriter(const QString& _filename, QObject* parent)
12+
: QObject(parent),
13+
filename(_filename)
1414
{
1515
}
1616

src/qt/csvmodelwriter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CSVModelWriter : public QObject
3232

3333
private:
3434
QString filename;
35-
const QAbstractItemModel *model;
35+
const QAbstractItemModel* model{nullptr};
3636

3737
struct Column
3838
{

src/qt/editaddressdialog.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
#include <QMessageBox>
1313

1414

15-
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
16-
QDialog(parent, GUIUtil::dialog_flags),
17-
ui(new Ui::EditAddressDialog),
18-
mapper(nullptr),
19-
mode(_mode),
20-
model(nullptr)
15+
EditAddressDialog::EditAddressDialog(Mode _mode, QWidget* parent)
16+
: QDialog(parent, GUIUtil::dialog_flags),
17+
ui(new Ui::EditAddressDialog),
18+
mode(_mode)
2119
{
2220
ui->setupUi(this);
2321

src/qt/editaddressdialog.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public Q_SLOTS:
4949
QString getDuplicateAddressWarning() const;
5050

5151
Ui::EditAddressDialog *ui;
52-
QDataWidgetMapper *mapper;
52+
QDataWidgetMapper* mapper{nullptr};
5353
Mode mode;
54-
AddressTableModel *model;
54+
AddressTableModel* model{nullptr};
5555

5656
QString address;
5757
};

src/qt/intro.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ int GetPruneTargetGB()
122122
Intro::Intro(QWidget *parent, int64_t blockchain_size_gb, int64_t chain_state_size_gb) :
123123
QDialog(parent, GUIUtil::dialog_flags),
124124
ui(new Ui::Intro),
125-
thread(nullptr),
126-
signalled(false),
127125
m_blockchain_size_gb(blockchain_size_gb),
128126
m_chain_state_size_gb(chain_state_size_gb),
129127
m_prune_target_gb{GetPruneTargetGB()}

src/qt/intro.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ private Q_SLOTS:
6464

6565
private:
6666
Ui::Intro *ui;
67-
QThread *thread;
67+
QThread* thread{nullptr};
6868
QMutex mutex;
69-
bool signalled;
69+
bool signalled{false};
7070
QString pathToCheck;
7171
const int64_t m_blockchain_size_gb;
7272
const int64_t m_chain_state_size_gb;

src/qt/modaloverlay.cpp

+4-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
#include <QPropertyAnimation>
1313
#include <QResizeEvent>
1414

15-
ModalOverlay::ModalOverlay(bool enable_wallet, QWidget *parent) :
16-
QWidget(parent),
17-
ui(new Ui::ModalOverlay),
18-
bestHeaderHeight(0),
19-
bestHeaderDate(QDateTime()),
20-
layerIsVisible(false),
21-
userClosed(false)
15+
ModalOverlay::ModalOverlay(bool enable_wallet, QWidget* parent)
16+
: QWidget(parent),
17+
ui(new Ui::ModalOverlay),
18+
bestHeaderDate(QDateTime())
2219
{
2320
ui->setupUi(this);
2421
connect(ui->closeButton, &QPushButton::clicked, this, &ModalOverlay::closeClicked);

src/qt/modaloverlay.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public Q_SLOTS:
4545

4646
private:
4747
Ui::ModalOverlay *ui;
48-
int bestHeaderHeight; //best known height (based on the headers)
48+
int bestHeaderHeight{0}; // best known height (based on the headers)
4949
QDateTime bestHeaderDate;
5050
QVector<QPair<qint64, double> > blockProcessTime;
51-
bool layerIsVisible;
52-
bool userClosed;
51+
bool layerIsVisible{false};
52+
bool userClosed{false};
5353
QPropertyAnimation m_animation;
5454
void UpdateHeaderSyncLabel();
5555
void UpdateHeaderPresyncLabel(int height, const QDateTime& blockDate);

src/qt/notificator.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ Notificator::Notificator(const QString &_programName, QSystemTrayIcon *_trayIcon
3232
QObject(_parent),
3333
parent(_parent),
3434
programName(_programName),
35-
mode(None),
3635
trayIcon(_trayIcon)
37-
#ifdef USE_DBUS
38-
,interface(nullptr)
39-
#endif
4036
{
4137
if(_trayIcon && _trayIcon->supportsMessages())
4238
{

src/qt/notificator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public Q_SLOTS:
6161
UserNotificationCenter /**< Use the 10.8+ User Notification Center (Mac only) */
6262
};
6363
QString programName;
64-
Mode mode;
64+
Mode mode{None};
6565
QSystemTrayIcon *trayIcon;
6666
#ifdef USE_DBUS
67-
QDBusInterface *interface;
67+
QDBusInterface* interface{nullptr};
6868

6969
void notifyDBus(Class cls, const QString &title, const QString &text, const QIcon &icon, int millisTimeout);
7070
#endif

src/qt/optionsdialog.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,9 @@
3131
#include <QSystemTrayIcon>
3232
#include <QTimer>
3333

34-
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
35-
QDialog(parent, GUIUtil::dialog_flags),
36-
ui(new Ui::OptionsDialog),
37-
model(nullptr),
38-
mapper(nullptr)
34+
OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
35+
: QDialog(parent, GUIUtil::dialog_flags),
36+
ui(new Ui::OptionsDialog)
3937
{
4038
ui->setupUi(this);
4139

src/qt/optionsdialog.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ private Q_SLOTS:
7575
private:
7676
Ui::OptionsDialog *ui;
7777
ClientModel* m_client_model{nullptr};
78-
OptionsModel *model;
79-
QDataWidgetMapper *mapper;
78+
OptionsModel* model{nullptr};
79+
QDataWidgetMapper* mapper{nullptr};
8080
};
8181

8282
#endif // BITCOIN_QT_OPTIONSDIALOG_H

src/qt/overviewpage.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ class TxViewDelegate : public QAbstractItemDelegate
140140
OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) :
141141
QWidget(parent),
142142
ui(new Ui::OverviewPage),
143-
clientModel(nullptr),
144-
walletModel(nullptr),
145143
m_platform_style{platformStyle},
146144
txdelegate(new TxViewDelegate(platformStyle, this))
147145
{

src/qt/overviewpage.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public Q_SLOTS:
5050

5151
private:
5252
Ui::OverviewPage *ui;
53-
ClientModel *clientModel;
54-
WalletModel *walletModel;
53+
ClientModel* clientModel{nullptr};
54+
WalletModel* walletModel{nullptr};
5555
bool m_privacy{false};
5656

5757
const PlatformStyle* m_platform_style;

src/qt/paymentserver.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,8 @@ bool PaymentServer::ipcSendCommandLine()
126126
return fResult;
127127
}
128128

129-
PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) :
130-
QObject(parent),
131-
saveURIs(true),
132-
uriServer(nullptr),
133-
optionsModel(nullptr)
129+
PaymentServer::PaymentServer(QObject* parent, bool startLocalServer)
130+
: QObject(parent)
134131
{
135132
// Install global event filter to catch QFileOpenEvents
136133
// on Mac: sent when you click bitcoin: links

src/qt/paymentserver.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ private Q_SLOTS:
101101
bool eventFilter(QObject *object, QEvent *event) override;
102102

103103
private:
104-
bool saveURIs; // true during startup
105-
QLocalServer* uriServer;
106-
OptionsModel *optionsModel;
104+
bool saveURIs{true}; // true during startup
105+
QLocalServer* uriServer{nullptr};
106+
OptionsModel* optionsModel{nullptr};
107107
};
108108

109109
#endif // BITCOIN_QT_PAYMENTSERVER_H

src/qt/peertablemodel.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
#include <QList>
1515
#include <QTimer>
1616

17-
PeerTableModel::PeerTableModel(interfaces::Node& node, QObject* parent) :
18-
QAbstractTableModel(parent),
19-
m_node(node),
20-
timer(nullptr)
17+
PeerTableModel::PeerTableModel(interfaces::Node& node, QObject* parent)
18+
: QAbstractTableModel(parent),
19+
m_node(node)
2120
{
2221
// set up timer for auto refresh
2322
timer = new QTimer(this);

src/qt/peertablemodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public Q_SLOTS:
110110
/*: Title of Peers Table column which contains the peer's
111111
User Agent string. */
112112
tr("User Agent")};
113-
QTimer *timer;
113+
QTimer* timer{nullptr};
114114
};
115115

116116
#endif // BITCOIN_QT_PEERTABLEMODEL_H

src/qt/qrimagewidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <qrencode.h>
2424
#endif
2525

26-
QRImageWidget::QRImageWidget(QWidget *parent):
27-
QLabel(parent), contextMenu(nullptr)
26+
QRImageWidget::QRImageWidget(QWidget* parent)
27+
: QLabel(parent)
2828
{
2929
contextMenu = new QMenu(this);
3030
contextMenu->addAction(tr("&Save Image…"), this, &QRImageWidget::saveImage);

src/qt/qrimagewidget.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Q_SLOTS:
4141
virtual void contextMenuEvent(QContextMenuEvent *event) override;
4242

4343
private:
44-
QMenu *contextMenu;
44+
QMenu* contextMenu{nullptr};
4545
};
4646

4747
#endif // BITCOIN_QT_QRIMAGEWIDGET_H

0 commit comments

Comments
 (0)