diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-25 13:32:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-25 13:32:53 +0200 |
| commit | 332c6134bb15384e5b91c631e821fe52a591d3bc (patch) | |
| tree | 9ec76c4738769ff4efd96de49b143bb03cf9d82c /src/qt/bitcoingui.h | |
| parent | c52776e6ff4dd04c37eaee5fb5cf769ed32c9cac (diff) | |
| parent | f724f31401b963c75bd64f5e2c5b9d9561a9a9dd (diff) | |
| download | bitcoin-332c6134bb15384e5b91c631e821fe52a591d3bc.tar.xz | |
Merge #15894: Remove duplicated "Error: " prefix in logs
f724f31401b963c75bd64f5e2c5b9d9561a9a9dd Make AbortNode() aware of MSG_NOPREFIX flag (Hennadii Stepanov)
96fd4ee02f6c3be21cade729b95a85c60634b0f8 Add MSG_NOPREFIX flag for user messages (Hennadii Stepanov)
f0641f274ffe94fbe7cae43c07a9373013739df2 Prepend the error/warning prefix for GUI messages (Hennadii Stepanov)
Pull request description:
The "Error" prefix/title is set already in the next functions:
- `noui_ThreadSafeMessageBox()`https://github.com/bitcoin/bitcoin/blob/2068f089c8b7b90eb4557d3f67ea0f0ed2059a23/src/noui.cpp#L17
- `ThreadSafeMessageBox()`https://github.com/bitcoin/bitcoin/blob/a720a983015c9ef8cc814c16a5b9ef6379695817/src/qt/bitcoingui.cpp#L1351
Currently on master:
With this PR:
ACKs for top commit:
laanwj:
concept and code-review ACK f724f31401b963c75bd64f5e2c5b9d9561a9a9dd
Tree-SHA512: 218a179b81cc2ac64239d833c02b4c4d4da9b976728a2dcd645966726c4c660b6f1fe43aa28f33d1cb566785a4329e7f93bf5a502bf202316db79d2ff5fce0f8
Diffstat (limited to 'src/qt/bitcoingui.h')
| -rw-r--r-- | src/qt/bitcoingui.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 608f10750a..46ced79007 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -220,7 +220,7 @@ public Q_SLOTS: @see CClientUIInterface::MessageBoxFlags @param[in] ret pointer to a bool that will be modified to whether Ok was clicked (modal only) */ - void message(const QString &title, const QString &message, unsigned int style, bool *ret = nullptr); + void message(const QString& title, QString message, unsigned int style, bool* ret = nullptr); #ifdef ENABLE_WALLET void setCurrentWallet(WalletModel* wallet_model); |