SVN commit 1045666 by jtamate:

http://reviewboard.kde.org/r/2025/


 M  +1 -1      css_base.cpp  
 M  +9 -3      css_mediaquery.cpp  
 M  +1 -2      cssstyleselector.cpp  


--- trunk/KDE/kdelibs/khtml/css/css_base.cpp #1045665:1045666
@@ -97,7 +97,7 @@
 
     CSSProperty *prop = new CSSProperty();
     prop->m_id = propId;
-    prop->setValue((CSSValueImpl *) parsedValue);
+    prop->setValue(const_cast<CSSValueImpl *>(parsedValue));
     prop->m_important = important;
 
     propList->append(prop);
--- trunk/KDE/kdelibs/khtml/css/css_mediaquery.cpp #1045665:1045666
@@ -373,9 +373,11 @@
     }
     if (numColors == INT_MAX)
         numColors = UINT_MAX;
-    float number;
     if (value)
+    {
+        float number = 0;
         return numberValue(value, number) && compareValue(numColors, static_cast<unsigned int>(number), op);
+    }
 
     return numColors;
 }
@@ -397,9 +399,11 @@
         if (QColormap::instance(sn).mode() != QColormap::Gray )
             bitsPerComponent = QApplication::desktop()->screen(sn)->depth()/3;
     }
-    float number;
     if (value && bitsPerComponent)
+    {
+        float number = 0;
         return numberValue(value, number) && compareValue(bitsPerComponent, static_cast<int>(number), op);
+    }
     return bitsPerComponent;
 }
 
@@ -422,9 +426,11 @@
         else if (QColormap::instance(sn).mode() == QColormap::Gray)
             depth = QApplication::desktop()->screen(sn)->depth();
     }
-    float number;
     if (value)
+    {
+        float number = 0;
         return numberValue(value, number) && compareValue(depth, static_cast<int>(number), op);
+    }
     return depth;
 }
 
--- trunk/KDE/kdelibs/khtml/css/cssstyleselector.cpp #1045665:1045666
@@ -1886,8 +1886,7 @@
            settings = part->settings();
     }
     parentNode = 0;
-    if (m_rootDefaultStyle)
-        delete m_rootDefaultStyle;
+    delete m_rootDefaultStyle;
     m_rootDefaultStyle = style = new RenderStyle();
     CSSInitialValueImpl i(true);
     applyRule( CSS_PROP_FONT_SIZE, &i );