From 9aa67cf0c48ff8e9e73fc19c4dcd950961b5ad54 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 31 Aug 2012 11:53:34 +0200 Subject: [PATCH] Fix the name of the arguments of qAtan2 to match std::atan2 There is no change in functionality, just swapping of the names x and y. The std::atan2 function uses (y, x) in that order, so we should too. Task-number: QTBUG-27090 Change-Id: I7d4597a6c6909f574c517033f5d49fe17b7a7ead Reviewed-by: Oswald Buddenhagen --- src/corelib/kernel/qmath.h | 6 +++--- src/corelib/kernel/qmath.qdoc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index 309564b..f5aca27 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -145,14 +145,14 @@ inline qreal qAtan(qreal v) return atan(v); } -inline qreal qAtan2(qreal x, qreal y) +inline qreal qAtan2(qreal y, qreal x) { #ifdef QT_USE_MATH_H_FLOATS if (sizeof(qreal) == sizeof(float)) - return atan2f(float(x), float(y)); + return atan2f(float(y), float(x)); else #endif - return atan2(x, y); + return atan2(y, x); } inline qreal qSqrt(qreal v) diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc index cba19a8..0df208d 100644 --- a/src/corelib/kernel/qmath.qdoc +++ b/src/corelib/kernel/qmath.qdoc @@ -114,9 +114,9 @@ */ /*! - \fn qreal qAtan2(qreal x, qreal y) - Returns the arctangent of a point specified by the coordinates \a x and \a y. - This function will return the angle and its direction. + \fn qreal qAtan2(qreal y, qreal x) + Returns the arctangent of a point specified by the coordinates \a y and \a x. + This function will return the angle (argument) of that point. \relates \sa qAtan() -- 2.7.4