From 854c87f4b153b202f9785324f063bc20d07ce6de Mon Sep 17 00:00:00 2001
From: Han Zhang <zhangh@microsoft.com>
Date: Wed, 18 Aug 2021 17:25:10 +0800
Subject: [PATCH] Rename ResetDisplay() to ResetRadix()

---
 src/CalcViewModel/StandardCalculatorViewModel.cpp      | 6 +++---
 src/CalcViewModel/StandardCalculatorViewModel.h        | 2 +-
 src/CalculatorUnitTests/StandardViewModelUnitTests.cpp | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index 7a25bd58..4fa0100c 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -1188,14 +1188,14 @@ void StandardCalculatorViewModel::SetCalculatorType(ViewMode targetState)
     {
     case ViewMode::Standard:
         IsStandard = true;
-        ResetDisplay();
+        ResetRadix();
         SetPrecision(StandardModePrecision);
         UpdateMaxIntDigits();
         break;
 
     case ViewMode::Scientific:
         IsScientific = true;
-        ResetDisplay();
+        ResetRadix();
         SetPrecision(ScientificModePrecision);
         break;
 
@@ -1226,7 +1226,7 @@ String ^ StandardCalculatorViewModel::GetLocalizedStringFormat(String ^ format,
     return LocalizationStringUtil::GetLocalizedString(format, displayValue);
 }
 
-void StandardCalculatorViewModel::ResetDisplay()
+void StandardCalculatorViewModel::ResetRadix()
 {
     AreHEXButtonsEnabled = false;
     CurrentRadixType = NumberBase::DecBase;
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index ac5e877b..01bd982b 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -283,7 +283,7 @@ namespace CalculatorApp
             void Recalculate(bool fromHistory = false);
             bool IsOperator(CalculationManager::Command cmdenum);
             void SetMemorizedNumbersString();   
-            void ResetDisplay();
+            void ResetRadix();
           
             void SetPrecision(int32_t precision);
             void UpdateMaxIntDigits()
diff --git a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
index 113f3f3e..416bb279 100644
--- a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
+++ b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
@@ -42,7 +42,7 @@ namespace CalculatorUnitTests
             viewModel->IsStandard = true;
             viewModel->IsScientific = false;
             viewModel->IsProgrammer = false;
-            viewModel->ResetDisplay();
+            viewModel->ResetRadix();
             viewModel->SetPrecision(StandardModePrecision);
         }
         else if (mode == 1)
@@ -50,7 +50,7 @@ namespace CalculatorUnitTests
             viewModel->IsScientific = true;
             viewModel->IsProgrammer = false;
             viewModel->IsStandard = false;
-            viewModel->ResetDisplay();
+            viewModel->ResetRadix();
             viewModel->SetPrecision(ScientificModePrecision);
         }
         else if (mode == 2)
@@ -58,7 +58,6 @@ namespace CalculatorUnitTests
             viewModel->IsProgrammer = true;
             viewModel->IsScientific = false;
             viewModel->IsStandard = false;
-            viewModel->ResetDisplay();
             viewModel->SetPrecision(ProgrammerModePrecision);
         }
     }