diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-01-14 11:17:47 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-02-16 16:21:15 +0000 |
commit | 515e802ae20c045e5c47b400ee6ef6e92349c978 (patch) | |
tree | f9f4be4c9e360611b5823ef28c2cb293733aee42 /examples/corelib | |
parent | 3d835eb62e70435fe32318441dc7c10aba3a6fba (diff) | |
download | qtbase-515e802ae20c045e5c47b400ee6ef6e92349c978.tar.gz |
Use C++ <cmath> instead of <math.h>
Including math.h can pollute the default namespace, and break
some compilers if cmath versions of the method are declared as using.
Switching to C++ math functions also greatly simplifies handling of
float qreal as C++ automatically chooses the right method.
[ChangeLog][QtCore][QtMath] qmath.h no longer includes math.h, so any
sources depending on that indirect inclusion may fail to build.
Change-Id: I4d0e331dafba354ec05dc5052e61ef4ff8d387fe
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'examples/corelib')
-rw-r--r-- | examples/corelib/threads/mandelbrot/renderthread.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/examples/corelib/threads/mandelbrot/renderthread.cpp b/examples/corelib/threads/mandelbrot/renderthread.cpp index e114fa0e7e..d52a5f2320 100644 --- a/examples/corelib/threads/mandelbrot/renderthread.cpp +++ b/examples/corelib/threads/mandelbrot/renderthread.cpp @@ -41,8 +41,7 @@ #include "renderthread.h" #include <QtWidgets> - -#include <math.h> +#include <cmath> //! [0] RenderThread::RenderThread(QObject *parent) @@ -207,9 +206,9 @@ uint RenderThread::rgbFromWaveLength(double wave) else if (wave < 420.0) s = 0.3 + 0.7 * (wave - 380.0) / (420.0 - 380.0); - r = pow(r * s, 0.8); - g = pow(g * s, 0.8); - b = pow(b * s, 0.8); + r = std::pow(r * s, 0.8); + g = std::pow(g * s, 0.8); + b = std::pow(b * s, 0.8); return qRgb(int(r * 255), int(g * 255), int(b * 255)); } //! [10] |