From 3b91e33ca11f8cb0802a993a16489a8e0b6f3ff0 Mon Sep 17 00:00:00 2001
From: Rudy Huyn <rudyhuyn@gmail.com>
Date: Fri, 5 Apr 2019 02:18:54 -0700
Subject: [PATCH] rename UnitConverter::Reset

---
 src/CalcManager/UnitConverter.cpp | 16 +++++++---------
 src/CalcManager/UnitConverter.h   |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp
index 53672fff..efdf1b9d 100644
--- a/src/CalcManager/UnitConverter.cpp
+++ b/src/CalcManager/UnitConverter.cpp
@@ -64,7 +64,7 @@ UnitConverter::UnitConverter(_In_ const shared_ptr<IConverterDataLoader>& dataLo
     unquoteConversions[L"{lb}"] = LEFTESCAPECHAR;
     unquoteConversions[L"{rb}"] = RIGHTESCAPECHAR;
     ClearValues();
-    Reset();
+    ResetCategoriesAndRatios();
 }
 
 void UnitConverter::Initialize()
@@ -76,7 +76,7 @@ bool UnitConverter::CheckLoad()
 {
     if (m_categories.empty())
     {
-        Reset();
+        ResetCategoriesAndRatios();
     }
     return !m_categories.empty();
 }
@@ -337,7 +337,7 @@ wstring UnitConverter::Serialize()
 /// <param name="serializedData">wstring holding the serialized data. If it does not have expected number of parameters, we will ignore it</param>
 void UnitConverter::DeSerialize(const wstring& serializedData)
 {
-    Reset();
+    ResetCategoriesAndRatios();
 
     if (serializedData.empty())
     {
@@ -616,7 +616,7 @@ void UnitConverter::SendCommand(Command command)
         clearFront = false;
         clearBack = false;
         ClearValues();
-        Reset();
+        ResetCategoriesAndRatios();
         break;
 
     default:
@@ -825,15 +825,13 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
         returnVector.push_back(whimsicalReturnVector.at(0));
     }
 
-    //
-
     return returnVector;
 }
 
 /// <summary>
-/// Resets the converter to its initial state
+/// Resets categories and ratios
 /// </summary>
-void UnitConverter::Reset()
+void UnitConverter::ResetCategoriesAndRatios()
 {
     m_categories = m_dataLoader->LoadOrderedCategories();
 
@@ -1088,7 +1086,7 @@ void UnitConverter::UpdateViewModel()
 
 void UnitConverter::ResetCategoriesAndRatio()
 {
-    Reset();
+    ResetCategoriesAndRatios();
     Calculate();
     UpdateViewModel();
 }
diff --git a/src/CalcManager/UnitConverter.h b/src/CalcManager/UnitConverter.h
index 9dec565b..f7de7487 100644
--- a/src/CalcManager/UnitConverter.h
+++ b/src/CalcManager/UnitConverter.h
@@ -230,7 +230,7 @@ namespace UnitConversionManager
         bool CheckLoad();
         double Convert(double value, ConversionData conversionData);
         std::vector<std::tuple<std::wstring, Unit>> CalculateSuggested();
-        void Reset();
+        void ResetCategoriesAndRatios();
         void ClearValues();
         void Calculate();
         void TrimString(std::wstring& input);