AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the name of the arguments of qAtan2 to match std::atan2

Browse Source 
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 <oswald.buddenhagen@nokia.com>
This commit is contained in:
Thiago Macieira 2012-08-31 11:53:34 +02:00 committed by Qt by Nokia
parent 0a0157f545
commit 9aa67cf0c4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qmath.h
View File

@ -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)

6
src/corelib/kernel/qmath.qdoc
View File

@ -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 <QtCore/qmath.h>
\sa qAtan()