Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
This commit is contained in:
@@ -565,7 +565,7 @@ public:
|
||||
{
|
||||
switch (widget) {
|
||||
case WID_NG_MATRIX: {
|
||||
uint16 y = r.top;
|
||||
uint16_t y = r.top;
|
||||
|
||||
const int max = std::min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), (int)this->servers.size());
|
||||
|
||||
@@ -824,7 +824,7 @@ public:
|
||||
this->SetDirty();
|
||||
}
|
||||
|
||||
EventState OnKeyPress(WChar key, uint16 keycode) override
|
||||
EventState OnKeyPress(char32_t key, uint16_t keycode) override
|
||||
{
|
||||
EventState state = ES_NOT_HANDLED;
|
||||
|
||||
@@ -1196,7 +1196,7 @@ struct NetworkStartServerWindow : public Window {
|
||||
if (this->widget_id == WID_NSS_SETPWD) {
|
||||
_settings_client.network.server_password = str;
|
||||
} else {
|
||||
int32 value = atoi(str);
|
||||
int32_t value = atoi(str);
|
||||
this->SetWidgetDirty(this->widget_id);
|
||||
switch (this->widget_id) {
|
||||
default: NOT_REACHED();
|
||||
@@ -2145,9 +2145,9 @@ void ShowClientList()
|
||||
}
|
||||
|
||||
NetworkJoinStatus _network_join_status; ///< The status of joining.
|
||||
uint8 _network_join_waiting; ///< The number of clients waiting in front of us.
|
||||
uint32 _network_join_bytes; ///< The number of bytes we already downloaded.
|
||||
uint32 _network_join_bytes_total; ///< The total number of bytes to download.
|
||||
uint8_t _network_join_waiting; ///< The number of clients waiting in front of us.
|
||||
uint32_t _network_join_bytes; ///< The number of bytes we already downloaded.
|
||||
uint32_t _network_join_bytes_total; ///< The total number of bytes to download.
|
||||
|
||||
struct NetworkJoinStatusWindow : Window {
|
||||
NetworkPasswordType password_type;
|
||||
@@ -2165,7 +2165,7 @@ struct NetworkJoinStatusWindow : Window {
|
||||
/* Draw the % complete with a bar and a text */
|
||||
DrawFrameRect(r, COLOUR_GREY, FR_BORDERONLY | FR_LOWERED);
|
||||
Rect ir = r.Shrink(WidgetDimensions::scaled.bevel);
|
||||
uint8 progress; // used for progress bar
|
||||
uint8_t progress; // used for progress bar
|
||||
switch (_network_join_status) {
|
||||
case NETWORK_JOIN_STATUS_CONNECTING:
|
||||
case NETWORK_JOIN_STATUS_AUTHORIZING:
|
||||
|
Reference in New Issue
Block a user