corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 183156 remove *UCS2* functions, replacing them with *UTF16* ones

Browse Source 
r+sr=darin
This commit is contained in:
cbiesinger@web.de
2006-02-03 14:18:39 +00:00
parent 6dd7c6d124
commit aae44b57d9
354 changed files with 1134 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
embedding/components/windowwatcher/src/nsPromptService.cpp
View File

@@ -126,7 +126,7 @@ nsPromptService::Alert(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
nsString url;
NS_ConvertASCIItoUCS2 styleClass(kAlertIconClass);
NS_ConvertASCIItoUTF16 styleClass(kAlertIconClass);
block->SetString(eIconClass, styleClass.get());
rv = DoDialog(parent, block, kPromptURL);
@@ -161,7 +161,7 @@ nsPromptService::AlertCheck(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
NS_ConvertASCIItoUCS2 styleClass(kAlertIconClass);
NS_ConvertASCIItoUTF16 styleClass(kAlertIconClass);
block->SetString(eIconClass, styleClass.get());
block->SetString(eCheckboxMsg, checkMsg);
block->SetInt(eCheckboxState, *checkValue);
@@ -200,7 +200,7 @@ nsPromptService::Confirm(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
NS_ConvertASCIItoUCS2 styleClass(kQuestionIconClass);
NS_ConvertASCIItoUTF16 styleClass(kQuestionIconClass);
block->SetString(eIconClass, styleClass.get());
rv = DoDialog(parent, block, kPromptURL);
@@ -239,7 +239,7 @@ nsPromptService::ConfirmCheck(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
NS_ConvertASCIItoUCS2 styleClass(kQuestionIconClass);
NS_ConvertASCIItoUTF16 styleClass(kQuestionIconClass);
block->SetString(eIconClass, styleClass.get());
block->SetString(eCheckboxMsg, checkMsg);
block->SetInt(eCheckboxState, *checkValue);
@@ -333,7 +333,7 @@ nsPromptService::ConfirmEx(nsIDOMWindow *parent,
}
block->SetInt(eNumberButtons, numberButtons);
block->SetString(eIconClass, NS_ConvertASCIItoUCS2(kQuestionIconClass).get());
block->SetString(eIconClass, NS_ConvertASCIItoUTF16(kQuestionIconClass).get());
if (checkMsg && checkValue) {
block->SetString(eCheckboxMsg, checkMsg);
@@ -391,7 +391,7 @@ nsPromptService::Prompt(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
NS_ConvertASCIItoUCS2 styleClass(kQuestionIconClass);
NS_ConvertASCIItoUTF16 styleClass(kQuestionIconClass);
block->SetString(eIconClass, styleClass.get());
block->SetInt(eNumberEditfields, 1);
if (*value)
@@ -455,7 +455,7 @@ nsPromptService::PromptUsernameAndPassword(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
NS_ConvertASCIItoUCS2 styleClass(kQuestionIconClass);
NS_ConvertASCIItoUTF16 styleClass(kQuestionIconClass);
block->SetString(eIconClass, styleClass.get());
block->SetInt( eNumberEditfields, 2 );
if (*username)
@@ -526,7 +526,7 @@ NS_IMETHODIMP nsPromptService::PromptPassword(nsIDOMWindow *parent,
block->SetString(eDialogTitle, dialogTitle);
nsString url;
NS_ConvertASCIItoUCS2 styleClass(kQuestionIconClass);
NS_ConvertASCIItoUTF16 styleClass(kQuestionIconClass);
block->SetString(eIconClass, styleClass.get());
block->SetInt(eNumberEditfields, 1);
block->SetInt(eEditField1Password, 1);
@@ -672,7 +672,7 @@ nsPromptService::GetLocaleString(const char *aKey, PRUnichar **aResult)
rv = stringService->CreateBundle(kCommonDialogsProperties, getter_AddRefs(stringBundle));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).get(), aResult);
rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUTF16(aKey).get(), aResult);
return rv;
}