diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-31 15:17:39 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 09:56:40 +0100 |
| commit | cf6ef44ffd348fbfabadde7e5ed7aae02daedbc6 (patch) | |
| tree | 051192a103bc49b67970e6c204bb4cc83902db6b /src | |
| parent | 9c4547eea38622fd7d4f7f6fee413bf5fb3a5ba7 (diff) | |
Revert "Fix use of qMax() with floating point constants"
This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850
Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qcosmeticstroker.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/styles/qstylehelper.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp index d591c3490a..eb00ec87d8 100644 --- a/src/gui/painting/qcosmeticstroker.cpp +++ b/src/gui/painting/qcosmeticstroker.cpp @@ -258,12 +258,12 @@ void QCosmeticStroker::setup() patternLength = 0; for (int i = 0; i < patternSize; ++i) { - patternLength += (int) qMax(qreal(1.) , penPattern.at(i)*64.); + patternLength += (int) qMax(1. , penPattern.at(i)*64.); pattern[i] = patternLength; } patternLength = 0; for (int i = 0; i < patternSize; ++i) { - patternLength += (int) qMax(qreal(1.), penPattern.at(patternSize - 1 - i)*64.); + patternLength += (int) qMax(1., penPattern.at(patternSize - 1 - i)*64.); reversePattern[i] = patternLength; } strokeSelection |= Dashed; diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index c870ec81e5..bf7cb49bcf 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -246,7 +246,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter) if (enabled) { // Drop shadow - qreal shadowSize = qMax(qreal(1.0), penSize/2.0); + qreal shadowSize = qMax(1.0, penSize/2.0); QRectF shadowRect= br.adjusted(-2*shadowSize, -2*shadowSize, 2*shadowSize, 2*shadowSize); QRadialGradient shadowGradient(shadowRect.center().x(), |