diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-22 14:26:27 (GMT) |
| commit | 5c90ec109b5aa4e20910cfa54b7f05631bc95d71 (patch) | |
| tree | 1d7109cc5a915e1a98c38f416b70cd9f0349ec62 /src/script/api/qscriptvalue.cpp | |
| parent | bff3c3daf29e581cd0b8b990491ff9444c63a3e9 (diff) | |
| parent | dbff78d964d1a034459074f168b505b41bab0c98 (diff) | |
| download | Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.zip Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.gz Qt-5c90ec109b5aa4e20910cfa54b7f05631bc95d71.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index b8340a7..26cd314 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -213,7 +213,7 @@ qint32 ToInt32(qsreal n) if (qIsNaN(n) || qIsInf(n) || (n == 0)) return 0; - double sign = (n < 0) ? -1.0 : 1.0; + qsreal sign = (n < 0) ? -1.0 : 1.0; qsreal abs_n = fabs(n); n = ::fmod(sign * ::floor(abs_n), D32); @@ -233,7 +233,7 @@ quint32 ToUint32(qsreal n) if (qIsNaN(n) || qIsInf(n) || (n == 0)) return 0; - double sign = (n < 0) ? -1.0 : 1.0; + qsreal sign = (n < 0) ? -1.0 : 1.0; qsreal abs_n = fabs(n); n = ::fmod(sign * ::floor(abs_n), D32); @@ -251,7 +251,7 @@ quint16 ToUint16(qsreal n) if (qIsNaN(n) || qIsInf(n) || (n == 0)) return 0; - double sign = (n < 0) ? -1.0 : 1.0; + qsreal sign = (n < 0) ? -1.0 : 1.0; qsreal abs_n = fabs(n); n = ::fmod(sign * ::floor(abs_n), D16); |