[Qt] add more NULL pointer checks in bitcoingui #4958

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:bitcoingui changing 1 files +8 −6

Diapolo commented at 12:48 PM on September 22, 2014: none
- add missing checks for clientModel and optionsModel
- small cleanups for an #ifdef on Mac
- remove an unneeded else
Diapolo commented at 1:27 PM on September 22, 2014: none

@laanwj Any idea for this: https://travis-ci.org/bitcoin/bitcoin/jobs/35932431#L1293

Seems unrelated to my changes here...
in src/qt/bitcoingui.cpp:None in e6980fed91 outdated
```
 612 | @@ -613,35 +613,41 @@ void BitcoinGUI::openClicked()
 613 |  void BitcoinGUI::gotoOverviewPage()
 614 |  {
 615 |      overviewAction->setChecked(true);
 616 | -    if (walletFrame) walletFrame->gotoOverviewPage();
 617 | +    if (walletFrame)
```
laanwj commented at 8:09 AM on September 23, 2014:

Please do not do any whitespace changes. We've been over this, don't keep doing it.

Diapolo commented at 8:16 AM on September 23, 2014:

This is exactly what the clang file IS doing anyway and it's no whitespace change ;).

laanwj commented at 8:19 AM on September 23, 2014:

That's exactly the reason why you shouldn't be doing it. Clang will eventually take care of these.
in src/qt/bitcoingui.cpp:None in e6980fed91 outdated
```
 836 | @@ -828,11 +837,10 @@ void BitcoinGUI::message(const QString &title, const QString &message, unsigned
 837 |  
 838 |  void BitcoinGUI::changeEvent(QEvent *e)
 839 |  {
 840 | -    QMainWindow::changeEvent(e);
```
laanwj commented at 8:10 AM on September 23, 2014:

Any concrete reason for moving this?

Diapolo commented at 8:17 AM on September 23, 2014:

AFAIK all event changes are first doing custom processing and afterwards the even it passed. I don't know what the reason would be for doing other things here.

laanwj commented at 8:19 AM on September 23, 2014:

Nonono, that's by no means a certainly. An event handler should use the sequence that makes sense, sometimes that can be very subtle. If we have no need to change this, keep it as it is.
Diapolo commented at 8:23 AM on September 23, 2014: none

@laanwj Updated to be a "sane" pull :-D.
laanwj commented at 8:27 AM on September 23, 2014: member

untested ACK
laanwj added the label GUI on Sep 23, 2014

laanwj commented at 6:54 AM on September 25, 2014: member

This keeps failing the Travis build:

qt/bitcoingui.cpp:863:18: error: no type named 'closeEvent' in 'QMainWindow'

QMainWindow::closeEvent(event);

~~~~~~~~~~~~~^

qt/bitcoingui.cpp:864:1: error: extraneous closing brace ('}')

}

Diapolo commented at 7:13 AM on September 25, 2014: none

Yeah, but I dunno why!? Edit: Damn, got it...
theuni commented at 7:15 AM on September 25, 2014: member

Because the if was moved, and it breaks osx build.

[Qt] add more NULL pointer checks in bitcoingui

- add missing checks for clientModel and optionsModel
- small cleanups for an #ifdef on Mac
- remove an unneeded else

e6beedc496

Diapolo commented at 7:17 AM on September 25, 2014: none

@theuni Yeah I got that one now :), should be fixed. Let's see what Travis is doing now.
laanwj commented at 7:43 AM on September 25, 2014: member

Green!
laanwj merged this on Sep 25, 2014
laanwj closed this on Sep 25, 2014
laanwj referenced this in commit c4998661e4 on Sep 25, 2014
BitcoinPullTester commented at 8:11 AM on September 25, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4958_e6beedc496093d98ba40500fd12bcb191c87bf6e/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Diapolo deleted the branch on Sep 25, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels