From c5517e0a772b9a9b1834b4cd7103df54d6d385d5 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Thu, 20 Apr 2006 03:37:46 +0000 Subject: [PATCH] Bug 104158: Use NS_LITERAL_STRING instead of XXXWithConversion("..."). r=bryner, rs=alecf --- content/base/src/nsDOMParser.cpp | 2 +- content/base/src/nsXMLHttpRequest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index b27bb592363..dfad8a61a56 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -395,7 +395,7 @@ ConvertWStringToStream(const PRUnichar* aStr, do_GetService(kCharsetConverterManagerCID, &rv); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); - charsetStr.AssignWithConversion("UTF-8"); + charsetStr.Assign(NS_LITERAL_STRING("UTF-8")); rv = charsetConv->GetUnicodeEncoder(&charsetStr, getter_AddRefs(encoder)); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index bc74a1d099f..8100af82a33 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -683,7 +683,7 @@ nsXMLHttpRequest::GetStreamForWString(const PRUnichar* aStr, do_GetService(kCharsetConverterManagerCID, &rv); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); - charsetStr.AssignWithConversion("UTF-8"); + charsetStr.Assign(NS_LITERAL_STRING("UTF-8")); rv = charsetConv->GetUnicodeEncoder(&charsetStr, getter_AddRefs(encoder)); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);