dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: automatic adding of _t to (u)int types, and WChar to char32_t

Browse Source 
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:
Rubidium
2023-05-08 19:01:06 +02:00
committed by rubidium42
parent 4f4810dc28
commit eaae0bb5e7
564 changed files with 4561 additions and 4561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gfx_layout.cpp
View File

@@ -81,7 +81,7 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
* usable by ParagraphLayout.
*/
for (; buff < buffer_last && cur != str.end();) {
WChar c = Utf8Consume(cur);
char32_t c = Utf8Consume(cur);
if (c == '\0' || c == '\n') {
/* Caller should already have filtered out these characters. */
NOT_REACHED();
@@ -209,7 +209,7 @@ Dimension Layouter::GetBounds()
/**
* Test whether a character is a non-printable formatting code
*/
static bool IsConsumedFormattingCode(WChar ch)
static bool IsConsumedFormattingCode(char32_t ch)
{
if (ch >= SCC_BLUE && ch <= SCC_BLACK) return true;
if (ch == SCC_PUSH_COLOUR) return true;
@@ -240,7 +240,7 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
size_t index = 0;
auto str = this->string.begin();
while (str < ch) {
WChar c = Utf8Consume(str);
char32_t c = Utf8Consume(str);
if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c);
}
@@ -294,7 +294,7 @@ ptrdiff_t Layouter::GetCharAtPosition(int x) const
for (auto str = this->string.begin(); str != this->string.end();) {
if (cur_idx == index) return str - this->string.begin();
WChar c = Utf8Consume(str);
char32_t c = Utf8Consume(str);
if (!IsConsumedFormattingCode(c)) cur_idx += line->GetInternalCharLength(c);
}
}