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

Access to wstring::npos from static calls

Browse source
This commit is contained in:
Rudy Huyn 2019-05-16 13:42:01 -07:00
commit cbd0669aa6
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/CalcManager/UnitConverter.cpp
View file

@ -178,7 +178,7 @@ void UnitConverter::SwitchActive(const wstring& newValue)
swap(m_currentHasDecimal, m_returnHasDecimal); swap(m_currentHasDecimal, m_returnHasDecimal);
m_returnDisplay = m_currentDisplay; m_returnDisplay = m_currentDisplay;
m_currentDisplay = newValue; m_currentDisplay = newValue;
m_currentHasDecimal = (m_currentDisplay.find(L'.') != m_currentDisplay.npos); m_currentHasDecimal = (m_currentDisplay.find(L'.') != wstring::npos);
m_switchedActive = true; m_switchedActive = true;
if (m_currencyDataLoader != nullptr && m_vmCurrencyCallback != nullptr) if (m_currencyDataLoader != nullptr && m_vmCurrencyCallback != nullptr)
@ -202,7 +202,7 @@ vector<wstring> UnitConverter::StringToVector(const wstring& w, const wchar_t* d
size_t delimiterIndex = w.find(delimiter); size_t delimiterIndex = w.find(delimiter);
size_t startIndex = 0; size_t startIndex = 0;
vector<wstring> serializedTokens = vector<wstring>(); vector<wstring> serializedTokens = vector<wstring>();
while (delimiterIndex != w.npos) while (delimiterIndex != wstring::npos)
{ {
serializedTokens.push_back(w.substr(startIndex, delimiterIndex - startIndex)); serializedTokens.push_back(w.substr(startIndex, delimiterIndex - startIndex));
startIndex = delimiterIndex + (int)wcslen(delimiter); startIndex = delimiterIndex + (int)wcslen(delimiter);
@ -891,7 +891,7 @@ void UnitConverter::Calculate()
m_returnDisplay = RoundSignificant(returnValue, precision); m_returnDisplay = RoundSignificant(returnValue, precision);
TrimString(m_returnDisplay); TrimString(m_returnDisplay);
} }
m_returnHasDecimal = (m_returnDisplay.find(L'.') != m_returnDisplay.npos); m_returnHasDecimal = (m_returnDisplay.find(L'.') != wstring::npos);
} }
} }
UpdateViewModel(); UpdateViewModel();
@ -930,11 +930,11 @@ unsigned int UnitConverter::GetNumberSignificantDigits(std::wstring value)
{ {
TrimString(value); TrimString(value);
unsigned int numberSignificantDigits = static_cast<unsigned int>(value.size()); unsigned int numberSignificantDigits = static_cast<unsigned int>(value.size());
if (value.find(L'.') != value.npos) if (value.find(L'.') != wstring::npos)
{ {
--numberSignificantDigits; --numberSignificantDigits;
} }
if (value.find(L'-') != value.npos) if (value.find(L'-') != wstring::npos)
{ {
--numberSignificantDigits; --numberSignificantDigits;
} }