зеркало из https://github.com/mozilla/gecko-dev.git
making string conversions explicit
This commit is contained in:
Родитель
94125ee831
Коммит
c666d0582c
|
@ -74,14 +74,14 @@ nsMacCharset::nsMacCharset()
|
|||
long ret = ::GetScriptManagerVariable(smRegionCode);
|
||||
PRInt32 reg = (PRInt32)(ret & 0x00FFFF);
|
||||
nsAutoString regionKey; regionKey.AssignWithConversion("region.");
|
||||
regionKey.AppendWithConversion(reg, 10);
|
||||
regionKey.AppendInt(reg, 10);
|
||||
|
||||
nsresult res = gInfo->Get(regionKey, mCharset);
|
||||
if(NS_FAILED(res)) {
|
||||
ret = ::GetScriptManagerVariable(smSysScript);
|
||||
PRInt32 script = (PRInt32)(ret & 0x00FFFF);
|
||||
nsAutoString scriptKey; scriptKey.AssignWithConversion("script.");
|
||||
scriptKey.AppendWithConversion(script, 10);
|
||||
scriptKey.AppendInt(script, 10);
|
||||
nsresult res = gInfo->Get(scriptKey, mCharset);
|
||||
if(NS_FAILED(res)) {
|
||||
mCharset.AssignWithConversion("x-mac-roman");
|
||||
|
@ -126,12 +126,12 @@ nsMacCharset::GetDefaultCharsetForLocale(const PRUnichar* localeName, PRUnichar*
|
|||
if (!gInfo) { *_retValue = charset.ToNewUnicode(); return NS_ERROR_OUT_OF_MEMORY; }
|
||||
|
||||
nsAutoString locale_key; locale_key.AssignWithConversion("region.");
|
||||
locale_key.AppendWithConversion(region,10);
|
||||
locale_key.AppendInt(region,10);
|
||||
|
||||
rv = gInfo->Get(locale_key,charset);
|
||||
if (NS_FAILED(rv)) {
|
||||
locale_key.AssignWithConversion("script.");
|
||||
locale_key.AppendWithConversion(script,10);
|
||||
locale_key.AppendInt(script,10);
|
||||
rv = gInfo->Get(locale_key,charset);
|
||||
if (NS_FAILED(rv)) { charset.AssignWithConversion("x-mac-roman");}
|
||||
}
|
||||
|
|
|
@ -222,7 +222,7 @@ nsRDFDOMDataSource::createDOMNodeTarget(nsIDOMNode *node,
|
|||
else if (aProperty == kNC_Type) {
|
||||
PRUint16 type;
|
||||
node->GetNodeType(&type);
|
||||
str.Append(PRInt32(type));
|
||||
str.AppendInt(PRInt32(type));
|
||||
}
|
||||
return createLiteral(str, aResult);
|
||||
}
|
||||
|
@ -382,7 +382,7 @@ nsRDFDOMDataSource::createContentMiscArcs(nsIContent *content,
|
|||
|
||||
PRInt32 namespaceID;
|
||||
content->GetNameSpaceID(namespaceID);
|
||||
value.Append(namespaceID);
|
||||
value.AppendInt(namespaceID);
|
||||
|
||||
appendLeafObject(name, value, arcs);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче