Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change implicit conversion from

Browse Source 
|NS_ConvertUTF8toUCS2|
|NS_ConvertASCIItoUCS2|
|NS_ConvertUCS2toUTF8|
|ns[C]LiteralString|
|ns[C]PromiseFlatString|

to explicit |get()|.

Add |get()| to |nsString|, remove implicit conversion operators where possible, add NS_WARNING where not (yet!).

Bug=53057, r=alecf, sr=scc


git-svn-id: svn://10.0.0.236/trunk@88947 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
disttsc%bart.nl
2001-03-08 08:05:05 +00:00
parent e5075b3d5f
commit abd8de21e5
92 changed files with 380 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -289,7 +289,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
{
nsresult res;
PRUnichar *encodedBuffer = nsnull;
res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString),
res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString).get(),
nsIEntityConverter::html40Latin1,
&encodedBuffer);
if (NS_SUCCEEDED(res) && encodedBuffer)
@@ -328,7 +328,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
{
// Call the converter to convert to the target charset.
// Convert() takes a char* output param even though it's writing unicode.
res = mCharsetEncoder->Convert(nsPromiseFlatString(aString), &encodedBuffer);
res = mCharsetEncoder->Convert(nsPromiseFlatString(aString).get(), &encodedBuffer);
if (NS_SUCCEEDED(res) && encodedBuffer)
{
charsWritten = nsCRT::strlen(encodedBuffer);
@@ -339,18 +339,16 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
// If it didn't work, just write the unicode
else
{
const PRUnichar* unicode = nsPromiseFlatString(aString);
charsWritten = aString.Length();
out.write(unicode, charsWritten);
out.write(nsPromiseFlatString(aString).get(), charsWritten);
}
}
// If we couldn't get an encoder, just write the unicode
else
{
const PRUnichar* unicode = nsPromiseFlatString(aString);
charsWritten = aString.Length();
out.write(unicode, charsWritten);
out.write(nsPromiseFlatString(aString).get(), charsWritten);
}
return charsWritten;