125 lines
5.0 KiB
Diff
125 lines
5.0 KiB
Diff
commit 335f29d266c5b169ff1e781f9851a3a203f3198c
|
|
Author: Andreas Sturmlechner <asturm@gentoo.org>
|
|
AuthorDate: 2020-11-06 08:22:15 +0000
|
|
Subject: dev-qt/qtwebkit: Fix build with ICU-68
|
|
--- a/Source/WebCore/platform/text/icu/UTextProvider.h
|
|
+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
|
|
@@ -80,12 +80,12 @@
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < std::numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
|
|
- isAccessible = TRUE;
|
|
+ isAccessible = true;
|
|
return true;
|
|
}
|
|
if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
|
|
text->chunkOffset = text->chunkLength;
|
|
- isAccessible = FALSE;
|
|
+ isAccessible = false;
|
|
return true;
|
|
}
|
|
} else {
|
|
@@ -94,12 +94,12 @@
|
|
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
|
|
ASSERT(offset < std::numeric_limits<int32_t>::max());
|
|
text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
|
|
- isAccessible = TRUE;
|
|
+ isAccessible = true;
|
|
return true;
|
|
}
|
|
if (nativeIndex <= 0 && !text->chunkNativeStart) {
|
|
text->chunkOffset = 0;
|
|
- isAccessible = FALSE;
|
|
+ isAccessible = false;
|
|
return true;
|
|
}
|
|
}
|
|
--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
|
|
+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
|
|
@@ -100,23 +100,23 @@
|
|
if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
|
|
// Already inside the buffer. Set the new offset.
|
|
uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
if (index >= length && uText->chunkNativeLimit == length) {
|
|
// Off the end of the buffer, but we can't get it.
|
|
uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
|
|
- return FALSE;
|
|
+ return false;
|
|
}
|
|
} else {
|
|
if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
|
|
// Already inside the buffer. Set the new offset.
|
|
uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
if (!index && !uText->chunkNativeStart) {
|
|
// Already at the beginning; can't go any farther.
|
|
uText->chunkOffset = 0;
|
|
- return FALSE;
|
|
+ return false;
|
|
}
|
|
}
|
|
|
|
@@ -144,7 +144,7 @@
|
|
|
|
uText->nativeIndexingLimit = uText->chunkLength;
|
|
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
|
|
static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
|
|
@@ -336,7 +336,7 @@
|
|
static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
|
|
{
|
|
if (!text->context)
|
|
- return FALSE;
|
|
+ return false;
|
|
int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
|
|
UBool isAccessible;
|
|
if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
|
|
@@ -356,7 +356,7 @@
|
|
ASSERT(newContext == UTextProviderContext::PriorContext);
|
|
textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
|
|
}
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
|
|
static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
|
|
--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
|
|
+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
|
|
@@ -125,7 +125,7 @@
|
|
static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
|
|
{
|
|
if (!text->context)
|
|
- return FALSE;
|
|
+ return false;
|
|
int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
|
|
UBool isAccessible;
|
|
if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
|
|
@@ -145,7 +145,7 @@
|
|
ASSERT(newContext == UTextProviderContext::PriorContext);
|
|
textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
|
|
}
|
|
- return TRUE;
|
|
+ return true;
|
|
}
|
|
|
|
static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
|
|
--- a/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
|
|
@@ -308,7 +308,7 @@
|
|
m_converterICU = ucnv_open(m_canonicalConverterName, &err);
|
|
ASSERT(U_SUCCESS(err));
|
|
if (m_converterICU)
|
|
- ucnv_setFallback(m_converterICU, TRUE);
|
|
+ ucnv_setFallback(m_converterICU, true);
|
|
}
|
|
|
|
int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
|