Changed output of GetCurrentRadix to match the variable type of m_rad…

…ix (#1416) Co-authored-by: PokeCodec <67983839+PokeCodec@users.noreply.github.com>
mcooley · Oct 28, 2020 · 13d8b04 · 13d8b04
1 parent dd9d948
commit 13d8b04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
@@ -1045,7 +1045,7 @@ bool CCalcEngine::IsCurrentTooBigForTrig()
     return m_currentVal >= m_maxTrigonometricNum;
 }
 
-int CCalcEngine::GetCurrentRadix()
+uint32_t CCalcEngine::GetCurrentRadix()
 {
     return m_radix;
 }

diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp
@@ -534,7 +534,7 @@ namespace CalculationManager
         vector<wstring> resultVector;
         for (auto const& memoryItem : m_memorizedNumbers)
         {
-            int radix = m_currentCalculatorEngine->GetCurrentRadix();
+            auto radix = m_currentCalculatorEngine->GetCurrentRadix();
             wstring stringValue = m_currentCalculatorEngine->GetStringForDisplay(memoryItem, radix);
 
             if (!stringValue.empty())

diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h
@@ -77,7 +77,7 @@ class CCalcEngine
     }
     void SettingsChanged();
     bool IsCurrentTooBigForTrig();
-    int GetCurrentRadix();
+    uint32_t GetCurrentRadix();
     std::wstring GetCurrentResultForRadix(uint32_t radix, int32_t precision, bool groupDigitsPerRadix);
     void ChangePrecision(int32_t precision)
     {