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 /src/corelib/doc | |
parent | 3d835eb62e70435fe32318441dc7c10aba3a6fba (diff) |
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 'src/corelib/doc')
-rw-r--r-- | src/corelib/doc/snippets/code/doc_src_qiterator.cpp | 6 | ||||
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp index e37212b475..c311db957c 100644 --- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp @@ -257,7 +257,7 @@ while (i.hasNext()) { QMutableListIterator<double> i(list); while (i.hasNext()) { double val = i.next(); - i.setValue(sqrt(val)); + i.setValue(std::sqrt(val)); } //! [23] @@ -266,7 +266,7 @@ while (i.hasNext()) { QMutableLinkedListIterator<double> i(list); while (i.hasNext()) { double val = i.next(); - i.setValue(sqrt(val)); + i.setValue(std::sqrt(val)); } //! [24] @@ -275,7 +275,7 @@ while (i.hasNext()) { QMutableVectorIterator<double> i(list); while (i.hasNext()) { double val = i.next(); - i.setValue(sqrt(val)); + i.setValue(std::sqrt(val)); } //! [25] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp index 17a252cc1b..b545c2dad8 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp @@ -105,7 +105,7 @@ MyWidget::mouseMoveEvent(QMouseEvent *event) //! [8] -double trueLength = sqrt(pow(x(), 2) + pow(y(), 2)); +double trueLength = std::sqrt(std::pow(x(), 2) + std::pow(y(), 2)); //! [8] |