From f92bc38cdb04fbdbf93efd364df2d3b651467128 Mon Sep 17 00:00:00 2001 From: Nicholas Baron Date: Tue, 26 Mar 2019 09:56:37 -0700 Subject: [PATCH] Improved readability of GetMaxOperandLengthAndValue --- src/CalcViewModel/Common/CopyPasteManager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp index 1f8e666a..d123d780 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.cpp +++ b/src/CalcViewModel/Common/CopyPasteManager.cpp @@ -340,14 +340,16 @@ bool CopyPasteManager::ExpressionRegExMatch(vector operands, ViewMode m pair CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType) { + constexpr size_t defaultMaxOperandLength = 0; + constexpr uint64_t defaultMaxValue = 0; if (mode == ViewMode::Standard) { - return make_pair(MaxStandardOperandLength, 0); + return make_pair(MaxStandardOperandLength, defaultMaxValue); } else if (mode == ViewMode::Scientific) { - return make_pair(MaxScientificOperandLength, 0); + return make_pair(MaxScientificOperandLength, defaultMaxValue); } else if (mode == ViewMode::Programmer) { @@ -394,10 +396,10 @@ pair CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mo } else if (modeType == CategoryGroupType::Converter) { - return make_pair(MaxConverterInputLength, 0); + return make_pair(MaxConverterInputLength, defaultMaxValue); } - return make_pair(0, 0); + return make_pair(defaultMaxOperandLength, defaultMaxValue); } wstring CopyPasteManager::SanitizeOperand(const wstring& operand)