From 360c5ef60402eefdeec2fdeb6d3633bb1a591c67 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 27 Feb 2017 23:03:07 +0200 Subject: [PATCH] Use Qt built in functions qRadiansToDegrees and qDegreesToRadians. --HG-- branch : develop --- src/libs/qmuparser/qmuparser.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index 544e1eb50..35f489bf6 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -47,13 +47,13 @@ namespace qmu // Trigonometric function qreal QmuParser::DegreeToRadian(qreal deg) { - return deg * M_PI / 180.0; + return qDegreesToRadians(deg); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::RadianToDegree(qreal rad) { - return rad * 180.0 / M_PI; + return qRadiansToDegrees(rad); } //--------------------------------------------------------------------------------------------------------------------- @@ -95,73 +95,73 @@ qreal QmuParser::ATanh(qreal v) //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::SinhD(qreal v) { - return RadianToDegree(sinh(v)); + return qRadiansToDegrees(sinh(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::CoshD(qreal v) { - return RadianToDegree(cosh(v)); + return qRadiansToDegrees(cosh(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::TanhD(qreal v) { - return RadianToDegree(tanh(v)); + return qRadiansToDegrees(tanh(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ASinhD(qreal v) { - return RadianToDegree(log(v + qSqrt(v * v + 1))); + return qRadiansToDegrees(log(v + qSqrt(v * v + 1))); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ACoshD(qreal v) { - return RadianToDegree(log(v + qSqrt(v * v - 1))); + return qRadiansToDegrees(log(v + qSqrt(v * v - 1))); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ATanhD(qreal v) { - return RadianToDegree(0.5 * log((1 + v) / (1 - v))); + return qRadiansToDegrees(0.5 * log((1 + v) / (1 - v))); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::SinD(qreal v) { - return RadianToDegree(qSin(v)); + return qRadiansToDegrees(qSin(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ASinD(qreal v) { - return RadianToDegree(qAsin(v)); + return qRadiansToDegrees(qAsin(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::CosD(qreal v) { - return RadianToDegree(qCos(v)); + return qRadiansToDegrees(qCos(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ACosD(qreal v) { - return RadianToDegree(qAcos(v)); + return qRadiansToDegrees(qAcos(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::TanD(qreal v) { - return RadianToDegree(qTan(v)); + return qRadiansToDegrees(qTan(v)); } //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ATanD(qreal v) { - return RadianToDegree(qAtan(v)); + return qRadiansToDegrees(qAtan(v)); } //---------------------------------------------------------------------------------------------------------------------