github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 06:13:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further applied C++ Core Guideline NR.2

Browse source
This commit is contained in:
Nicholas Baron 2019-03-26 00:18:16 -07:00
commit c68640ef6e
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/CalcViewModel/Common/CopyPasteManager.cpp
View file

@ -340,16 +340,14 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType) pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType)
{ {
size_t maxLength = 0;
uint64_t maxValue = 0;
if (mode == ViewMode::Standard) if (mode == ViewMode::Standard)
{ {
maxLength = MaxStandardOperandLength; return make_pair(MaxStandardOperandLength, 0);
} }
else if (mode == ViewMode::Scientific) else if (mode == ViewMode::Scientific)
{ {
maxLength = MaxScientificOperandLength; return make_pair(MaxScientificOperandLength, 0);
} }
else if (mode == ViewMode::Programmer) else if (mode == ViewMode::Programmer)
{ {
@ -389,15 +387,17 @@ pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mo
unsigned int signBit = (programmerNumberBase == DecBase) ? 1 : 0; unsigned int signBit = (programmerNumberBase == DecBase) ? 1 : 0;
maxLength = static_cast<size_t>(ceil((bitLength - signBit) / bitsPerDigit)); const auto maxLength = static_cast<size_t>(ceil((bitLength - signBit) / bitsPerDigit));
maxValue = UINT64_MAX >> (MaxProgrammerBitLength - (bitLength - signBit)); const uint64_t maxValue = UINT64_MAX >> (MaxProgrammerBitLength - (bitLength - signBit));
return make_pair(maxLength, maxValue);
} }
else if (modeType == CategoryGroupType::Converter) else if (modeType == CategoryGroupType::Converter)
{ {
maxLength = MaxConverterInputLength; return make_pair(MaxConverterInputLength, 0);
} }
return make_pair(maxLength, maxValue); return make_pair(0, 0);
} }
wstring CopyPasteManager::SanitizeOperand(const wstring& operand) wstring CopyPasteManager::SanitizeOperand(const wstring& operand)