diff --git a/common/libeval/numeric_evaluator.cpp b/common/libeval/numeric_evaluator.cpp index 753d27a9a6..73f90677a7 100644 --- a/common/libeval/numeric_evaluator.cpp +++ b/common/libeval/numeric_evaluator.cpp @@ -43,7 +43,7 @@ namespace numEval } /* namespace numEval */ -NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils ) +NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits ) { struct lconv* lc = localeconv(); m_localeDecimalSeparator = *lc->decimal_point; @@ -55,17 +55,10 @@ NUMERIC_EVALUATOR::NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils ) switch( aUnits ) { - case EDA_UNITS::INCHES: - if( aUseMils ) - m_defaultUnits = Unit::Mil; - else - m_defaultUnits = Unit::Inch; - break; - case EDA_UNITS::MILLIMETRES: - m_defaultUnits = Unit::MM; - break; - default:m_defaultUnits = Unit::MM; - break; + case EDA_UNITS::MILLIMETRES: m_defaultUnits = Unit::MM; break; + case EDA_UNITS::MILS: m_defaultUnits = Unit::Mil; break; + case EDA_UNITS::INCHES: m_defaultUnits = Unit::Inch; break; + default: m_defaultUnits = Unit::MM; break; } } diff --git a/include/libeval/numeric_evaluator.h b/include/libeval/numeric_evaluator.h index 8b93955e60..3dd94c2878 100644 --- a/include/libeval/numeric_evaluator.h +++ b/include/libeval/numeric_evaluator.h @@ -96,7 +96,7 @@ class NUMERIC_EVALUATOR enum class Unit { Invalid, MM, CM, Inch, Mil }; public: - NUMERIC_EVALUATOR( EDA_UNITS aUnits, bool aUseMils = false ); + NUMERIC_EVALUATOR( EDA_UNITS aUnits ); ~NUMERIC_EVALUATOR(); /* clear() should be invoked by the client if a new input string is to be processed. It diff --git a/qa/common/libeval/test_numeric_evaluator.cpp b/qa/common/libeval/test_numeric_evaluator.cpp index 12426188ff..e9c7fa3ac6 100644 --- a/qa/common/libeval/test_numeric_evaluator.cpp +++ b/qa/common/libeval/test_numeric_evaluator.cpp @@ -32,7 +32,7 @@ struct NUM_EVAL_FIXTURE { - NUM_EVAL_FIXTURE() : m_eval( EDA_UNITS::MILLIMETRES, false ) + NUM_EVAL_FIXTURE() : m_eval( EDA_UNITS::MILLIMETRES ) { } @@ -232,4 +232,4 @@ BOOST_AUTO_TEST_CASE( ResultsInvalid ) } } -BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file +BOOST_AUTO_TEST_SUITE_END()