[trivial] Cleanup init.cpp and rpc message #6664
Conversation
| @@ -120,6 +120,7 @@ UniValue generate(const UniValue& params, bool fHelp) | |||
| "\nMine blocks immediately (before the RPC call returns)\n" | |||
| "\nNote: this function can only be used on the regtest network\n" | |||
| "1. numblocks (numeric, required) How many blocks are generated immediately.\n" | |||
| "\nArguments:\n" | |||
There was a problem hiding this comment.
Indeed, rebase mistake. Thank you.
9f4ba7e to
3bf7621
Compare
|
Maybe try to distinct between the code and the docs/images changes? Mixed PRs are hard to review and merge. |
| Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png | ||
| Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) | ||
| Files: src/qt/res/icons/bitcoin.*, src/qt/res/src/bitcoin.svg | ||
| Copyright: Bitboy |
There was a problem hiding this comment.
Maybe add my name here because the svg was not done by Bitboy and contains some shadows, gradients, etc.
There was a problem hiding this comment.
Thanks for letting me know. I fixed that and created another PR. There will be more noise but I think it is easier to discuss or merge when the PRs are split.
3bf7621 to
51ff777
Compare
|
utACK |
|
ut ACK |
|
utACK |
1 similar comment
|
utACK |
| @@ -295,7 +295,7 @@ std::string HelpMessage(HelpMessageMode mode) | |||
| strUsage += HelpMessageOpt("-conf=<file>", strprintf(_("Specify configuration file (default: %s)"), "bitcoin.conf")); | |||
| if (mode == HMM_BITCOIND) | |||
| { | |||
| #if !defined(WIN32) | |||
| #ifndef WIN32 | |||
There was a problem hiding this comment.
What is the point of this change? #if !defined(XX) and #ifndef XX are equivalent, with the difference that the first can be used as part of expressions, but I don't see a reason to change it around.
There was a problem hiding this comment.
The other six usages are #ifndef and it was a different author who chose the #if !defined() twice. But I can remove those if you prefer less diff over consistency.
There was a problem hiding this comment.
I just don't see it as very constructive - e.g. a) a lot of pull requests hit this code due to adding/removing arguments, and b) there's an infinite number of commits like this possible, the next person may change them to #if ! again for aesthetic reasons.
But no need to revert it, the other changes in this pull are useful, so I'm just going to merge...
Github-Pull: bitcoin#6664 Rebased-From: 4c3cab1
Bitcoin 0.12 cleanup PRs 2 Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6631 - bitcoin/bitcoin#6664 - Only the first commit (we already had the second through bitcoin/bitcoin#6825). - bitcoin/bitcoin#6669 - bitcoin/bitcoin#6887 - Only the non-QT parts. - bitcoin/bitcoin#6962 - bitcoin/bitcoin#6822 - Only first and third commits (we already had the second through an earlier PR). - bitcoin/bitcoin#7136 - Excludes Travis CI changes, and fixes to documents we don't have anymore. - bitcoin/bitcoin#7084 - bitcoin/bitcoin#7509 - bitcoin/bitcoin#7617 - bitcoin/bitcoin#7726 Part of #2074.
This PR combines several trivial changes.
The commits cover various locations in the source code so it is best to review them one-by-one.