[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2010-11-12 15:23:22
Message-ID: 20101112152322.C74CAAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196092 by mkruisselbrink:

revert r1171729, as those changes broke compilation on platforms where qreal != \
double


 M  +3 -3      khtml/css/cssparser.cpp  
 M  +4 -2      kio/kfile/kfilemetainfowidget.cpp  
 M  +2 -2      kio/kfile/kimagefilepreview.cpp  
 M  +3 -3      plasma/deprecated/animator.cpp  
 M  +1 -1      plasma/private/applethandle.cpp  


--- trunk/KDE/kdelibs/khtml/css/cssparser.cpp #1196091:1196092
@@ -2346,7 +2346,7 @@
         v = args->next();
         if (!validUnit(v, FNumber, true))
             return false;
-        colorArray[3] = static_cast<int>(qMax(qreal(0.0), qMin(qreal(1.0), \
v->fValue)) * 255); +        colorArray[3] = static_cast<int>(qMax(0.0, qMin(1.0, \
v->fValue)) * 255);  }
     return true;
 }
@@ -2372,7 +2372,7 @@
         v = args->next();
         if (!validUnit(v, FPercent, true))
             return false;
-        colorArray[i] = qMax(qreal(0.0), qMin(qreal(100.0), v->fValue)) / 100.0; // \
needs to be value between 0 and 1.0 +        colorArray[i] = qMax(0.0, qMin(100.0, \
v->fValue)) / 100.0; // needs to be value between 0 and 1.0  }
     if (parseAlpha) {
         v = args->next();
@@ -2381,7 +2381,7 @@
         v = args->next();
         if (!validUnit(v, FNumber, true))
             return false;
-        colorArray[3] = qMax(qreal(0.0), qMin(qreal(1.0), v->fValue));
+        colorArray[3] = qMax(0.0, qMin(1.0, v->fValue));
     }
     return true;
 }
--- trunk/KDE/kdelibs/kio/kfile/kfilemetainfowidget.cpp #1196091:1196092
@@ -273,10 +273,12 @@
 QWidget* KFileMetaInfoWidget::makeDoubleWidget()
 {
     double value = d->m_item.value().toDouble();
-    KDoubleNumInput* dni = new KDoubleNumInput(qMin(qreal(0.0),value),
-                                               qMax(qreal(0.0),value),
+    
+    KDoubleNumInput* dni = new KDoubleNumInput(qMin(0.0,value),
+                                               qMax(0.0,value),
                                                value, this, 0.01 ,2);
 
+
     if (d->m_validator) {
         if (QDoubleValidator* dv = qobject_cast<QDoubleValidator*>(d->m_validator)) \
{  dni->setMinimum(dv->bottom());
--- trunk/KDE/kdelibs/kio/kfile/kimagefilepreview.cpp #1196091:1196092
@@ -235,8 +235,8 @@
 
     imageLabel->setPixmap(pm);
 
-    m_pmCurrentOpacity = qMax(m_pmCurrentOpacity - 0.4, qreal(0.0));
-    m_pmTransitionOpacity = qMin(m_pmTransitionOpacity + 0.4, qreal(1.0));
+    m_pmCurrentOpacity = qMax(m_pmCurrentOpacity - 0.4, 0.0);
+    m_pmTransitionOpacity = qMin(m_pmTransitionOpacity + 0.4, 1.0);
 }
 
 void KImageFilePreview::KImageFilePreviewPrivate::_k_slotFinished()
--- trunk/KDE/kdelibs/plasma/deprecated/animator.cpp #1196091:1196092
@@ -257,7 +257,7 @@
     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 @@
      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 @@
     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));
--- trunk/KDE/kdelibs/plasma/private/applethandle.cpp #1196091:1196092
@@ -236,7 +236,7 @@
                 //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 {


[prev in list] [next in list] [prev in thread] [next in thread]