filelight: always use qSin() and qCos() for calculations

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

diff --git a/filelight/src/part/radialMap/labels.cpp b/filelight/src/part/radialMap/labels.cpp
index 22ddead..932f275 100644 (file)
--- a/filelight/src/part/radialMap/labels.cpp
+++ b/filelight/src/part/radialMap/labels.cpp
@@ -27,7 +27,6 @@
 #include "part/Config.h"
 #include "part/fileTree.h"
 #include "radialMap.h"
-#include "sincos.h"
 #include "widget.h"
 
 
@@ -230,8 +229,8 @@ RadialMap::Widget::paintExplodedLabels(QPainter &paint) const
             rightSide = ((*it)->angle < 1440 || (*it)->angle > 4320);
 
             ra = M_PI/2880 * (*it)->angle; //convert to radians
-            sincos(ra, &sinra, &cosra);
-
+            sinra = qSin(ra);
+            cosra = qCos(ra);
 
             spacer = preSpacer + m_map.m_ringBreadth * (*it)->lvl;
 

diff --git a/filelight/src/part/radialMap/map.cpp b/filelight/src/part/radialMap/map.cpp
index db29f40..b5ccfcb 100644 (file)
--- a/filelight/src/part/radialMap/map.cpp
+++ b/filelight/src/part/radialMap/map.cpp
@@ -32,8 +32,6 @@
 #include "builder.h"
 #include "part/Config.h"
 #include "part/fileTree.h"
-#define SINCOS_H_IMPLEMENTATION (1)
-#include "sincos.h"
 #include "widget.h"
 
 RadialMap::Map::Map(bool summary)
@@ -330,7 +328,8 @@ void RadialMap::Map::paint(bool antialias)
 
                     if (i == 2)
                         radius += 5;
-                    sincos(ra, &sinra, &cosra);
+                    sinra = qSin(ra);
+                    cosra = qCos(ra);
                     pos.rx() = cpos.x() + static_cast<int>(cosra * radius);
                     pos.ry() = cpos.y() - static_cast<int>(sinra * radius);
                     pts.setPoint(i, pos);

diff --git a/filelight/src/part/radialMap/sincos.h b/filelight/src/part/radialMap/sincos.h
deleted file mode 100644 (file)
index 2fe716d..0000000
--- a/filelight/src/part/radialMap/sincos.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/***********************************************************************
-* Copyright 2003-2004  Max Howell <max.howell@methylblue.com>
-* Copyright 2008-2009  Martin Sandsmark <martin.sandsmark@kde.org>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
-* defined in Section 14 of version 3 of the license.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-***********************************************************************/
-
-#ifndef SINCOS_H
-#define SINCOS_H
-
-#include <math.h>
-
-#if !defined(__GLIBC__) || (__GLIBC__ < 2) ||  (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
-
-#include <qmath.h>
-
-void
-sincos(double angleRadians, double *Sin, double *Cos);
-
-#ifdef SINCOS_H_IMPLEMENTATION
-void
-sincos(double angleRadians, double *Sin, double *Cos)
-{
-    *Sin = qSin(angleRadians);
-    *Cos = qCos(angleRadians);
-}
-#endif
-
-#endif
-
-#endif