diff --git a/common/libeval/numeric_evaluator.cpp b/common/libeval/numeric_evaluator.cpp index bb2ac5dec6..c6e98cccfd 100644 --- a/common/libeval/numeric_evaluator.cpp +++ b/common/libeval/numeric_evaluator.cpp @@ -214,7 +214,7 @@ bool NUMERIC_EVALUATOR::IsOldSchoolDecimalSeparator( wxUniChar ch, double* siSca // Limited version of above for 8-bit chars -bool NUMERIC_EVALUATOR::isOldSchoolDecimalSeparator( char ch, double* siScaler ) +bool NUMERIC_EVALUATOR::IsOldSchoolDecimalSeparator( char ch, double* siScaler ) { switch( ch ) { @@ -242,7 +242,7 @@ bool NUMERIC_EVALUATOR::IsDecimalSeparator( char ch, char localeSeparator, bool if( ch == localeSeparator || ch == '.' || ch == ',' ) return true; - if( allowInfixNotation && isOldSchoolDecimalSeparator( ch, &dummy ) ) + if( allowInfixNotation && IsOldSchoolDecimalSeparator( ch, &dummy ) ) return true; return false; @@ -294,7 +294,7 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken() else haveSeparator = true; - if( isOldSchoolDecimalSeparator( ch, &siScaler ) ) + if( IsOldSchoolDecimalSeparator( ch, &siScaler ) ) *aScaler = siScaler; m_token.token[ idx++ ] = m_localeDecimalSeparator; @@ -410,7 +410,7 @@ NUMERIC_EVALUATOR::Token NUMERIC_EVALUATOR::getToken() return Unit::Mil; } - if( allowInfix && sizeLeft >= 1 && isOldSchoolDecimalSeparator( ch, siScaler ) ) + if( allowInfix && sizeLeft >= 1 && IsOldSchoolDecimalSeparator( ch, siScaler ) ) { m_token.pos++; return Unit::SI; diff --git a/include/libeval/numeric_evaluator.h b/include/libeval/numeric_evaluator.h index e4596cd02b..c61947506b 100644 --- a/include/libeval/numeric_evaluator.h +++ b/include/libeval/numeric_evaluator.h @@ -157,7 +157,7 @@ public: void ClearVar() { m_varMap.clear(); } static bool IsOldSchoolDecimalSeparator( wxUniChar ch, double* siScaler ); - static bool isOldSchoolDecimalSeparator( char ch, double* siScaler ); + static bool IsOldSchoolDecimalSeparator( char ch, double* siScaler ); static bool IsDecimalSeparator( char ch, char localeSeparator, bool allowInfixNotation ); static bool IsDigit( char ch );