Reviewed by Darin.

        http://bugs.webkit.org/show_bug.cgi?id=11217
        Cleanup svg coding style

        Cleanup coding style in filter classes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16921 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 45e6943d3cf9f7d2fa83a9d3923c6d905606c4bb..74271c168da6d455403b6de651c4fcdc3b7d648a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,54 @@
+2006-10-09  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11217
+        Cleanup svg coding style
+
+        Cleanup coding style in filter classes.
+
+        * ksvg2/svg/SVGComponentTransferFunctionElement.cpp:
+        (WebCore::SVGComponentTransferFunctionElement::SVGComponentTransferFunctionElement):
+        (WebCore::SVGComponentTransferFunctionElement::parseMappedAttribute):
+        * ksvg2/svg/SVGComponentTransferFunctionElement.h:
+        * ksvg2/svg/SVGFEBlendElement.cpp:
+        (WebCore::SVGFEBlendElement::SVGFEBlendElement):
+        (WebCore::SVGFEBlendElement::parseMappedAttribute):
+        (WebCore::SVGFEBlendElement::filterEffect):
+        * ksvg2/svg/SVGFEBlendElement.h:
+        * ksvg2/svg/SVGFEColorMatrixElement.cpp:
+        (WebCore::SVGFEColorMatrixElement::SVGFEColorMatrixElement):
+        (WebCore::SVGFEColorMatrixElement::parseMappedAttribute):
+        (WebCore::SVGFEColorMatrixElement::filterEffect):
+        * ksvg2/svg/SVGFEColorMatrixElement.h:
+        * ksvg2/svg/SVGFECompositeElement.cpp:
+        (WebCore::SVGFECompositeElement::parseMappedAttribute):
+        * ksvg2/svg/SVGFECompositeElement.h:
+        * ksvg2/svg/SVGFEDisplacementMapElement.cpp:
+        (WebCore::SVGFEDisplacementMapElement::stringToChannel):
+        * ksvg2/svg/SVGFEDisplacementMapElement.h:
+        * ksvg2/svg/SVGFEFloodElement.cpp:
+        (WebCore::SVGFEFloodElement::filterEffect):
+        * ksvg2/svg/SVGFEFuncAElement.cpp:
+        (WebCore::SVGFEFuncAElement::SVGFEFuncAElement):
+        * ksvg2/svg/SVGFEFuncBElement.cpp:
+        (WebCore::SVGFEFuncBElement::SVGFEFuncBElement):
+        * ksvg2/svg/SVGFEFuncGElement.cpp:
+        (WebCore::SVGFEFuncGElement::SVGFEFuncGElement):
+        * ksvg2/svg/SVGFEFuncRElement.cpp:
+        (WebCore::SVGFEFuncRElement::SVGFEFuncRElement):
+        * ksvg2/svg/SVGFEGaussianBlurElement.cpp:
+        (WebCore::SVGFEGaussianBlurElement::SVGFEGaussianBlurElement):
+        (WebCore::SVGFEGaussianBlurElement::parseMappedAttribute):
+        (WebCore::SVGFEGaussianBlurElement::filterEffect):
+        * ksvg2/svg/SVGFEGaussianBlurElement.h:
+        * ksvg2/svg/SVGFELightElement.cpp:
+        (WebCore::SVGFELightElement::SVGFELightElement):
+        (WebCore::SVGFELightElement::parseMappedAttribute):
+        * ksvg2/svg/SVGFELightElement.h:
+        * ksvg2/svg/SVGFEMergeElement.cpp:
+        (WebCore::SVGFEMergeElement::SVGFEMergeElement):
+
 2006-10-09  Rob Buis  <buis@kde.org>
 
         Reviewed by olliej.

diff --git a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.cpp b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.cpp
index fc7d329553ac2c4b64c68e21ede0fe8a07faa1f1..45b15a4d100d7dbdb1a73e136bd324657e32e2c0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.cpp
+++ b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,18 +22,16 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGComponentTransferFunctionElement.h"
 
-#include "SVGNames.h"
-#include "SVGHelper.h"
-#include "SVGRenderStyle.h"
 #include "SVGFEComponentTransferElement.h"
-#include "SVGComponentTransferFunctionElement.h"
+#include "SVGHelper.h"
+#include "SVGNames.h"
 #include "SVGNumberList.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGComponentTransferFunctionElement::SVGComponentTransferFunctionElement(const QualifiedName& tagName, Document *doc)
+SVGComponentTransferFunctionElement::SVGComponentTransferFunctionElement(const QualifiedName& tagName, Document* doc)
     : SVGElement(tagName, doc)
     , m_type(0)
     , m_tableValues(new SVGNumberList)
@@ -57,20 +55,20 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGComponentTransferFunctionElement, double, Numbe
 ANIMATED_PROPERTY_DEFINITIONS(SVGComponentTransferFunctionElement, double, Number, number, Exponent, exponent, SVGNames::exponentAttr.localName(), m_exponent)
 ANIMATED_PROPERTY_DEFINITIONS(SVGComponentTransferFunctionElement, double, Number, number, Offset, offset, SVGNames::offsetAttr.localName(), m_offset)
 
-void SVGComponentTransferFunctionElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGComponentTransferFunctionElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::typeAttr)
     {
-        if(value == "identity")
+        if (value == "identity")
             setTypeBaseValue(SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY);
-        else if(value == "table")
+        else if (value == "table")
             setTypeBaseValue(SVG_FECOMPONENTTRANSFER_TYPE_TABLE);
-        else if(value == "discrete")
+        else if (value == "discrete")
             setTypeBaseValue(SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE);
-        else if(value == "linear")
+        else if (value == "linear")
             setTypeBaseValue(SVG_FECOMPONENTTRANSFER_TYPE_LINEAR);
-        else if(value == "gamma")
+        else if (value == "gamma")
             setTypeBaseValue(SVG_FECOMPONENTTRANSFER_TYPE_GAMMA);
     }
     else if (attr->name() == SVGNames::tableValuesAttr)
@@ -98,7 +96,7 @@ KCComponentTransferFunction SVGComponentTransferFunctionElement::transferFunctio
     func.amplitude = amplitude();
     func.exponent = exponent();
     func.offset = offset();
-    SVGNumberList *numbers = tableValues();
+    SVGNumberList* numbers = tableValues();
 
     ExceptionCode ec = 0;
     unsigned int nr = numbers->numberOfItems();
@@ -107,6 +105,8 @@ KCComponentTransferFunction SVGComponentTransferFunctionElement::transferFunctio
     return func;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.h b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.h
index 94e07984fc7de9d0fb838c5aeb4955b6e88161a3..08c562b48657cabff57ed09e853c3ce19a6d11fe 100644 (file)
--- a/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.h
+++ b/WebCore/ksvg2/svg/SVGComponentTransferFunctionElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGComponentTransferFunctionElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGElement.h"
 #include "KCanvasFilters.h"
+#include "SVGElement.h"
 
 namespace WebCore
 {
@@ -48,7 +48,7 @@ namespace WebCore
 
         // 'SVGComponentTransferFunctionElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
         
         KCComponentTransferFunction transferFunction() const;
 

diff --git a/WebCore/ksvg2/svg/SVGFEBlendElement.cpp b/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
index 59bafdebd58d22d9c797f32e2e2297a81ce27c66..9dd03d5efedde5d0d0b1b8c5657444d8054ccd15 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,19 +22,14 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "SVGFEBlendElement.h"
 
-#include "ksvg.h"
+#include "KRenderingDevice.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFEBlendElement.h"
 
 namespace WebCore {
 
-SVGFEBlendElement::SVGFEBlendElement(const QualifiedName& tagName, Document *doc)
+SVGFEBlendElement::SVGFEBlendElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_mode(0)
     , m_filterEffect(0)
@@ -50,23 +45,21 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFEBlendElement, String, String, string, In1, in
 ANIMATED_PROPERTY_DEFINITIONS(SVGFEBlendElement, String, String, string, In2, in2, SVGNames::in2Attr.localName(), m_in2)
 ANIMATED_PROPERTY_DEFINITIONS(SVGFEBlendElement, int, Enumeration, enumeration, Mode, mode, SVGNames::modeAttr.localName(), m_mode)
 
-void SVGFEBlendElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFEBlendElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
-    if (attr->name() == SVGNames::modeAttr)
-    {
-        if(value == "normal")
+    if (attr->name() == SVGNames::modeAttr) {
+        if (value == "normal")
             setModeBaseValue(SVG_FEBLEND_MODE_NORMAL);
-        else if(value == "multiply")
+        else if (value == "multiply")
             setModeBaseValue(SVG_FEBLEND_MODE_MULTIPLY);
-        else if(value == "screen")
+        else if (value == "screen")
             setModeBaseValue(SVG_FEBLEND_MODE_SCREEN);
-        else if(value == "darken")
+        else if (value == "darken")
             setModeBaseValue(SVG_FEBLEND_MODE_DARKEN);
-        else if(value == "lighten")
+        else if (value == "lighten")
             setModeBaseValue(SVG_FEBLEND_MODE_LIGHTEN);
-    }
-    else if (attr->name() == SVGNames::inAttr)
+    } else if (attr->name() == SVGNames::inAttr)
         setIn1BaseValue(value);
     else if (attr->name() == SVGNames::in2Attr)
         setIn2BaseValue(value);
@@ -74,10 +67,10 @@ void SVGFEBlendElement::parseMappedAttribute(MappedAttribute *attr)
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
 
-KCanvasFEBlend *SVGFEBlendElement::filterEffect() const
+KCanvasFEBlend* SVGFEBlendElement::filterEffect() const
 {
     if (!m_filterEffect)
-        m_filterEffect = static_cast<KCanvasFEBlend *>(renderingDevice()->createFilterEffect(FE_BLEND));
+        m_filterEffect = static_cast<KCanvasFEBlend*>(renderingDevice()->createFilterEffect(FE_BLEND));
     if (!m_filterEffect)
         return 0;
     m_filterEffect->setBlendMode((KCBlendModeType)(mode()-1));

diff --git a/WebCore/ksvg2/svg/SVGFEBlendElement.h b/WebCore/ksvg2/svg/SVGFEBlendElement.h
index 1965804aeb7f35be479e0df382416f4a17d970b1..e34cd316d91d3f67bf58f4d90ad153fe6a2a8b0d 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEBlendElement.h
+++ b/WebCore/ksvg2/svg/SVGFEBlendElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFEBlendElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -47,9 +47,9 @@ namespace WebCore
 
         // 'SVGFEBlendElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual KCanvasFEBlend *filterEffect() const;
+        virtual KCanvasFEBlend* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -58,7 +58,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEBlendElement, String, String, In1, in1)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEBlendElement, String, String, In2, in2)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEBlendElement, int, int, Mode, mode)
-        mutable KCanvasFEBlend *m_filterEffect;
+        mutable KCanvasFEBlend* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
index fb94a445ecc7e234ae53c9427d2427a063030f28..9a19ee948dcc48ebd18f04494b0e8b28a84ea745 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,22 +22,16 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFEColorMatrixElement.h"
 
-#include "KCanvasFilters.h"
 #include "KRenderingDevice.h"
-#include "KRenderingPaintServerGradient.h"
-
-#include "ksvg.h"
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFEColorMatrixElement.h"
+#include "SVGNames.h"
 #include "SVGNumberList.h"
 
 namespace WebCore {
 
-SVGFEColorMatrixElement::SVGFEColorMatrixElement(const QualifiedName& tagName, Document *doc)
+SVGFEColorMatrixElement::SVGFEColorMatrixElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_type(0)
     , m_values(new SVGNumberList)
@@ -54,17 +48,17 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFEColorMatrixElement, String, String, string, I
 ANIMATED_PROPERTY_DEFINITIONS(SVGFEColorMatrixElement, int, Enumeration, enumeration, Type, type, SVGNames::typeAttr.localName(), m_type)
 ANIMATED_PROPERTY_DEFINITIONS(SVGFEColorMatrixElement, SVGNumberList*, NumberList, numberList, Values, values, SVGNames::valuesAttr.localName(), m_values.get())
 
-void SVGFEColorMatrixElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFEColorMatrixElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::typeAttr) {
-        if(value == "matrix")
+        if (value == "matrix")
             setTypeBaseValue(SVG_FECOLORMATRIX_TYPE_MATRIX);
-        else if(value == "saturate")
+        else if (value == "saturate")
             setTypeBaseValue(SVG_FECOLORMATRIX_TYPE_SATURATE);
-        else if(value == "hueRotate")
+        else if (value == "hueRotate")
             setTypeBaseValue(SVG_FECOLORMATRIX_TYPE_HUEROTATE);
-        else if(value == "luminanceToAlpha")
+        else if (value == "luminanceToAlpha")
             setTypeBaseValue(SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA);
     }
     else if (attr->name() == SVGNames::inAttr)
@@ -75,21 +69,21 @@ void SVGFEColorMatrixElement::parseMappedAttribute(MappedAttribute *attr)
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
 
-KCanvasFEColorMatrix *SVGFEColorMatrixElement::filterEffect() const
+KCanvasFEColorMatrix* SVGFEColorMatrixElement::filterEffect() const
 {
     if (!m_filterEffect)
-        m_filterEffect = static_cast<KCanvasFEColorMatrix *>(renderingDevice()->createFilterEffect(FE_COLOR_MATRIX));
+        m_filterEffect = static_cast<KCanvasFEColorMatrix*>(renderingDevice()->createFilterEffect(FE_COLOR_MATRIX));
     if (!m_filterEffect)
         return 0;
         
     m_filterEffect->setIn(in1());
     setStandardAttributes(m_filterEffect);
     DeprecatedValueList<float> _values;
-    SVGNumberList *numbers = values();
+    SVGNumberList* numbers = values();
 
     ExceptionCode ec = 0;
     unsigned int nr = numbers->numberOfItems();
-    for(unsigned int i = 0;i < nr;i++)
+    for (unsigned int i = 0;i < nr;i++)
         _values.append(numbers->getItem(i, ec));
     m_filterEffect->setValues(_values);
     m_filterEffect->setType((KCColorMatrixType)(type() - 1));

diff --git a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.h b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.h
index 7df7c0ad22bf10045bd9405a64ef70aaab2767a5..6b93e69de2c277555ce4540196d231dc8651ce12 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.h
+++ b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFEColorMatrixElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -47,9 +47,9 @@ namespace WebCore
 
         // 'SVGFEColorMatrixElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
         
-        virtual KCanvasFEColorMatrix *filterEffect() const;
+        virtual KCanvasFEColorMatrix* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -58,7 +58,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEColorMatrixElement, String, String, In1, in1)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEColorMatrixElement, int, int, Type, type)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEColorMatrixElement, SVGNumberList*, RefPtr<SVGNumberList>, Values, values)
-        mutable KCanvasFEColorMatrix *m_filterEffect;
+        mutable KCanvasFEColorMatrix* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFECompositeElement.cpp b/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
index 052eff4755d6acc4333c02597169de12d4df8423..e96846670fd0446504389fcfd9eb04956b588286 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,17 +22,11 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFECompositeElement.h"
 
-#include "KCanvasFilters.h"
 #include "KRenderingDevice.h"
-#include "KRenderingPaintServerGradient.h"
-
-#include "ksvg.h"
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFECompositeElement.h"
+#include "SVGNames.h"
 
 namespace WebCore {
 
@@ -65,17 +59,17 @@ void SVGFECompositeElement::parseMappedAttribute(MappedAttribute *attr)
     const String& value = attr->value();
     if (attr->name() == SVGNames::operatorAttr)
     {
-        if(value == "over")
+        if (value == "over")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_OVER);
-        else if(value == "in")
+        else if (value == "in")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_IN);
-        else if(value == "out")
+        else if (value == "out")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_OUT);
-        else if(value == "atop")
+        else if (value == "atop")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_ATOP);
-        else if(value == "xor")
+        else if (value == "xor")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_XOR);
-        else if(value == "arithmetic")
+        else if (value == "arithmetic")
             set_operatorBaseValue(SVG_FECOMPOSITE_OPERATOR_ARITHMETIC);
     }
     else if (attr->name() == SVGNames::inAttr)

diff --git a/WebCore/ksvg2/svg/SVGFECompositeElement.h b/WebCore/ksvg2/svg/SVGFECompositeElement.h
index dee9f5a3a9c8275c1f1fae0c4aa4a67fcb9f1661..27adfa5939bf02ef83abb344cb51aaeaf0106284 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFECompositeElement.h
+++ b/WebCore/ksvg2/svg/SVGFECompositeElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFECompositeElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -48,9 +48,9 @@ namespace WebCore
 
         // 'SVGFECompositeElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual KCanvasFEComposite *filterEffect() const;
+        virtual KCanvasFEComposite* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -63,7 +63,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, double, double, K2, k2)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, double, double, K3, k3)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFECompositeElement, double, double, K4, k4)
-        mutable KCanvasFEComposite *m_filterEffect;
+        mutable KCanvasFEComposite* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
index 3e82c3fd9c2e23cbc60bbd7a7cdef19cc5f3408b..3287ac60723a31912bdf3b9611b701d2cbbf8b2c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
@@ -20,17 +20,12 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "SVGFEDisplacementMapElement.h"
 
-#include "ksvg.h"
+#include "KRenderingDevice.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFEDisplacementMapElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGFEDisplacementMapElement::SVGFEDisplacementMapElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
@@ -54,13 +49,13 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFEDisplacementMapElement, double, Number, numbe
 
 KCChannelSelectorType SVGFEDisplacementMapElement::stringToChannel(const String& key)
 {
-    if(key == "R")
+    if (key == "R")
         return CS_RED;
-    else if(key == "G")
+    else if (key == "G")
         return CS_GREEN;
-    else if(key == "B")
+    else if (key == "B")
         return CS_BLUE;
-    else if(key == "A")
+    else if (key == "A")
         return CS_ALPHA;
     //error
     return (KCChannelSelectorType)-1;
@@ -97,4 +92,6 @@ KCanvasFEDisplacementMap* SVGFEDisplacementMapElement::filterEffect() const
     setStandardAttributes(m_filterEffect);
     return m_filterEffect;
 }
+
+}
 #endif // SVG_SUPPORT

diff --git a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.h b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.h
index 01515daff94196d21c72b8cf91f90293dbe9cc5e..9c5aa9fb9b3157e15d64ba6baffcafb2ba9c8d26 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.h
+++ b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.h
@@ -21,8 +21,8 @@
 #define KSVG_SVGFEDisplacementMapElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore {
     

diff --git a/WebCore/ksvg2/svg/SVGFEFuncAElement.cpp b/WebCore/ksvg2/svg/SVGFEFuncAElement.cpp
index 8e72c9bd9b5cd82883fa1a0beea11c84093c2f9a..89a332fbe7235d0ce430c38c367cdef0b4ce036e 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEFuncAElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFuncAElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,10 +24,10 @@
 #ifdef SVG_SUPPORT
 #include "SVGFEFuncAElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEFuncAElement::SVGFEFuncAElement(const QualifiedName& tagName, Document *doc) : 
-SVGComponentTransferFunctionElement(tagName, doc)
+SVGFEFuncAElement::SVGFEFuncAElement(const QualifiedName& tagName, Document* doc)
+    : SVGComponentTransferFunctionElement(tagName, doc)
 {
 }
 
@@ -35,6 +35,8 @@ SVGFEFuncAElement::~SVGFEFuncAElement()
 {
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFEFuncBElement.cpp b/WebCore/ksvg2/svg/SVGFEFuncBElement.cpp
index 99a69e115a54f33ad1a3c8ec3259ae2a1b423e6b..695fd19b9547e5a282eb5e2d8b7bddd83ab27985 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEFuncBElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFuncBElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,10 +24,10 @@
 #ifdef SVG_SUPPORT
 #include "SVGFEFuncBElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEFuncBElement::SVGFEFuncBElement(const QualifiedName& tagName, Document *doc) : 
-SVGComponentTransferFunctionElement(tagName, doc)
+SVGFEFuncBElement::SVGFEFuncBElement(const QualifiedName& tagName, Document *doc)
+    : SVGComponentTransferFunctionElement(tagName, doc)
 {
 }
 
@@ -35,6 +35,8 @@ SVGFEFuncBElement::~SVGFEFuncBElement()
 {
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFEFuncGElement.cpp b/WebCore/ksvg2/svg/SVGFEFuncGElement.cpp
index 7f3d3d4a53934583fe562c70046c6cf5801111c5..5146e5e872f9e44d8a6dd2fad0e7657bcbb9facc 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEFuncGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFuncGElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,9 +24,9 @@
 #ifdef SVG_SUPPORT
 #include "SVGFEFuncGElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEFuncGElement::SVGFEFuncGElement(const QualifiedName& tagName, Document *doc) : 
+SVGFEFuncGElement::SVGFEFuncGElement(const QualifiedName& tagName, Document* doc) : 
 SVGComponentTransferFunctionElement(tagName, doc)
 {
 }
@@ -35,6 +35,8 @@ SVGFEFuncGElement::~SVGFEFuncGElement()
 {
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFEFuncRElement.cpp b/WebCore/ksvg2/svg/SVGFEFuncRElement.cpp
index cf87805c1e95ff40828df6debccae1fd9c211577..11f12794c4c973edf62df8b52223a9bd64b7186c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEFuncRElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFuncRElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,10 +24,10 @@
 #ifdef SVG_SUPPORT
 #include "SVGFEFuncRElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEFuncRElement::SVGFEFuncRElement(const QualifiedName& tagName, Document *doc) : 
-SVGComponentTransferFunctionElement(tagName, doc)
+SVGFEFuncRElement::SVGFEFuncRElement(const QualifiedName& tagName, Document* doc)
+    : SVGComponentTransferFunctionElement(tagName, doc)
 {
 }
 
@@ -35,6 +35,8 @@ SVGFEFuncRElement::~SVGFEFuncRElement()
 {
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
index 6c5e1af0854ca04dea9b5a573d1a0f0e5e73863e..d7db6de02876fcd8f752e84e69fedc928252e475 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,20 +22,16 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFEGaussianBlurElement.h"
 
-#include "KCanvasFilters.h"
 #include "KRenderingDevice.h"
 #include "KRenderingPaintServerGradient.h"
-
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFEGaussianBlurElement.h"
+#include "SVGNames.h"
 
 namespace WebCore {
 
-SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(const QualifiedName& tagName, Document *doc)
+SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_stdDeviationX(0.0)
     , m_stdDeviationY(0.0)
@@ -56,27 +52,26 @@ void SVGFEGaussianBlurElement::setStdDeviation(float stdDeviationX, float stdDev
 {
 }
 
-void SVGFEGaussianBlurElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFEGaussianBlurElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::stdDeviationAttr) {
         Vector<String> numbers = value.split(' ');
         setStdDeviationXBaseValue(numbers[0].toDouble());
-        if(numbers.size() == 1)
+        if (numbers.size() == 1)
             setStdDeviationYBaseValue(numbers[0].toDouble());
         else
             setStdDeviationYBaseValue(numbers[1].toDouble());
-    }
-    else if (attr->name() == SVGNames::inAttr)
+    } else if (attr->name() == SVGNames::inAttr)
         setIn1BaseValue(value);
     else
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
 
-KCanvasFEGaussianBlur *SVGFEGaussianBlurElement::filterEffect() const
+KCanvasFEGaussianBlur* SVGFEGaussianBlurElement::filterEffect() const
 {
     if (!m_filterEffect)
-        m_filterEffect = static_cast<KCanvasFEGaussianBlur *>(renderingDevice()->createFilterEffect(FE_GAUSSIAN_BLUR));
+        m_filterEffect = static_cast<KCanvasFEGaussianBlur*>(renderingDevice()->createFilterEffect(FE_GAUSSIAN_BLUR));
     if (!m_filterEffect)
         return 0;
     m_filterEffect->setIn(in1());

diff --git a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.h b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.h
index 6e1a45ff06a8b442fb22cd55e548bbdc69b49b4c..7a51cba75e658385504d170c9d70c8c0654a8cb8 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.h
+++ b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFEGaussianBlurElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -40,9 +40,9 @@ namespace WebCore
         void setStdDeviation(float stdDeviationX, float stdDeviationY);
 
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual KCanvasFEGaussianBlur *filterEffect() const;
+        virtual KCanvasFEGaussianBlur* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -51,7 +51,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEGaussianBlurElement, String, String, In1, in1)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEGaussianBlurElement, double, double, StdDeviationX, stdDeviationX)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFEGaussianBlurElement, double, double, StdDeviationY, stdDeviationY)
-        mutable KCanvasFEGaussianBlur *m_filterEffect;
+        mutable KCanvasFEGaussianBlur* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFELightElement.cpp b/WebCore/ksvg2/svg/SVGFELightElement.cpp
index c73e05169ee57f613c816b264bca642116cfae48..4e4dffd2ce32951a0d1d78151a0f3588ce7f7153 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFELightElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFELightElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
                   2005 Oliver Hunt <ojh16@student.canterbury.ac.nz>
 
     This library is free software; you can redistribute it and/or
@@ -17,23 +17,18 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
- */
+*/
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-
-#include "KCanvasFilters.h"
-#include "KRenderingDevice.h"
+#include "SVGFELightElement.h"
 
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFELightElement.h"
+#include "SVGNames.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFELightElement::SVGFELightElement(const QualifiedName& tagName, Document *doc)
+SVGFELightElement::SVGFELightElement(const QualifiedName& tagName, Document* doc)
     : SVGElement(tagName, doc)
     , m_azimuth(0.0)
     , m_elevation(0.0)
@@ -64,7 +59,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFELightElement, double, Number, number, PointsA
 ANIMATED_PROPERTY_DEFINITIONS(SVGFELightElement, double, Number, number, SpecularExponent, specularExponent, SVGNames::specularExponentAttr.localName(), m_specularExponent)
 ANIMATED_PROPERTY_DEFINITIONS(SVGFELightElement, double, Number, number, LimitingConeAngle, limitingConeAngle, SVGNames::limitingConeAngleAttr.localName(), m_limitingConeAngle)
 
-void SVGFELightElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFELightElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::azimuthAttr)
@@ -90,5 +85,8 @@ void SVGFELightElement::parseMappedAttribute(MappedAttribute *attr)
     else
         SVGElement::parseMappedAttribute(attr);
 }
+
+}
+
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFELightElement.h b/WebCore/ksvg2/svg/SVGFELightElement.h
index b306d65deecb1437d76a14d79b93b16accd6bdbc..caffce6cb01dc76f40045af4ee12b3994385cd28 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFELightElement.h
+++ b/WebCore/ksvg2/svg/SVGFELightElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
                   2005 Oliver Hunt <ojh16@student.canterbury.ac.nz>
 
     This library is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
 #define KSVG_SVGFELightElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGElement.h"
 #include "KCanvasFilters.h"
+#include "SVGElement.h"
 
 namespace WebCore
 {
@@ -37,10 +37,10 @@ namespace WebCore
         virtual ~SVGFELightElement();
         
         // 'SVGComponentTransferFunctionElement' functions
-        virtual KCLightSource *lightSource() const = 0;
+        virtual KCLightSource* lightSource() const = 0;
         
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);        
+        virtual void parseMappedAttribute(MappedAttribute* attr);        
     private:
         ANIMATED_PROPERTY_DECLARATIONS(SVGFELightElement, double, double, Azimuth, azimuth)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFELightElement, double, double, Elevation, elevation)

diff --git a/WebCore/ksvg2/svg/SVGFEMergeElement.cpp b/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
index f487f3aee11b6ba885e2da1af9d605b1de7c1fc1..392609e18a87e83b6d36aa44e29ecb62ee9e49c7 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,20 +22,15 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
-
-#include "ksvg.h"
-#include "SVGHelper.h"
-#include "SVGRenderStyle.h"
 #include "SVGFEMergeElement.h"
+
+#include "KRenderingDevice.h"
 #include "SVGFEMergeNodeElement.h"
+#include "SVGHelper.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEMergeElement::SVGFEMergeElement(const QualifiedName& tagName, Document *doc)
+SVGFEMergeElement::SVGFEMergeElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_filterEffect(0)
 {
@@ -46,10 +41,10 @@ SVGFEMergeElement::~SVGFEMergeElement()
     delete m_filterEffect;
 }
 
-KCanvasFEMerge *SVGFEMergeElement::filterEffect() const
+KCanvasFEMerge* SVGFEMergeElement::filterEffect() const
 {
     if (!m_filterEffect)
-        m_filterEffect = static_cast<KCanvasFEMerge *>(renderingDevice()->createFilterEffect(FE_MERGE));
+        m_filterEffect = static_cast<KCanvasFEMerge*>(renderingDevice()->createFilterEffect(FE_MERGE));
     if (!m_filterEffect)
         return 0;
     setStandardAttributes(m_filterEffect);
@@ -57,7 +52,7 @@ KCanvasFEMerge *SVGFEMergeElement::filterEffect() const
     Vector<String> mergeInputs;
     for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
         if (n->hasTagName(SVGNames::feMergeNodeTag))
-            mergeInputs.append(static_cast<SVGFEMergeNodeElement *>(n)->in1());
+            mergeInputs.append(static_cast<SVGFEMergeNodeElement*>(n)->in1());
     }
 
     m_filterEffect->setMergeInputs(mergeInputs);
@@ -65,6 +60,8 @@ KCanvasFEMerge *SVGFEMergeElement::filterEffect() const
     return m_filterEffect;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFEMergeElement.h b/WebCore/ksvg2/svg/SVGFEMergeElement.h
index 554e7c722e3ac091bc9a62336896b4bb1293133f..cceb6f58f11bda867e86617b625d09c66e11b07c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEMergeElement.h
+++ b/WebCore/ksvg2/svg/SVGFEMergeElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFEMergeElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -35,13 +35,13 @@ namespace WebCore
         SVGFEMergeElement(const QualifiedName&, Document*);
         virtual ~SVGFEMergeElement();
 
-        virtual KCanvasFEMerge *filterEffect() const;
+        virtual KCanvasFEMerge* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
 
     private:
-        mutable KCanvasFEMerge *m_filterEffect;
+        mutable KCanvasFEMerge* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFEMergeNodeElement.cpp b/WebCore/ksvg2/svg/SVGFEMergeNodeElement.cpp
index 1b558cb7a624ea655f3fa65f551b58d45565b063..8589c78971d24f0d049b94e2d19df6f608439ad9 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEMergeNodeElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEMergeNodeElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,14 +22,14 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFEMergeNodeElement.h"
 
 #include "SVGHelper.h"
-#include "SVGFEMergeNodeElement.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFEMergeNodeElement::SVGFEMergeNodeElement(const QualifiedName& tagName, Document *doc) : SVGElement(tagName, doc)
+SVGFEMergeNodeElement::SVGFEMergeNodeElement(const QualifiedName& tagName, Document* doc)
+    : SVGElement(tagName, doc)
 {
 }
 
@@ -39,7 +39,7 @@ SVGFEMergeNodeElement::~SVGFEMergeNodeElement()
 
 ANIMATED_PROPERTY_DEFINITIONS(SVGFEMergeNodeElement, String, String, string, In1, in1, SVGNames::inAttr.localName(), m_in1)
 
-void SVGFEMergeNodeElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFEMergeNodeElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::inAttr)
@@ -48,6 +48,7 @@ void SVGFEMergeNodeElement::parseMappedAttribute(MappedAttribute *attr)
         SVGElement::parseMappedAttribute(attr);
 }
 
+}
 
 // vim:ts=4:noet
 #endif // SVG_SUPPORT

diff --git a/WebCore/ksvg2/svg/SVGFEMergeNodeElement.h b/WebCore/ksvg2/svg/SVGFEMergeNodeElement.h
index c5d27388458edd1a9d5ebd8ac1422dc0e734827d..13dd8b5b1d63674f19a6fe9a2045317309f04e28 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFEMergeNodeElement.h
+++ b/WebCore/ksvg2/svg/SVGFEMergeNodeElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -35,7 +35,7 @@ namespace WebCore
         virtual ~SVGFEMergeNodeElement();
 
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
         // 'SVGFEMergeNodeElement' functions
     

diff --git a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
index 3373c4719028c042d2e78928a1ec7450d004b30d..ddcce8e62dc1df6bac655a684b72f6a76fbf36a8 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
                   2005 Oliver Hunt <ojh16@student.canterbury.ac.nz>
 
     This library is free software; you can redistribute it and/or
@@ -17,26 +17,21 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
- */
+*/
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "SVGFESpecularLightingElement.h"
 
-#include "SVGNames.h"
-#include "SVGHelper.h"
-#include "SVGRenderStyle.h"
+#include "KRenderingDevice.h"
 #include "SVGColor.h"
+#include "SVGHelper.h"
+#include "SVGNames.h"
 #include "SVGFELightElement.h"
-#include "SVGFESpecularLightingElement.h"
-
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFESpecularLightingElement::SVGFESpecularLightingElement(const QualifiedName& tagName, Document *doc)
+SVGFESpecularLightingElement::SVGFESpecularLightingElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_specularConstant(0.0)
     , m_specularExponent(0.0)
@@ -61,7 +56,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFESpecularLightingElement, double, Number, numb
 ANIMATED_PROPERTY_DEFINITIONS(SVGFESpecularLightingElement, double, Number, number, KernelUnitLengthY, kernelUnitLengthY, "kernelUnitLengthY", m_kernelUnitLengthY)
 ANIMATED_PROPERTY_DEFINITIONS(SVGFESpecularLightingElement, SVGColor*, Color, color, LightingColor, lightingColor, SVGNames::lighting_colorAttr.localName(), m_lightingColor.get())
 
-void SVGFESpecularLightingElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFESpecularLightingElement::parseMappedAttribute(MappedAttribute* attr)
 {    
     const String& value = attr->value();
     if (attr->name() == SVGNames::inAttr)
@@ -85,10 +80,10 @@ void SVGFESpecularLightingElement::parseMappedAttribute(MappedAttribute *attr)
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
 
-KCanvasFESpecularLighting *SVGFESpecularLightingElement::filterEffect() const
+KCanvasFESpecularLighting* SVGFESpecularLightingElement::filterEffect() const
 {
     if (!m_filterEffect) 
-        m_filterEffect = static_cast<KCanvasFESpecularLighting *>(renderingDevice()->createFilterEffect(FE_SPECULAR_LIGHTING));
+        m_filterEffect = static_cast<KCanvasFESpecularLighting*>(renderingDevice()->createFilterEffect(FE_SPECULAR_LIGHTING));
     m_filterEffect->setIn(in1());
     setStandardAttributes(m_filterEffect);
     m_filterEffect->setSpecularConstant((specularConstant()));
@@ -106,15 +101,18 @@ void SVGFESpecularLightingElement::updateLights() const
     if (!m_filterEffect)
         return;
 
-    KCLightSource *light = 0;    
-    for (Node *n = firstChild(); n; n = n->nextSibling()) {
+    KCLightSource* light = 0;    
+    for (Node* n = firstChild(); n; n = n->nextSibling()) {
         if (n->hasTagName(SVGNames::feDistantLightTag)||n->hasTagName(SVGNames::fePointLightTag)||n->hasTagName(SVGNames::feSpotLightTag)) {
-            SVGFELightElement *lightNode = static_cast<SVGFELightElement *>(n); 
+            SVGFELightElement* lightNode = static_cast<SVGFELightElement*>(n); 
             light = lightNode->lightSource();
             break;
         }
     }
     m_filterEffect->setLightSource(light);
 }
+
+}
+
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.h b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.h
index 0091c55b2a614201867a6255a0b32b60b6092784..557325cb06aa6be3168cc5b1d22b3314beceecbe 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.h
+++ b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
                   2005 Oliver Hunt <ojh16@student.canterbury.ac.nz>
 
     This library is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
 #define KSVG_SVGFESpecularLightingElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -38,9 +38,9 @@ namespace WebCore
         
         // 'SVGFEDiffuseLightingElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
         
-        virtual KCanvasFESpecularLighting *filterEffect() const;
+        virtual KCanvasFESpecularLighting* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -54,7 +54,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFESpecularLightingElement, double, double, KernelUnitLengthX, kernelUnitLengthX)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFESpecularLightingElement, double, double, KernelUnitLengthY, kernelUnitLengthY)
         //need other properties here...
-        mutable KCanvasFESpecularLighting *m_filterEffect;
+        mutable KCanvasFESpecularLighting* m_filterEffect;
         
         //light management
         void updateLights() const;

diff --git a/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp b/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
index 2e88504d13aebec5de423f45bc80b7c2f1cb2ef8..e860030f62cedea71d09885d7fc055209f194568 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,20 +22,13 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFETurbulenceElement.h"
 
-#include "KCanvasFilters.h"
 #include "KRenderingDevice.h"
-#include "KRenderingPaintServerGradient.h"
-
-#include "ksvg.h"
-#include "SVGHelper.h"
-#include "SVGRenderStyle.h"
-#include "SVGFETurbulenceElement.h"
 
 namespace WebCore {
 
-SVGFETurbulenceElement::SVGFETurbulenceElement(const QualifiedName& tagName, Document *doc)
+SVGFETurbulenceElement::SVGFETurbulenceElement(const QualifiedName& tagName, Document* doc)
     : SVGFilterPrimitiveStandardAttributes(tagName, doc)
     , m_baseFrequencyX(0.0)
     , m_baseFrequencyY(0.0)
@@ -59,33 +52,27 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFETurbulenceElement, long, Integer, integer, Nu
 ANIMATED_PROPERTY_DEFINITIONS(SVGFETurbulenceElement, int, Enumeration, enumeration, StitchTiles, stitchTiles, SVGNames::stitchTilesAttr.localName(), m_stitchTiles)
 ANIMATED_PROPERTY_DEFINITIONS(SVGFETurbulenceElement, int, Enumeration, enumeration, Type, type, SVGNames::typeAttr.localName(), m_type)
 
-void SVGFETurbulenceElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFETurbulenceElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
-    if (attr->name() == SVGNames::typeAttr)
-    {
-        if(value == "fractalNoise")
+    if (attr->name() == SVGNames::typeAttr) {
+        if (value == "fractalNoise")
             setTypeBaseValue(SVG_TURBULENCE_TYPE_FRACTALNOISE);
-        else if(value == "turbulence")
+        else if (value == "turbulence")
             setTypeBaseValue(SVG_TURBULENCE_TYPE_TURBULENCE);
-    }
-    else if (attr->name() == SVGNames::stitchTilesAttr)
-    {
-        if(value == "stitch")
+    } else if (attr->name() == SVGNames::stitchTilesAttr) {
+        if (value == "stitch")
             setStitchTilesBaseValue(SVG_STITCHTYPE_STITCH);
-        else if(value == "nostitch")
+        else if (value == "nostitch")
             setStitchTilesBaseValue(SVG_STITCHTYPE_NOSTITCH);
-    }
-    else if (attr->name() == SVGNames::baseFrequencyAttr)
-    {
+    } else if (attr->name() == SVGNames::baseFrequencyAttr) {
         Vector<String> numbers = value.split(' ');
         setBaseFrequencyXBaseValue(numbers[0].toDouble());
-        if(numbers.size() == 1)
+        if (numbers.size() == 1)
             setBaseFrequencyYBaseValue(numbers[0].toDouble());
         else
             setBaseFrequencyYBaseValue(numbers[1].toDouble());
-    }
-    else if (attr->name() == SVGNames::seedAttr)
+    } else if (attr->name() == SVGNames::seedAttr)
         setSeedBaseValue(value.toDouble());
     else if (attr->name() == SVGNames::numOctavesAttr)
         setNumOctavesBaseValue(value.deprecatedString().toUInt());
@@ -93,10 +80,10 @@ void SVGFETurbulenceElement::parseMappedAttribute(MappedAttribute *attr)
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
 
-KCanvasFETurbulence *SVGFETurbulenceElement::filterEffect() const
+KCanvasFETurbulence* SVGFETurbulenceElement::filterEffect() const
 {
     if (!m_filterEffect)
-        m_filterEffect = static_cast<KCanvasFETurbulence *>(renderingDevice()->createFilterEffect(FE_TURBULENCE));
+        m_filterEffect = static_cast<KCanvasFETurbulence*>(renderingDevice()->createFilterEffect(FE_TURBULENCE));
     if (!m_filterEffect)
         return 0;
     

diff --git a/WebCore/ksvg2/svg/SVGFETurbulenceElement.h b/WebCore/ksvg2/svg/SVGFETurbulenceElement.h
index 4d3df671ab661571a41f3a032aaa3337f5510b01..134dbf09aedf09aec5ebbe7b30abab2ddfc4b57b 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFETurbulenceElement.h
+++ b/WebCore/ksvg2/svg/SVGFETurbulenceElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,8 +24,8 @@
 #define KSVG_SVGFETurbulenceElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGFilterPrimitiveStandardAttributes.h"
 #include "KCanvasFilters.h"
+#include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore
 {
@@ -50,9 +50,9 @@ namespace WebCore
 
         // 'SVGFETurbulenceElement' functions
         // Derived from: 'Element'
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual KCanvasFETurbulence *filterEffect() const;
+        virtual KCanvasFETurbulence* filterEffect() const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -64,7 +64,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGFETurbulenceElement, double, double, Seed, seed)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFETurbulenceElement, int, int, StitchTiles, stitchTiles)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFETurbulenceElement, int, int, Type, type)
-        mutable KCanvasFETurbulence *m_filterEffect;
+        mutable KCanvasFETurbulence* m_filterEffect;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFilterElement.cpp b/WebCore/ksvg2/svg/SVGFilterElement.cpp
index 38e38787eedba628eaf2a6095ac5a67d386dc1e2..a50497645b26d867b7f0f5b0231f4a0d1df889c4 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFilterElement.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-    Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
+    Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
     Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 
     This file is part of the KDE project
@@ -23,20 +23,20 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
+#include "SVGFilterElement.h"
 
+#include "Attr.h"
 #include "KRenderingDevice.h"
 #include "KCanvasFilters.h"
-#include "SVGUnitTypes.h"
-#include "SVGNames.h"
-#include "SVGHelper.h"
-#include "SVGFilterElement.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
+#include "SVGHelper.h"
 #include "SVGLength.h"
+#include "SVGNames.h"
+#include "SVGUnitTypes.h"
 
 namespace WebCore {
 
-SVGFilterElement::SVGFilterElement(const QualifiedName& tagName, Document *doc)
+SVGFilterElement::SVGFilterElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledElement(tagName, doc)
     , SVGURIReference()
     , SVGLangSpace()
@@ -80,24 +80,20 @@ void SVGFilterElement::setFilterRes(unsigned long, unsigned long) const
 {
 }
 
-void SVGFilterElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGFilterElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
-    if (attr->name() == SVGNames::filterUnitsAttr)
-    {
-        if(value == "userSpaceOnUse")
+    if (attr->name() == SVGNames::filterUnitsAttr) {
+        if (value == "userSpaceOnUse")
             setFilterUnitsBaseValue(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE);
-        else if(value == "objectBoundingBox")
+        else if (value == "objectBoundingBox")
             setFilterUnitsBaseValue(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
-    }
-    else if (attr->name() == SVGNames::primitiveUnitsAttr)
-    {
-        if(value == "userSpaceOnUse")
+    } else if (attr->name() == SVGNames::primitiveUnitsAttr) {
+        if (value == "userSpaceOnUse")
             setPrimitiveUnitsBaseValue(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE);
-        else if(value == "objectBoundingBox")
+        else if (value == "objectBoundingBox")
             setPrimitiveUnitsBaseValue(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
-    }
-    else if (attr->name() == SVGNames::xAttr)
+    } else if (attr->name() == SVGNames::xAttr)
         xBaseValue()->setValueAsString(value);
     else if (attr->name() == SVGNames::yAttr)
         yBaseValue()->setValueAsString(value);
@@ -105,23 +101,22 @@ void SVGFilterElement::parseMappedAttribute(MappedAttribute *attr)
         widthBaseValue()->setValueAsString(value);
     else if (attr->name() == SVGNames::heightAttr)
         heightBaseValue()->setValueAsString(value);
-    else
-    {
-        if(SVGURIReference::parseMappedAttribute(attr)) return;
-        if(SVGLangSpace::parseMappedAttribute(attr)) return;
-        if(SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
+    else {
+        if (SVGURIReference::parseMappedAttribute(attr)) return;
+        if (SVGLangSpace::parseMappedAttribute(attr)) return;
+        if (SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
 
         SVGStyledElement::parseMappedAttribute(attr);
     }
 }
 
-KCanvasFilter *SVGFilterElement::canvasResource()
+KCanvasFilter* SVGFilterElement::canvasResource()
 {
     if (!attached())
         return 0;
 
     if (!m_filter)
-        m_filter = static_cast<KCanvasFilter *>(renderingDevice()->createResource(RS_FILTER));
+        m_filter = static_cast<KCanvasFilter*>(renderingDevice()->createResource(RS_FILTER));
 
     bool filterBBoxMode = filterUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
     m_filter->setFilterBoundingBoxMode(filterBBoxMode);
@@ -138,10 +133,10 @@ KCanvasFilter *SVGFilterElement::canvasResource()
 
     // TODO : use switch/case instead?
     m_filter->clearEffects();
-    for (Node *n = firstChild(); n != 0; n = n->nextSibling()) {
-        SVGElement *element = svg_dynamic_cast(n);
-        if(element && element->isFilterEffect()) {
-            SVGFilterPrimitiveStandardAttributes *fe = static_cast<SVGFilterPrimitiveStandardAttributes *>(element);
+    for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
+        SVGElement* element = svg_dynamic_cast(n);
+        if (element && element->isFilterEffect()) {
+            SVGFilterPrimitiveStandardAttributes* fe = static_cast<SVGFilterPrimitiveStandardAttributes*>(element);
             if (fe->filterEffect())
                 m_filter->addFilterEffect(fe->filterEffect());
         }

diff --git a/WebCore/ksvg2/svg/SVGFilterElement.h b/WebCore/ksvg2/svg/SVGFilterElement.h
index 8dd5986e678df7caba9a9ce6dd7af118e36b22ec..4617e8c93e8d88f5a57f003fa86369056f6db590 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterElement.h
+++ b/WebCore/ksvg2/svg/SVGFilterElement.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-    Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
+    Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
     Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 
     This file is part of the KDE project
@@ -25,31 +25,30 @@
 #define KSVG_SVGFilterElementImpl_H
 #ifdef SVG_SUPPORT
 
+#include "KCanvasFilters.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
-#include "SVGURIReference.h"
 #include "SVGStyledElement.h"
-#include "SVGExternalResourcesRequired.h"
-
-#include "KCanvasFilters.h"
+#include "SVGURIReference.h"
 
 namespace WebCore {
     class SVGLength;
 
     class SVGFilterElement : public SVGStyledElement,
-                                 public SVGURIReference,
-                                 public SVGLangSpace,
-                                 public SVGExternalResourcesRequired
+                             public SVGURIReference,
+                             public SVGLangSpace,
+                             public SVGExternalResourcesRequired
     {
     public:
         SVGFilterElement(const QualifiedName&, Document*);
         virtual ~SVGFilterElement();
 
-        virtual KCanvasFilter *canvasResource();
+        virtual KCanvasFilter* canvasResource();
 
         // 'SVGFilterElement' functions
         void setFilterRes(unsigned long filterResX, unsigned long filterResY) const;
 
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -67,7 +66,7 @@ namespace WebCore {
         ANIMATED_PROPERTY_DECLARATIONS(SVGFilterElement, long, long, FilterResX, filterResX)
         ANIMATED_PROPERTY_DECLARATIONS(SVGFilterElement, long, long, FilterResY, filterResY)
 
-        KCanvasFilter *m_filter;
+        KCanvasFilter* m_filter;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
index 8dd18937b77cf7d40de1c21b6bb55a5b9b945c51..6c5628a103a8f4f30df3fe26d5dc19e5de1de6cd 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -22,21 +22,17 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-#include <wtf/Assertions.h>
-
-#include "SVGUnitTypes.h"
-#include "SVGNames.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
+
+#include "SVGFilterElement.h"
 #include "SVGLength.h"
+#include "SVGNames.h"
 #include "SVGStyledElement.h"
-#include "SVGFilterElement.h"
-
-#include <kcanvas/KCanvasFilters.h>
+#include "SVGUnitTypes.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGFilterPrimitiveStandardAttributes::SVGFilterPrimitiveStandardAttributes(const QualifiedName& tagName, Document *doc)
+SVGFilterPrimitiveStandardAttributes::SVGFilterPrimitiveStandardAttributes(const QualifiedName& tagName, Document* doc)
     : SVGStyledElement(tagName, doc)
     , m_x(new SVGLength(this, LM_WIDTH, viewportElement()))
     , m_y(new SVGLength(this, LM_HEIGHT, viewportElement()))
@@ -58,7 +54,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGFilterPrimitiveStandardAttributes, SVGLength*,
 ANIMATED_PROPERTY_DEFINITIONS(SVGFilterPrimitiveStandardAttributes, SVGLength*, Length, length, Height, height, SVGNames::heightAttr.localName(), m_height.get())
 ANIMATED_PROPERTY_DEFINITIONS(SVGFilterPrimitiveStandardAttributes, String, String, string, Result, result, SVGNames::resultAttr.localName(), m_result)
 
-void SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(MappedAttribute *attr)
+void SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::xAttr)
@@ -75,14 +71,14 @@ void SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(MappedAttribute
         return SVGStyledElement::parseMappedAttribute(attr);
 }
 
-void SVGFilterPrimitiveStandardAttributes::setStandardAttributes(KCanvasFilterEffect *filterEffect) const
+void SVGFilterPrimitiveStandardAttributes::setStandardAttributes(KCanvasFilterEffect* filterEffect) const
 {
     ASSERT(filterEffect);
     if (!filterEffect)
         return;
     bool bbox = false;
     if (parentNode() && parentNode()->hasTagName(SVGNames::filterTag))
-        bbox = static_cast<SVGFilterElement *>(parentNode())->primitiveUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
+        bbox = static_cast<SVGFilterElement*>(parentNode())->primitiveUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
 
     x()->setBboxRelative(bbox);
     y()->setBboxRelative(bbox);
@@ -98,6 +94,8 @@ void SVGFilterPrimitiveStandardAttributes::setStandardAttributes(KCanvasFilterEf
     filterEffect->setResult(result());
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.h b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.h
index 2b08ee53633b01aca7e0be5c0f352a0821d50c94..7ab0f6c544fd23d50adf616980a590d1920fa2b0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.h
+++ b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -41,10 +41,10 @@ namespace WebCore {
         // 'SVGFilterPrimitiveStandardAttributes' functions
         virtual void parseMappedAttribute(MappedAttribute *attr);
 
-        virtual KCanvasFilterEffect *filterEffect() const = 0;
+        virtual KCanvasFilterEffect* filterEffect() const = 0;
 
     protected:
-        void setStandardAttributes(KCanvasFilterEffect *filterEffect) const;
+        void setStandardAttributes(KCanvasFilterEffect* filterEffect) const;
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }