Math functions in namespace std:: ; gcc likes it either way but not everyone does. Also use standard math.h #define which, at 1.57079632679489661923, has way more significant others than before.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=746995
This commit is contained in:
Adriaan de Groot 2007-12-10 19:52:29 +00:00
parent 03436aad7d
commit ce8d1ede68

View File

@ -27,6 +27,7 @@
#include <KIcon> #include <KIcon>
#include <cmath> #include <cmath>
#include <math.h>
#include "applet.h" #include "applet.h"
#include "containment.h" #include "containment.h"
@ -236,7 +237,7 @@ void AppletHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
qreal _k_distanceForPoint(QPointF point) qreal _k_distanceForPoint(QPointF point)
{ {
return ::sqrt(point.x()*point.x()+point.y()*point.y()); return std::sqrt(point.x()*point.x()+point.y()*point.y());
} }
qreal _k_angleForPoints(const QPointF &center, const QPointF &pt1, const QPointF &pt2) qreal _k_angleForPoints(const QPointF &center, const QPointF &pt1, const QPointF &pt2)
@ -244,15 +245,15 @@ qreal _k_angleForPoints(const QPointF &center, const QPointF &pt1, const QPointF
QPointF vec1 = pt1 - center; QPointF vec1 = pt1 - center;
QPointF vec2 = pt2 - center; QPointF vec2 = pt2 - center;
qreal alpha = ::atan2(vec1.y(), vec1.x()); qreal alpha = std::atan2(vec1.y(), vec1.x());
qreal beta = ::atan2(vec2.y(), vec2.x()); qreal beta = std::atan2(vec2.y(), vec2.x());
return beta - alpha; return beta - alpha;
} }
void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void AppletHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{ {
static const qreal snapAngle = 3.14159 / 2.0; static const qreal snapAngle = M_PI_2 /* $i 3.14159 / 2.0 */;
if (!m_applet) { if (!m_applet) {
QGraphicsItem::mouseMoveEvent(event); QGraphicsItem::mouseMoveEvent(event);