Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 17:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
ports/libsimpleservo/capi/src/lib.rs
View file

@ -218,7 +218,7 @@ pub struct CHostCallbacks {
pub prompt_yes_no: extern "C" fn(message: *const c_char, trusted: bool) -> CPromptResult, pub prompt_yes_no: extern "C" fn(message: *const c_char, trusted: bool) -> CPromptResult,
pub prompt_input: extern "C" fn( pub prompt_input: extern "C" fn(
message: *const c_char, message: *const c_char,
default: *const c_char, def: *const c_char,
trusted: bool, trusted: bool,
) -> *const c_char, ) -> *const c_char,
pub on_devtools_started: pub on_devtools_started:

2
support/hololens/ServoApp/App.h
View file

@ -16,7 +16,7 @@ struct App : AppT<App> {
void createRootFrame(Controls::Frame &, bool, IInspectable const &); void createRootFrame(Controls::Frame &, bool, IInspectable const &);
void OnLaunched(LaunchActivatedEventArgs const &); void OnLaunched(LaunchActivatedEventArgs const &);
void App::OnActivated(IActivatedEventArgs const &); void OnActivated(IActivatedEventArgs const &);
void OnSuspending(IInspectable const &, SuspendingEventArgs const &); void OnSuspending(IInspectable const &, SuspendingEventArgs const &);
void OnNavigationFailed(IInspectable const &, void OnNavigationFailed(IInspectable const &,
Navigation::NavigationFailedEventArgs const &); Navigation::NavigationFailedEventArgs const &);

4
support/hololens/ServoApp/ServoControl/Servo.cpp
View file

@ -152,10 +152,10 @@ Servo::PromptResult prompt_yes_no(const char *message, bool trusted) {
return sServo->Delegate().OnServoPromptYesNo(char2hstring(message), trusted); return sServo->Delegate().OnServoPromptYesNo(char2hstring(message), trusted);
} }
const char *prompt_input(const char *message, const char *default, const char *prompt_input(const char *message, const char *def,
bool trusted) { bool trusted) {
auto input = sServo->Delegate().OnServoPromptInput( auto input = sServo->Delegate().OnServoPromptInput(
char2hstring(message), char2hstring(default), trusted); char2hstring(message), char2hstring(def), trusted);
if (input.has_value()) { if (input.has_value()) {
return *hstring2char(*input); return *hstring2char(*input);
} else { } else {

4
support/hololens/ServoApp/ServoControl/ServoControl.cpp
View file

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

2
support/hololens/ServoApp/ServoControl/ServoControl.h
View file

@ -239,7 +239,7 @@ private:
bool mTransient = false; bool mTransient = false;
std::optional<hstring> mInitUrl = {}; std::optional<hstring> mInitUrl = {};
Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel(); Windows::UI::Xaml::Controls::SwapChainPanel Panel();
void CreateNativeWindow(); void CreateNativeWindow();
EGLNativeWindowType GetNativeWindow(); EGLNativeWindowType GetNativeWindow();
void RecoverFromLostDevice(); void RecoverFromLostDevice();