From 13d8b04d8d2ea617fe92fba5cf6497c12fbf5752 Mon Sep 17 00:00:00 2001
From: Seija <71219152+PokeCodec@users.noreply.github.com>
Date: Wed, 28 Oct 2020 17:40:57 -0400
Subject: [PATCH] Changed output of GetCurrentRadix to match the variable type
 of m_radix (#1416)

Co-authored-by: PokeCodec <67983839+PokeCodec@users.noreply.github.com>
---
 src/CalcManager/CEngine/scicomm.cpp       | 2 +-
 src/CalcManager/CalculatorManager.cpp     | 2 +-
 src/CalcManager/Header Files/CalcEngine.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
index 04bdda7..20e60a2 100644
--- 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
index e26ad4f..a5e2f18 100644
--- 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
index 0158e62..397b9ce 100644
--- a/src/CalcManager/Header Files/CalcEngine.h	
+++ b/src/CalcManager/Header Files/CalcEngine.h	
@@ -77,7 +77,7 @@ public:
     }
     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)
     {