move some constants to qcorecommon_p header

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/qcorecommon_p.h b/src/core/qcorecommon_p.h
index 576cc52..99e6bb7 100644 (file)
--- a/src/core/qcorecommon_p.h
+++ b/src/core/qcorecommon_p.h
@@ -22,6 +22,9 @@ QT_BEGIN_NAMESPACE
     arraytype arrayname[arraysize]; \
     ::memset(arrayname, 0, arraysize * sizeof(arraytype));
 
+static const qreal q_deg2rad = qreal(0.01745329251994329576923690768489); /* pi/180 */
+static const qreal q_rad2deg = qreal(57.295779513082320876798154814105); /* 180/pi */
+
 static inline uint foldCase(const ushort *ch, const ushort *start)
 {
     uint c = *ch;

diff --git a/src/core/tools/qline.cpp b/src/core/tools/qline.cpp
index 4c90113..7020fd1 100644 (file)
--- a/src/core/tools/qline.cpp
+++ b/src/core/tools/qline.cpp
@@ -24,6 +24,7 @@
 #include "qdatastream.h"
 #include "qmath.h"
 #include "qnumeric.h"
+#include "qcorecommon_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -282,16 +283,6 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
 #endif // QT_NO_DATASTREAM
 
-inline static qreal q_deg2rad(qreal x)
-{
-    return x * qreal(0.01745329251994329576923690768489);    /* pi/180 */
-}
-
-inline static qreal q_rad2deg(qreal x)
-{
-    return x * qreal(57.295779513082320876798154814105);    /* 180/pi */
-}
-
 /*!
     \class QLineF
     \ingroup painting
@@ -563,7 +554,7 @@ qreal QLineF::angle() const
     const qreal dx = pt2.x() - pt1.x();
     const qreal dy = pt2.y() - pt1.y();
 
-    const qreal theta = q_rad2deg(qAtan2(-dy, dx));
+    const qreal theta = (qAtan2(-dy, dx) * q_rad2deg);
 
     const qreal theta_normalized = theta < 0 ? theta + 360 : theta;
 
@@ -587,7 +578,7 @@ qreal QLineF::angle() const
 */
 void QLineF::setAngle(qreal angle)
 {
-    const qreal angleR = q_deg2rad(angle);
+    const qreal angleR = (angle * q_deg2rad);
     const qreal l = length();
 
     const qreal dx = qCos(angleR) * l;
@@ -609,7 +600,7 @@ void QLineF::setAngle(qreal angle)
 */
 QLineF QLineF::fromPolar(qreal length, qreal angle)
 {
-    const qreal angleR = q_deg2rad(angle);
+    const qreal angleR = (angle * q_deg2rad);
     return QLineF(0, 0, qCos(angleR) * length, -qSin(angleR) * length);
 }
 
@@ -801,7 +792,7 @@ qreal QLineF::angle(const QLineF &l) const
     qreal cos_line = (dx()*l.dx() + dy()*l.dy()) / (length()*l.length());
     // only accept cos_line in the range [-1,1], if it is outside, use 0 (we return 0 rather than PI for those cases)
     if (cos_line >= qreal(-1.0) && cos_line <= qreal(1.0))
-        return q_rad2deg(qAcos(cos_line));
+        return (qAcos(cos_line) * q_rad2deg);
     return 0;
 }
 

diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 3b1e958..edec5a3 100644 (file)
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -26,7 +26,7 @@
 #include "qpainterpath.h"
 #include "qvariant.h"
 #include "qmath.h"
-#include "qguicommon_p.h"
+#include "qcorecommon_p.h"
 
 #include <limits.h>
 
@@ -880,7 +880,7 @@ QMatrix &QMatrix::rotate(qreal a)
     else if (a == 180.)
         cosa = -1.;
     else{
-        qreal b = deg2rad*a;                        // convert to radians
+        qreal b = q_deg2rad*a;        // convert to radians
         sina = qSin(b);               // fast and convenient
         cosa = qCos(b);
     }

diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 012710a..c8f2bb5 100644 (file)
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -30,6 +30,7 @@
 #include "qnumeric.h"
 #include "qbezier_p.h"
 #include "qguicommon_p.h"
+#include "qcorecommon_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -599,7 +600,7 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis)
     else if (a == 180.)
         cosa = -1.;
     else{
-        qreal b = deg2rad*a;          // convert to radians
+        qreal b = q_deg2rad*a;          // convert to radians
         sina = qSin(b);               // fast and convenient
         cosa = qCos(b);
     }

diff --git a/src/gui/qguicommon_p.h b/src/gui/qguicommon_p.h
index 1cab020..ce1b710 100644 (file)
--- a/src/gui/qguicommon_p.h
+++ b/src/gui/qguicommon_p.h
@@ -372,7 +372,6 @@ inline static int lowest_bit(uint v)
     return i==32 ? -1 : i;
 }
 
-static const qreal deg2rad = qreal(0.017453292519943295769);        // pi/180
 static const qreal inv_dist_to_plane = 1. / 1024.;
 
 #ifndef QT_NO_IMAGEFORMAT_XPM

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 1fd938b..de9a0ca 100644 (file)
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -1026,13 +1026,11 @@ static QMatrix parseTransformationMatrix(const QStringRef &value)
         } else if (state == SkewX) {
             if (points.count() != 1)
                 goto error;
-            const qreal deg2rad = qreal(0.017453292519943295769);
-            matrix.shear(qTan(points[0]*deg2rad), 0);
+            matrix.shear(qTan(points[0]*q_deg2rad), 0);
         } else if (state == SkewY) {
             if (points.count() != 1)
                 goto error;
-            const qreal deg2rad = qreal(0.017453292519943295769);
-            matrix.shear(0, qTan(points[0]*deg2rad));
+            matrix.shear(0, qTan(points[0]*q_deg2rad));
         }
     }
   error:

diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 0bca7d4..4e6a0d3 100644 (file)
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -27,13 +27,13 @@
 #include "qsvggraphics_p.h"
 #include "qsvgnode_p.h"
 #include "qsvgtinydocument_p.h"
-
 #include "qpainter.h"
 #include "qpair.h"
 #include "qcolor.h"
 #include "qdebug.h"
 #include "qmath.h"
 #include "qnumeric.h"
+#include "qcorecommon_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -651,7 +651,6 @@ void QSvgAnimateTransform::revert(QPainter *p, QSvgExtraStates &)
 
 void QSvgAnimateTransform::resolveMatrix(const QSvgNode *node)
 {
-    static const qreal deg2rad = qreal(0.017453292519943295769);
     qreal totalTimeElapsed = node->document()->currentElapsed();
     if (totalTimeElapsed < m_from || m_finished)
         return;
@@ -751,7 +750,7 @@ void QSvgAnimateTransform::resolveMatrix(const QSvgNode *node)
         qreal transXDiff = (to1-from1) * percentOfAnimation;
         qreal transX = from1 + transXDiff;
         m_transform = QTransform();
-        m_transform.shear(qTan(transX * deg2rad), 0);
+        m_transform.shear(qTan(transX * q_deg2rad), 0);
         break;
     }
     case SkewY: {
@@ -766,7 +765,7 @@ void QSvgAnimateTransform::resolveMatrix(const QSvgNode *node)
         qreal transYDiff = (to1 - from1) * percentOfAnimation;
         qreal transY = from1 + transYDiff;
         m_transform = QTransform();
-        m_transform.shear(0, qTan(transY * deg2rad));
+        m_transform.shear(0, qTan(transY * q_deg2rad));
         break;
     }
     default: