diff --git a/mozilla/string/src/nsReadableUtils.cpp b/mozilla/string/src/nsReadableUtils.cpp index 405a011d6e0..e356d39f08b 100755 --- a/mozilla/string/src/nsReadableUtils.cpp +++ b/mozilla/string/src/nsReadableUtils.cpp @@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); } NS_COM @@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); } diff --git a/mozilla/xpcom/ds/nsReadableUtils.cpp b/mozilla/xpcom/ds/nsReadableUtils.cpp index 405a011d6e0..e356d39f08b 100755 --- a/mozilla/xpcom/ds/nsReadableUtils.cpp +++ b/mozilla/xpcom/ds/nsReadableUtils.cpp @@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); } NS_COM @@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); } diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp index 405a011d6e0..e356d39f08b 100755 --- a/mozilla/xpcom/string/src/nsReadableUtils.cpp +++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp @@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); } NS_COM @@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest ) aDest.SetLength(aSource.Length()); nsReadingIterator fromBegin, fromEnd; + nsWritingIterator toBegin; - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding(aDest.BeginWriting(toBegin).get())); + LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); + + copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); }