Final round of dialogs/forms needing to be converted from Qt3 to 4

[architektonas] / src / base / rs_math.h

diff --git a/src/base/rs_math.h b/src/base/rs_math.h
index b225d691ab8e381ba7f8d507073e43e50dabcd08..4f8f87483ce2f47d39c5fe2bd1ce1e4dc444407d 100644 (file)
--- a/src/base/rs_math.h
+++ b/src/base/rs_math.h
@@ -7,22 +7,12 @@
 //#define _MT
 //#endif
 
-#include <math.h>
-#include <errno.h>
 #include <QtCore>
 
-#ifndef RS_NO_FPARSER
-#include "fparser.h"
-#endif
-
-#include "rs.h"
-
 #define ARAD                           57.29577951308232
 #define RS_TOLERANCE           1.0e-10
 #define RS_TOLERANCE_ANGLE     1.0e-8
 
-//typedef unsigned int uint;
-
 /**
  * Math functions.
  */
@@ -31,9 +21,6 @@ class RS_Math
 public:
        static int round(double v);
        static double pow(double x, double y);
-
-       //static double abs(double v);
-       //static int abs(int v);
        static double rad2deg(double a);
        static double deg2rad(double a);
        static double rad2gra(double a);
@@ -46,11 +33,7 @@ public:
        static bool isSameDirection(double dir1, double dir2, double tol);
        static double eval(const QString & expr, double def = 0.0);
        static bool cmpDouble(double v1, double v2, double tol = 0.001);
-
-       // Keep that in the header file for dynamic inclusion/exclusion.
-       // (JLH: What kind of boneheaded crappy justification is that??!!??!!?)
        static double eval(const QString & expr, bool * ok);
-
        static QString doubleToString(double value, double prec);
        static QString doubleToString(double value, int prec);