diff --git a/src/CalcManager/CalculatorHistory.cpp b/src/CalcManager/CalculatorHistory.cpp index 6b18a8e8..7f6c406f 100644 --- a/src/CalcManager/CalculatorHistory.cpp +++ b/src/CalcManager/CalculatorHistory.cpp @@ -7,8 +7,7 @@ using namespace std; using namespace CalculationManager; -CalculatorHistory::CalculatorHistory(CALCULATOR_MODE eMode, size_t maxSize) : - m_mode(eMode), +CalculatorHistory::CalculatorHistory(size_t maxSize) : m_maxHistorySize(maxSize) {} diff --git a/src/CalcManager/CalculatorHistory.h b/src/CalcManager/CalculatorHistory.h index aececbda..8116e9e4 100644 --- a/src/CalcManager/CalculatorHistory.h +++ b/src/CalcManager/CalculatorHistory.h @@ -31,7 +31,7 @@ namespace CalculationManager { public: - CalculatorHistory(CALCULATOR_MODE eMode, const size_t maxSize); + CalculatorHistory(const size_t maxSize); unsigned int AddToHistory(_In_ std::shared_ptr>> const &spTokens, _In_ std::shared_ptr>> const &spCommands, std::wstring_view result); std::vector> const& GetHistory(); std::shared_ptr const& GetHistoryItem(unsigned int uIdx); @@ -43,7 +43,6 @@ namespace CalculationManager private: std::vector> m_historyItems; - CALCULATOR_MODE m_mode; const size_t m_maxHistorySize; }; } diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp index 4d13c4a0..1931243f 100644 --- a/src/CalcManager/CalculatorManager.cpp +++ b/src/CalcManager/CalculatorManager.cpp @@ -30,8 +30,8 @@ namespace CalculationManager m_isExponentialFormat(false), m_persistedPrimaryValue(), m_currentCalculatorEngine(nullptr), - m_pStdHistory(new CalculatorHistory(CM_STD, MAX_HISTORY_ITEMS)), - m_pSciHistory(new CalculatorHistory(CM_SCI, MAX_HISTORY_ITEMS)), + m_pStdHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)), + m_pSciHistory(new CalculatorHistory(MAX_HISTORY_ITEMS)), m_inHistoryItemLoadMode(false) { CCalcEngine::InitialOneTimeOnlySetup(*m_resourceProvider); diff --git a/src/CalculatorUnitTests/CalcEngineTests.cpp b/src/CalculatorUnitTests/CalcEngineTests.cpp index 1b9bc576..d572a442 100644 --- a/src/CalculatorUnitTests/CalcEngineTests.cpp +++ b/src/CalculatorUnitTests/CalcEngineTests.cpp @@ -20,7 +20,7 @@ namespace CalculatorUnitTests TEST_METHOD_INITIALIZE(CommonSetup) { m_resourceProvider = make_shared(); - m_history = make_shared(CM_STD, MAX_HISTORY_SIZE); + m_history = make_shared(MAX_HISTORY_SIZE); CCalcEngine::InitialOneTimeOnlySetup(*(m_resourceProvider.get())); m_calcEngine = make_unique(false /* Respect Order of Operations */, false /* Set to Integer Mode */, m_resourceProvider.get(), nullptr, m_history); }