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

4 files changed, 6 insertions, 6 deletions

diff --git a/support/hololens/ServoApp/App.h b/support/hololens/ServoApp/App.h
index 3820da8b952..f0d4c5ca855 100644
--- a/support/hololens/ServoApp/App.h
+++ b/support/hololens/ServoApp/App.h
@@ -16,7 +16,7 @@ struct App : AppT<App> {
 
   void createRootFrame(Controls::Frame &, bool, IInspectable const &);
   void OnLaunched(LaunchActivatedEventArgs const &);
-  void App::OnActivated(IActivatedEventArgs const &);
+  void OnActivated(IActivatedEventArgs const &);
   void OnSuspending(IInspectable const &, SuspendingEventArgs const &);
   void OnNavigationFailed(IInspectable const &,
                           Navigation::NavigationFailedEventArgs const &);
diff --git a/support/hololens/ServoApp/ServoControl/Servo.cpp b/support/hololens/ServoApp/ServoControl/Servo.cpp
index fa6fa5dff12..be2c60908a7 100644
--- a/support/hololens/ServoApp/ServoControl/Servo.cpp
+++ b/support/hololens/ServoApp/ServoControl/Servo.cpp
@@ -152,10 +152,10 @@ Servo::PromptResult prompt_yes_no(const char *message, bool 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) {
   auto input = sServo->Delegate().OnServoPromptInput(
-      char2hstring(message), char2hstring(default), trusted);
+      char2hstring(message), char2hstring(def), trusted);
   if (input.has_value()) {
     return *hstring2char(*input);
   } else {
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
index 12684efe149..12b2ab36217 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.cpp
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
@@ -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;
 }
 
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h
index dda8a1ad91f..9431be41b15 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.h
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.h
@@ -239,7 +239,7 @@ private:
   bool mTransient = false;
   std::optional<hstring> mInitUrl = {};
 
-  Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();
+  Windows::UI::Xaml::Controls::SwapChainPanel Panel();
   void CreateNativeWindow();
   EGLNativeWindowType GetNativeWindow();
   void RecoverFromLostDevice();