From cf3951ad2029f95ae75ce973b1bc3c4e579f17fe Mon Sep 17 00:00:00 2001
From: Marijn Kruisselbrink <m.kruisselbrink@student.tue.nl>
Date: Fri, 12 Nov 2010 15:23:22 +0000
Subject: [PATCH] revert r1171729, as those changes broke compilation on
 platforms where qreal != double

svn path=/trunk/KDE/kdelibs/; revision=1196092
---
 deprecated/animator.cpp  | 6 +++---
 private/applethandle.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deprecated/animator.cpp b/deprecated/animator.cpp
index 31baadb14..3c20a07b7 100644
--- a/deprecated/animator.cpp
+++ b/deprecated/animator.cpp
@@ -257,7 +257,7 @@ int Animator::animateItem(QGraphicsItem *item, Animation animation)
     state->item = item;
     state->animation = animation;
     state->curve = d->driver->animationCurve(animation);
-    state->frames = qMax(qreal(1.0), frames * (duration / 1000.0));
+    state->frames = qMax(1.0, frames * (duration / 1000.0));
     state->currentFrame = 0;
     state->interval = d->driver->animationDuration(animation) / qreal(state->frames);
     state->interval = qMax(MIN_TICK_RATE_INT, state->interval - (state->interval % MIN_TICK_RATE_INT));
@@ -312,7 +312,7 @@ int Animator::moveItem(QGraphicsItem *item, Movement movement, const QPoint &des
      state->movement = movement;
      state->curve = d->driver->movementAnimationCurve(movement);
      int duration = d->driver->movementAnimationDuration(movement);
-     state->frames = qMax(qreal(1.0), frames * (duration / 1000.0));
+     state->frames = qMax(1.0, frames * (duration / 1000.0));
      state->currentFrame = 0;
      state->interval = duration / qreal(state->frames);
      state->interval = qMax(MIN_TICK_RATE_INT, state->interval - (state->interval % MIN_TICK_RATE_INT));
@@ -438,7 +438,7 @@ int Animator::animateElement(QGraphicsItem *item, Animation animation)
     state->item = item;
     state->curve = d->driver->elementAnimationCurve(animation);
     state->animation = animation;
-    state->frames = qMax(qreal(1.0), frames * (duration / 1000.0));
+    state->frames = qMax(1.0, frames * (duration / 1000.0));
     state->currentFrame = 0;
     state->interval = duration / qreal(state->frames);
     state->interval = qMax(MIN_TICK_RATE_INT, state->interval - (state->interval % MIN_TICK_RATE_INT));
diff --git a/private/applethandle.cpp b/private/applethandle.cpp
index 75c2d2caf..dc956fe69 100644
--- a/private/applethandle.cpp
+++ b/private/applethandle.cpp
@@ -236,7 +236,7 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
                 //kDebug() << "opaquePoint" << opaquePoint
                 //         << m_background->marginSize(LeftMargin) << m_decorationRect.width();
                 g.setColorAt(0.0, Qt::transparent);
-                g.setColorAt(qMax(qreal(0.0), opaquePoint - 0.05), Qt::transparent);
+                g.setColorAt(qMax(0.0, opaquePoint - 0.05), Qt::transparent);
                 g.setColorAt(opaquePoint, transparencyColor);
                 g.setColorAt(1.0, transparencyColor);
             } else {