Skip to content

Commit 9096276

Browse files
practicalswiftEmpact
authored andcommitted
Don't use zero as null pointer constant (-Wzero-as-null-pointer-constant)
Qt-only changes.
1 parent 84d0fdc commit 9096276

Some content is hidden

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

52 files changed

+90
-90
lines changed

src/qt/addressbookpage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
5959
AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode, Tabs _tab, QWidget *parent) :
6060
QDialog(parent),
6161
ui(new Ui::AddressBookPage),
62-
model(0),
62+
model(nullptr),
6363
mode(_mode),
6464
tab(_tab)
6565
{

src/qt/addressbookpage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AddressBookPage : public QDialog
3838
ForEditing /**< Open address book for editing */
3939
};
4040

41-
explicit AddressBookPage(const PlatformStyle *platformStyle, Mode mode, Tabs tab, QWidget *parent = 0);
41+
explicit AddressBookPage(const PlatformStyle *platformStyle, Mode mode, Tabs tab, QWidget *parent = nullptr);
4242
~AddressBookPage();
4343

4444
void setModel(AddressTableModel *model);

src/qt/addresstablemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class AddressTablePriv
153153
}
154154
else
155155
{
156-
return 0;
156+
return nullptr;
157157
}
158158
}
159159
};

src/qt/addresstablemodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AddressTableModel : public QAbstractTableModel
2525
Q_OBJECT
2626

2727
public:
28-
explicit AddressTableModel(WalletModel *parent = 0);
28+
explicit AddressTableModel(WalletModel *parent = nullptr);
2929
~AddressTableModel();
3030

3131
enum ColumnIndex {

src/qt/askpassphrasedialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
2222
QDialog(parent),
2323
ui(new Ui::AskPassphraseDialog),
2424
mode(_mode),
25-
model(0),
25+
model(nullptr),
2626
fCapsLock(false)
2727
{
2828
ui->setupUi(this);

src/qt/bantablemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class BanTablePriv
7676
if (idx >= 0 && idx < cachedBanlist.size())
7777
return &cachedBanlist[idx];
7878

79-
return 0;
79+
return nullptr;
8080
}
8181
};
8282

src/qt/bantablemodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class BanTableModel : public QAbstractTableModel
4545
Q_OBJECT
4646

4747
public:
48-
explicit BanTableModel(interfaces::Node& node, ClientModel *parent = 0);
48+
explicit BanTableModel(interfaces::Node& node, ClientModel *parent = nullptr);
4949
~BanTableModel();
5050
void startAutoRefresh();
5151
void stopAutoRefresh();

src/qt/bitcoin.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,18 @@ void BitcoinCore::shutdown()
178178

179179
BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char **argv):
180180
QApplication(argc, argv),
181-
coreThread(0),
181+
coreThread(nullptr),
182182
m_node(node),
183-
optionsModel(0),
184-
clientModel(0),
185-
window(0),
186-
pollShutdownTimer(0),
183+
optionsModel(nullptr),
184+
clientModel(nullptr),
185+
window(nullptr),
186+
pollShutdownTimer(nullptr),
187187
#ifdef ENABLE_WALLET
188-
paymentServer(0),
188+
paymentServer(nullptr),
189189
m_wallet_models(),
190190
#endif
191191
returnValue(0),
192-
platformStyle(0)
192+
platformStyle(nullptr)
193193
{
194194
setQuitOnLastWindowClosed(false);
195195
}
@@ -218,15 +218,15 @@ BitcoinApplication::~BitcoinApplication()
218218
}
219219

220220
delete window;
221-
window = 0;
221+
window = nullptr;
222222
#ifdef ENABLE_WALLET
223223
delete paymentServer;
224-
paymentServer = 0;
224+
paymentServer = nullptr;
225225
#endif
226226
delete optionsModel;
227-
optionsModel = 0;
227+
optionsModel = nullptr;
228228
delete platformStyle;
229-
platformStyle = 0;
229+
platformStyle = nullptr;
230230
}
231231

232232
#ifdef ENABLE_WALLET
@@ -312,7 +312,7 @@ void BitcoinApplication::requestShutdown()
312312
qDebug() << __func__ << ": Requesting shutdown";
313313
startThread();
314314
window->hide();
315-
window->setClientModel(0);
315+
window->setClientModel(nullptr);
316316
pollShutdownTimer->stop();
317317

318318
#ifdef ENABLE_WALLET
@@ -323,7 +323,7 @@ void BitcoinApplication::requestShutdown()
323323
m_wallet_models.clear();
324324
#endif
325325
delete clientModel;
326-
clientModel = 0;
326+
clientModel = nullptr;
327327

328328
m_node.startShutdown();
329329

src/qt/bitcoinamountfield.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AmountSpinBox: public QAbstractSpinBox
6060
}
6161
}
6262

63-
CAmount value(bool *valid_out=0) const
63+
CAmount value(bool *valid_out=nullptr) const
6464
{
6565
return parse(text(), valid_out);
6666
}
@@ -159,7 +159,7 @@ class AmountSpinBox: public QAbstractSpinBox
159159
* return validity.
160160
* @note Must return 0 if !valid.
161161
*/
162-
CAmount parse(const QString &text, bool *valid_out=0) const
162+
CAmount parse(const QString &text, bool *valid_out=nullptr) const
163163
{
164164
CAmount val = 0;
165165
bool valid = BitcoinUnits::parse(currentUnit, text, &val);

src/qt/bitcoinamountfield.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class BitcoinAmountField: public QWidget
2626
Q_PROPERTY(qint64 value READ value WRITE setValue NOTIFY valueChanged USER true)
2727

2828
public:
29-
explicit BitcoinAmountField(QWidget *parent = 0);
29+
explicit BitcoinAmountField(QWidget *parent = nullptr);
3030

31-
CAmount value(bool *value=0) const;
31+
CAmount value(bool *value=nullptr) const;
3232
void setValue(const CAmount& value);
3333

3434
/** If allow empty is set to false the field will be set to the minimum allowed value if left empty. **/

0 commit comments

Comments
 (0)