diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-02-13 12:02:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-19 10:49:03 +0000 |
| commit | 373ce8878321aa561b55131bada78ad4a2ce8427 (patch) | |
| tree | 0b64429ea79163f1f13b4073bbe60040047d0540 /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | 6f264b755501fd322d1e357187b42120210a7ba3 (diff) | |
Cleanup math function includes and usage
Use std::math on floats and doubles, and qMath on qreals, and only
include the math headers actually needed.
Change-Id: I1d511d7b1bac0050eaa947c7baee760b736858bf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 82a7080fc1..a589ae94c3 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -38,15 +38,10 @@ #include "qv4objectproto_p.h" #include "qv4mm_p.h" #include "qv4scopedvalue_p.h" -#include <QtCore/qnumeric.h> -#include <QtCore/qmath.h> + #include <QtCore/QDateTime> -#include <QtCore/QStringList> #include <QtCore/QDebug> -#include <cmath> -#include <qmath.h> -#include <qnumeric.h> -#include <cassert> +#include <QtCore/QStringList> #include <private/qqmljsengine_p.h> #include <private/qqmljslexer_p.h> @@ -55,6 +50,8 @@ #include <qv4jsir_p.h> #include <qv4codegen_p.h> +#include <cassert> + #ifndef Q_OS_WIN # include <time.h> # ifndef Q_OS_VXWORKS |