Change implicit conversion from

|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

View File

@@ -163,7 +163,7 @@ MyPrefChangedCallback(const char*aPrefName, void* instance_data)
{
if(nsCRT::strlen(detector_name) > 0) {
PL_strncpy(g_detector_contractid, NS_CHARSET_DETECTOR_CONTRACTID_BASE,DETECTOR_CONTRACTID_MAX);
PL_strncat(g_detector_contractid, NS_ConvertUCS2toUTF8(detector_name),DETECTOR_CONTRACTID_MAX);
PL_strncat(g_detector_contractid, NS_ConvertUCS2toUTF8(detector_name).get(),DETECTOR_CONTRACTID_MAX);
gPlugDetector = PR_TRUE;
} else {
g_detector_contractid[0]=0;
@@ -779,7 +779,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
&detector_name)))
{
PL_strncpy(g_detector_contractid, NS_CHARSET_DETECTOR_CONTRACTID_BASE,DETECTOR_CONTRACTID_MAX);
PL_strncat(g_detector_contractid, NS_ConvertUCS2toUTF8(detector_name),DETECTOR_CONTRACTID_MAX);
PL_strncat(g_detector_contractid, NS_ConvertUCS2toUTF8(detector_name).get(),DETECTOR_CONTRACTID_MAX);
gPlugDetector = PR_TRUE;
PR_FREEIF(detector_name);
}
@@ -905,7 +905,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
if(cachedData) {
rv=cachedData->SetAnnotation("charset",charset.Length()+1,
NS_ConvertUCS2toUTF8(charset.GetUnicode()));
NS_ConvertUCS2toUTF8(charset).get());
NS_ASSERTION(NS_SUCCEEDED(rv),"cannot SetAnnotation");
}