[patch] Fixed calling of kMin() and kMax(), now it can be compiled and it works

kMinkMax.patch (text/plain), 2.28 KB, created by Marek Cruz on 2008-01-21 05:04:43 UTC

--- kdeui/knuminput.cpp	2005-10-10 17:06:38.000000000 +0200
+++ kdeui/knuminput.cpp	2008-01-21 04:28:06.000000000 +0100
@@ -567,14 +567,14 @@
 KDoubleNumInput::KDoubleNumInput(double value, QWidget *parent, const char *name)
     : KNumInput(parent, name)
 {
-    init(value, kMin(0.0, value), kMax(0.0, value), 0.01, 2 );
+    init(value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
 }
 
 KDoubleNumInput::KDoubleNumInput(KNumInput* below, double value, QWidget* parent,
                                  const char* name)
     : KNumInput(below, parent, name)
 {
-    init( value, kMin(0.0, value), kMax(0.0, value), 0.01, 2 );
+    init( value, kMin((double)0, value), kMax((double)0, value), 0.01, 2 );
 }
 
 KDoubleNumInput::~KDoubleNumInput()
--- khtml/css/cssparser.cpp	2008-01-21 05:46:55.000000000 +0100
+++ khtml/css/cssparser.cpp	2008-01-21 05:48:40.000000000 +0100
@@ -1997,7 +1997,7 @@
         v = args->next();
         if (!validUnit(v, FNumber, true))
             return false;
-        colorArray[3] = static_cast<int>(kMax(0.0, kMin(1.0, v->fValue)) * 255);
+        colorArray[3] = static_cast<int>(kMax((double)0, kMin((double)1, v->fValue)) * 255);
     }
     return true;
 }
@@ -2015,7 +2015,7 @@
     if (!validUnit(v, FInteger, true))
         return false;
     // normalize the Hue value and change it to be between 0 and 1.0
-    colorArray[0] = (((static_cast<int>(v->fValue) % 360) + 360) % 360) / 360.0;
+    colorArray[0] = (((static_cast<int>(v->fValue) % 360) + 360) % 360) / 360;
     for (int i = 1; i < 3; i++) {
         v = args->next();
         if (v->unit != Value::Operator && v->iValue != ',')
@@ -2023,7 +2023,7 @@
         v = args->next();
         if (!validUnit(v, FPercent, true))
             return false;
-        colorArray[i] = kMax(0.0, kMin(100.0, v->fValue)) / 100.0; // needs to be value between 0 and 1.0
+        colorArray[i] = kMax((double)0, kMin((double)100, v->fValue)) / 100; // needs to be value between 0 and 1.0
     }
     if (parseAlpha) {
         v = args->next();
@@ -2032,7 +2032,7 @@
         v = args->next();
         if (!validUnit(v, FNumber, true))
             return false;
-        colorArray[3] = kMax(0.0, kMin(1.0, v->fValue));
+        colorArray[3] = kMax((double)0, kMin((double)1, v->fValue));
     }
     return true;
 }