Merge #19314: refactor: Use uint16_t instead of unsigned short
1cabbddbcarefactor: Use uint16_t instead of unsigned short (Aaron Hook) Pull request description: I wanted to see if the `up for grabs` label works and looked at PR #17822 originally opend by ahook I saw it had many acks for example by jonatack and practicalswift but needed rebasing. So I checked out the remote branch rebased it resolved three conflicts and continued the rebase. Hope everything is as expected (: ACKs for top commit: sipsorcery: ACK1cabbddbca. practicalswift: ACK1cabbddbca-- patch looks correct :) laanwj: ACK1cabbddbcahebasto: ACK1cabbddbca, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 0e6bf64f274aae5dacb188358b4d5f65ccb207d4f70922f039bc4ed7934709418ddad19f8bfb7462517427837c3d2bb3f86ef284bb40e87119aad2a1e148d9d6
This commit is contained in:
9 files changed
+28
-22
No files matched your search
@@ -6,6 +6,7 @@
|
||||
#define BITCOIN_QT_OPTIONSMODEL_H
|
||||
|
||||
#include <amount.h>
|
||||
#include <cstdint>
|
||||
#include <qt/guiconstants.h>
|
||||
|
||||
#include <QAbstractListModel>
|
||||
@@ -15,7 +16,7 @@ class Node;
|
||||
}
|
||||
|
||||
extern const char *DEFAULT_GUI_PROXY_HOST;
|
||||
static constexpr unsigned short DEFAULT_GUI_PROXY_PORT = 9050;
|
||||
static constexpr uint16_t DEFAULT_GUI_PROXY_PORT = 9050;
|
||||
|
||||
/**
|
||||
* Convert configured prune target MiB to displayed GB. Round up to avoid underestimating max disk usage.
|
||||
|
||||
Reference in new issue
Block a user