Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc
This patch was automatically generated by the following script:
#!/bin/bash
# Command to convert PRUnichar to char16_t
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*modules/libmar*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name prtypes.h \
! -name Char16.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRUnichar char16_t
This commit is contained in:
@@ -1737,7 +1737,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(FragmentOrElement)
|
||||
classes.AppendLiteral(" class='");
|
||||
nsAutoString classString;
|
||||
classAttrValue->ToString(classString);
|
||||
classString.ReplaceChar(PRUnichar('\n'), PRUnichar(' '));
|
||||
classString.ReplaceChar(char16_t('\n'), char16_t(' '));
|
||||
classes.Append(classString);
|
||||
classes.AppendLiteral("'");
|
||||
}
|
||||
@@ -1866,7 +1866,7 @@ FragmentOrElement::TextLength() const
|
||||
}
|
||||
|
||||
nsresult
|
||||
FragmentOrElement::SetText(const PRUnichar* aBuffer, uint32_t aLength,
|
||||
FragmentOrElement::SetText(const char16_t* aBuffer, uint32_t aLength,
|
||||
bool aNotify)
|
||||
{
|
||||
NS_ERROR("called FragmentOrElement::SetText");
|
||||
@@ -1875,7 +1875,7 @@ FragmentOrElement::SetText(const PRUnichar* aBuffer, uint32_t aLength,
|
||||
}
|
||||
|
||||
nsresult
|
||||
FragmentOrElement::AppendText(const PRUnichar* aBuffer, uint32_t aLength,
|
||||
FragmentOrElement::AppendText(const char16_t* aBuffer, uint32_t aLength,
|
||||
bool aNotify)
|
||||
{
|
||||
NS_ERROR("called FragmentOrElement::AppendText");
|
||||
@@ -2114,8 +2114,8 @@ private:
|
||||
|
||||
void EncodeAttrString(const nsAutoString& aValue, nsAString& aOut)
|
||||
{
|
||||
const PRUnichar* c = aValue.BeginReading();
|
||||
const PRUnichar* end = aValue.EndReading();
|
||||
const char16_t* c = aValue.BeginReading();
|
||||
const char16_t* end = aValue.EndReading();
|
||||
while (c < end) {
|
||||
switch (*c) {
|
||||
case '"':
|
||||
@@ -2139,9 +2139,9 @@ private:
|
||||
{
|
||||
uint32_t len = aValue->GetLength();
|
||||
if (aValue->Is2b()) {
|
||||
const PRUnichar* data = aValue->Get2b();
|
||||
const char16_t* data = aValue->Get2b();
|
||||
for (uint32_t i = 0; i < len; ++i) {
|
||||
const PRUnichar c = data[i];
|
||||
const char16_t c = data[i];
|
||||
switch (c) {
|
||||
case '<':
|
||||
aOut.AppendLiteral("<");
|
||||
@@ -2200,9 +2200,9 @@ AppendEncodedCharacters(const nsTextFragment* aText, StringBuilder& aBuilder)
|
||||
uint32_t extraSpaceNeeded = 0;
|
||||
uint32_t len = aText->GetLength();
|
||||
if (aText->Is2b()) {
|
||||
const PRUnichar* data = aText->Get2b();
|
||||
const char16_t* data = aText->Get2b();
|
||||
for (uint32_t i = 0; i < len; ++i) {
|
||||
const PRUnichar c = data[i];
|
||||
const char16_t c = data[i];
|
||||
switch (c) {
|
||||
case '<':
|
||||
extraSpaceNeeded += ArrayLength("<") - 2;
|
||||
@@ -2253,8 +2253,8 @@ AppendEncodedCharacters(const nsTextFragment* aText, StringBuilder& aBuilder)
|
||||
static void
|
||||
AppendEncodedAttributeValue(nsAutoString* aValue, StringBuilder& aBuilder)
|
||||
{
|
||||
const PRUnichar* c = aValue->BeginReading();
|
||||
const PRUnichar* end = aValue->EndReading();
|
||||
const char16_t* c = aValue->BeginReading();
|
||||
const char16_t* end = aValue->EndReading();
|
||||
|
||||
uint32_t extraSpaceNeeded = 0;
|
||||
while (c < end) {
|
||||
@@ -2360,7 +2360,7 @@ StartElement(Element* aContent, StringBuilder& aBuilder)
|
||||
(fc->NodeType() == nsIDOMNode::TEXT_NODE ||
|
||||
fc->NodeType() == nsIDOMNode::CDATA_SECTION_NODE)) {
|
||||
const nsTextFragment* text = fc->GetText();
|
||||
if (text && text->GetLength() && text->CharAt(0) == PRUnichar('\n')) {
|
||||
if (text && text->GetLength() && text->CharAt(0) == char16_t('\n')) {
|
||||
aBuilder.Append("\n");
|
||||
}
|
||||
}
|
||||
@@ -2618,15 +2618,15 @@ ContainsMarkup(const nsAString& aStr)
|
||||
{
|
||||
// Note: we can't use FindCharInSet because null is one of the characters we
|
||||
// want to search for.
|
||||
const PRUnichar* start = aStr.BeginReading();
|
||||
const PRUnichar* end = aStr.EndReading();
|
||||
const char16_t* start = aStr.BeginReading();
|
||||
const char16_t* end = aStr.EndReading();
|
||||
|
||||
while (start != end) {
|
||||
PRUnichar c = *start;
|
||||
if (c == PRUnichar('<') ||
|
||||
c == PRUnichar('&') ||
|
||||
c == PRUnichar('\r') ||
|
||||
c == PRUnichar('\0')) {
|
||||
char16_t c = *start;
|
||||
if (c == char16_t('<') ||
|
||||
c == char16_t('&') ||
|
||||
c == char16_t('\r') ||
|
||||
c == char16_t('\0')) {
|
||||
return true;
|
||||
}
|
||||
++start;
|
||||
|
||||
Reference in New Issue
Block a user