Replace use of c++ keyword 'default' in c++ code and C APIs. Also correct obsolete use of qualified name in member declaration.

This commit is contained in:
Philip Lamb 2020-12-16 11:36:55 +13:00
parent 3bf1085c72
commit 1471a6dc80
5 changed files with 7 additions and 7 deletions

View file

@ -671,13 +671,13 @@ Servo::PromptResult ServoControl::OnServoPromptYesNo(winrt::hstring message,
}
std::optional<hstring> ServoControl::OnServoPromptInput(winrt::hstring message,
winrt::hstring default,
winrt::hstring def,
bool trusted) {
auto titlefmt =
format(mL10NStrings->PromptTitle.c_str(), mCurrentUrl.c_str());
hstring title{trusted ? L"" : titlefmt};
auto [button, string] = PromptSync(title, message, mL10NStrings->PromptOk,
mL10NStrings->PromptCancel, default);
mL10NStrings->PromptCancel, def);
return string;
}