Revert "Fix use of qMax() with floating point constants"

This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850

Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index d591c34..eb00ec8 100644 (file)
--- 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 c870ec8..bf7cb49 100644 (file)
--- 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(),