Reviewed by Mitz.

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

        Cleanup coding style in svg clipping and painting classes.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 42377df56c6cf7fd6e6e28e9b6f197786c8b3631..6e1d7d14f547f0fce114ac8d060baa44a6919835 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,35 @@
+2006-10-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11217
+        Cleanup svg coding style
+
+        Cleanup coding style in svg clipping and painting classes.
+
+        * ksvg2/svg/SVGClipPathElement.cpp:
+        (WebCore::SVGClipPathElement::parseMappedAttribute):
+        (WebCore::SVGClipPathElement::canvasResource):
+        * ksvg2/svg/SVGClipPathElement.h:
+        * ksvg2/svg/SVGMarkerElement.cpp:
+        (WebCore::SVGMarkerElement::SVGMarkerElement):
+        (WebCore::SVGMarkerElement::parseMappedAttribute):
+        (WebCore::SVGMarkerElement::setOrientToAngle):
+        (WebCore::SVGMarkerElement::canvasResource):
+        * ksvg2/svg/SVGMarkerElement.h:
+        (WebCore::SVGMarkerElement::rendererIsNeeded):
+        * ksvg2/svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::SVGMaskElement):
+        (WebCore::SVGMaskElement::parseMappedAttribute):
+        (WebCore::SVGMaskElement::drawMaskerContent):
+        (WebCore::SVGMaskElement::canvasResource):
+        * ksvg2/svg/SVGMaskElement.h:
+        (WebCore::SVGMaskElement::rendererIsNeeded):
+        * ksvg2/svg/SVGPaint.cpp:
+        (WebCore::SVGPaint::setPaint):
+        (WebCore::SVGPaint::cssText):
+        * ksvg2/svg/SVGPaint.h:
+
 2006-10-20  David Hyatt  <hyatt@apple.com>
 
         Make sure to do the code that checks the repeatInterval before the timer has been

diff --git a/WebCore/ksvg2/svg/SVGClipPathElement.cpp b/WebCore/ksvg2/svg/SVGClipPathElement.cpp
index 2423b221961e925d3071412429d4ff1f94464580..18ba6d2ce8f12ea44c5101a50a0a4dbd7bd6598c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGClipPathElement.cpp
+++ b/WebCore/ksvg2/svg/SVGClipPathElement.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,20 +24,18 @@
 #ifdef SVG_SUPPORT
 #include "SVGClipPathElement.h"
 
-#include "Attr.h"
 #include "Document.h"
+#include "KRenderingDevice.h"
 #include "RenderView.h"
 #include "SVGHelper.h"
-#include "SVGNames.h"
 #include "SVGMatrix.h"
-#include "SVGRenderStyle.h"
-#include "cssstyleselector.h"
+#include "SVGNames.h"
 #include "SVGUnitTypes.h"
-#include <kcanvas/device/KRenderingDevice.h>
+#include "cssstyleselector.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGClipPathElement::SVGClipPathElement(const QualifiedName& tagName, Document *doc)
+SVGClipPathElement::SVGClipPathElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledTransformableElement(tagName, doc)
     , SVGTests()
     , SVGLangSpace()
@@ -54,7 +52,7 @@ SVGClipPathElement::~SVGClipPathElement()
 
 ANIMATED_PROPERTY_DEFINITIONS(SVGClipPathElement, int, Enumeration, enumeration, ClipPathUnits, clipPathUnits, SVGNames::clipPathUnitsAttr.localName(), m_clipPathUnits)
 
-void SVGClipPathElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGClipPathElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::clipPathUnitsAttr) {
@@ -73,26 +71,26 @@ void SVGClipPathElement::parseMappedAttribute(MappedAttribute *attr)
     }
 }
 
-KCanvasClipper *SVGClipPathElement::canvasResource()
+KCanvasClipper* SVGClipPathElement::canvasResource()
 {
     if (!view())
         return 0;
     if (!m_clipper)
-        m_clipper = static_cast<KCanvasClipper *>(renderingDevice()->createResource(RS_CLIPPER));
+        m_clipper = static_cast<KCanvasClipper*>(renderingDevice()->createResource(RS_CLIPPER));
     else
         m_clipper->resetClipData();
 
     bool bbox = clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
 
-    RenderStyle *clipPathStyle = styleForRenderer(parent()->renderer()); // FIXME: Manual style resolution is a hack
-    for (Node *n = firstChild(); n != 0; n = n->nextSibling()) {
-        SVGElement *e = svg_dynamic_cast(n);
+    RenderStyle* clipPathStyle = styleForRenderer(parent()->renderer()); // FIXME: Manual style resolution is a hack
+    for (Node* n = firstChild(); n; n = n->nextSibling()) {
+        SVGElement* e = svg_dynamic_cast(n);
         if (e && e->isStyled()) {
-            SVGStyledElement *styled = static_cast<SVGStyledElement *>(e);
-            RenderStyle *pathStyle = document()->styleSelector()->styleForElement(styled, clipPathStyle);
+            SVGStyledElement* styled = static_cast<SVGStyledElement*>(e);
+            RenderStyle* pathStyle = document()->styleSelector()->styleForElement(styled, clipPathStyle);
             Path pathData = styled->toPathData();
             if (e->isStyledTransformable())
-                pathData.transform(static_cast<SVGStyledTransformableElement *>(e)->localMatrix()->matrix());
+                pathData.transform(static_cast<SVGStyledTransformableElement*>(e)->localMatrix()->matrix());
             if (!pathData.isEmpty())
                 m_clipper->addClipData(pathData, pathStyle->svgStyle()->clipRule(), bbox);
             pathStyle->deref(view()->renderArena());
@@ -102,6 +100,8 @@ KCanvasClipper *SVGClipPathElement::canvasResource()
     return m_clipper;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGClipPathElement.h b/WebCore/ksvg2/svg/SVGClipPathElement.h
index e5ca42865ae7757bb053f2a790c61a193bd02a0b..bd075ead32dc71c065dd7ee6f300ecf90886d565 100644 (file)
--- a/WebCore/ksvg2/svg/SVGClipPathElement.h
+++ b/WebCore/ksvg2/svg/SVGClipPathElement.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,19 +24,18 @@
 #define KSVG_SVGClipPathElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "KCanvasClipper.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
 #include "SVGStyledTransformableElement.h"
-#include "SVGExternalResourcesRequired.h"
-
-#include "KCanvasClipper.h"
+#include "SVGTests.h"
 
 namespace WebCore
 {
     class SVGClipPathElement : public SVGStyledTransformableElement,
-                                   public SVGTests,
-                                   public SVGLangSpace,
-                                   public SVGExternalResourcesRequired
+                               public SVGTests,
+                               public SVGLangSpace,
+                               public SVGExternalResourcesRequired
     {
     public:
         SVGClipPathElement(const QualifiedName&, Document*);
@@ -44,10 +43,10 @@ namespace WebCore
         
         virtual bool isValid() const { return SVGTests::isValid(); }
 
-        virtual KCanvasClipper *canvasResource();
+        virtual KCanvasClipper* canvasResource();
 
         // 'SVGClipPathElement' functions
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute*);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -57,7 +56,7 @@ namespace WebCore
 
         ANIMATED_PROPERTY_DECLARATIONS(SVGClipPathElement, int, int, ClipPathUnits, clipPathUnits)
 
-        KCanvasClipper *m_clipper;
+        KCanvasClipper* m_clipper;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGMarkerElement.cpp b/WebCore/ksvg2/svg/SVGMarkerElement.cpp
index 876f67e54edba1bc688de6c0d203b731a137ae93..ef95a8f656a3f841c66b28ba819050a13a63b250 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMarkerElement.cpp
+++ b/WebCore/ksvg2/svg/SVGMarkerElement.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,7 +24,6 @@
 #ifdef SVG_SUPPORT
 #include "SVGMarkerElement.h"
 
-#include "Attr.h"
 #include "KRenderingDevice.h"
 #include "PlatformString.h"
 #include "RenderSVGContainer.h"
@@ -36,11 +35,10 @@
 #include "SVGNames.h"
 #include "SVGPreserveAspectRatio.h"
 #include "SVGSVGElement.h"
-#include "ksvg.h"
 
 namespace WebCore {
 
-SVGMarkerElement::SVGMarkerElement(const QualifiedName& tagName, Document *doc)
+SVGMarkerElement::SVGMarkerElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledElement(tagName, doc)
     , SVGLangSpace()
     , SVGExternalResourcesRequired()
@@ -61,7 +59,7 @@ SVGMarkerElement::~SVGMarkerElement()
     delete m_marker;
 }
 
-void SVGMarkerElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGMarkerElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::markerUnitsAttr) {
@@ -108,15 +106,15 @@ void SVGMarkerElement::setOrientToAuto()
     setOrientTypeBaseValue(SVG_MARKER_ORIENT_AUTO);
 }
 
-void SVGMarkerElement::setOrientToAngle(SVGAngle *angle)
+void SVGMarkerElement::setOrientToAngle(SVGAngle* angle)
 {
     setOrientTypeBaseValue(SVG_MARKER_ORIENT_ANGLE);
     setOrientAngleBaseValue(angle);
 }
 
-KCanvasMarker *SVGMarkerElement::canvasResource()
+KCanvasMarker* SVGMarkerElement::canvasResource()
 {
-    if(!m_marker)
+    if (!m_marker)
         m_marker = static_cast<KCanvasMarker*>(renderingDevice()->createResource(RS_MARKER));
     
     m_marker->setMarker(static_cast<RenderSVGContainer*>(renderer()));

diff --git a/WebCore/ksvg2/svg/SVGMarkerElement.h b/WebCore/ksvg2/svg/SVGMarkerElement.h
index a97b175ad7d792c329f1725cf01700ec2fe2baa6..cc811d03cedbeeca1b5f5615609373bb64ff2802 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMarkerElement.h
+++ b/WebCore/ksvg2/svg/SVGMarkerElement.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
 
@@ -37,9 +37,9 @@ namespace WebCore
     class SVGAngle;
     class SVGLength;
     class SVGMarkerElement : public SVGStyledElement,
-                                 public SVGLangSpace,
-                                 public SVGExternalResourcesRequired,
-                                 public SVGFitToViewBox
+                             public SVGLangSpace,
+                             public SVGExternalResourcesRequired,
+                             public SVGFitToViewBox
     {
     public:
         enum SVGMarkerUnitsType {
@@ -59,13 +59,13 @@ namespace WebCore
 
         // 'SVGMarkerElement' functions
         void setOrientToAuto();
-        void setOrientToAngle(SVGAngle *angle);
+        void setOrientToAngle(SVGAngle*);
 
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute*);
     
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
-        virtual RenderObject *createRenderer(RenderArena *arena, RenderStyle *style);
-        virtual KCanvasMarker *canvasResource();
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
+        virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+        virtual KCanvasMarker* canvasResource();
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }
@@ -83,7 +83,7 @@ namespace WebCore
         ANIMATED_PROPERTY_DECLARATIONS(SVGMarkerElement, int, int, OrientType, orientType)
         ANIMATED_PROPERTY_DECLARATIONS(SVGMarkerElement, SVGAngle*, RefPtr<SVGAngle>, OrientAngle, orientAngle)
 
-        KCanvasMarker *m_marker;
+        KCanvasMarker* m_marker;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGMaskElement.cpp b/WebCore/ksvg2/svg/SVGMaskElement.cpp
index 987c3c7b183db991d34ac93acb02cf296bf5e1d4..72567af28cf65f7bfce0f58dde03406f31c43d12 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMaskElement.cpp
+++ b/WebCore/ksvg2/svg/SVGMaskElement.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 Alexander Kellett <lypanov@kde.org>
 
     This file is part of the KDE project
@@ -26,22 +26,19 @@
 #include "SVGMaskElement.h"
 
 #include "GraphicsContext.h"
-#include "RenderSVGContainer.h"
 #include "KCanvasImage.h"
 #include "KRenderingDevice.h"
-#include "SVGLength.h"
+#include "RenderSVGContainer.h"
 #include "SVGHelper.h"
+#include "SVGLength.h"
 #include "SVGNames.h"
-#include "SVGRenderStyle.h"
 #include "cssstyleselector.h"
-#include "ksvg.h"
-#include "Attr.h"
 #include <wtf/OwnPtr.h>
 #include <math.h>
 
 namespace WebCore {
 
-SVGMaskElement::SVGMaskElement(const QualifiedName& tagName, Document *doc)
+SVGMaskElement::SVGMaskElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledLocatableElement(tagName, doc)
     , SVGURIReference()
     , SVGTests()
@@ -80,7 +77,7 @@ void SVGMaskElement::childrenChanged()
     SVGStyledLocatableElement::childrenChanged();
 }
 
-void SVGMaskElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGMaskElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::xAttr)
@@ -104,24 +101,24 @@ void SVGMaskElement::parseMappedAttribute(MappedAttribute *attr)
     }
 }
 
-KCanvasImage *SVGMaskElement::drawMaskerContent()
+KCanvasImage* SVGMaskElement::drawMaskerContent()
 {
-    KRenderingDevice *device = renderingDevice();
+    KRenderingDevice* device = renderingDevice();
     if (!device->currentContext()) // FIXME: hack for now until Image::lockFocus exists
         return 0;
     if (!renderer())
         return 0;
-    KCanvasImage *maskImage = static_cast<KCanvasImage *>(device->createResource(RS_IMAGE));
+    KCanvasImage* maskImage = static_cast<KCanvasImage*>(device->createResource(RS_IMAGE));
 
     IntSize size = IntSize(lroundf(width()->value()), lroundf(height()->value()));
     maskImage->init(size);
 
-    KRenderingDeviceContext *patternContext = device->contextForImage(maskImage);
+    KRenderingDeviceContext* patternContext = device->contextForImage(maskImage);
     device->pushContext(patternContext);
 
     OwnPtr<GraphicsContext> context(patternContext->createGraphicsContext());
 
-    RenderSVGContainer *maskContainer = static_cast<RenderSVGContainer *>(renderer());
+    RenderSVGContainer* maskContainer = static_cast<RenderSVGContainer*>(renderer());
     RenderObject::PaintInfo info(context.get(), IntRect(), PaintPhaseForeground, 0, 0, 0);
     maskContainer->setDrawsContents(true);
     maskContainer->paint(info, 0, 0);
@@ -140,14 +137,14 @@ RenderObject* SVGMaskElement::createRenderer(RenderArena* arena, RenderStyle*)
     return maskContainer;
 }
 
-KCanvasMasker *SVGMaskElement::canvasResource()
+KCanvasMasker* SVGMaskElement::canvasResource()
 {
     if (!m_masker) {
-        m_masker = static_cast<KCanvasMasker *>(renderingDevice()->createResource(RS_MASKER));
+        m_masker = static_cast<KCanvasMasker*>(renderingDevice()->createResource(RS_MASKER));
         m_dirty = true;
     }
     if (m_dirty) {
-        KCanvasImage *newMaskImage = drawMaskerContent();
+        KCanvasImage* newMaskImage = drawMaskerContent();
         m_masker->setMask(newMaskImage);
         m_dirty = (newMaskImage != 0);
     }

diff --git a/WebCore/ksvg2/svg/SVGMaskElement.h b/WebCore/ksvg2/svg/SVGMaskElement.h
index b2a57be54a485704bf86f53ba221c4b74d4a3186..687f9437311d77d99320d75c0d4ec442f6a8e192 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMaskElement.h
+++ b/WebCore/ksvg2/svg/SVGMaskElement.h
@@ -23,23 +23,22 @@
 #define SVGMaskElement_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "KCanvasMasker.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
-#include "SVGURIReference.h"
 #include "SVGStyledLocatableElement.h"
-#include "SVGExternalResourcesRequired.h"
-
-#include "KCanvasMasker.h"
+#include "SVGTests.h"
+#include "SVGURIReference.h"
 
 namespace WebCore
 {
     class Attribute;
     class SVGLength;
     class SVGMaskElement : public SVGStyledLocatableElement,
-                                  public SVGURIReference,
-                                  public SVGTests,
-                                  public SVGLangSpace,
-                                  public SVGExternalResourcesRequired
+                           public SVGURIReference,
+                           public SVGTests,
+                           public SVGLangSpace,
+                           public SVGExternalResourcesRequired
     {
     public:
         SVGMaskElement(const QualifiedName&, Document*);
@@ -48,15 +47,15 @@ namespace WebCore
 
         // 'SVGMaskElement' functions
         virtual void childrenChanged();
-        virtual void attributeChanged(Attribute* attr, bool preserveDecls);
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void attributeChanged(Attribute*, bool preserveDecls);
+        virtual void parseMappedAttribute(MappedAttribute*);
 
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
-        virtual RenderObject *createRenderer(RenderArena *arena, RenderStyle *style);
-        virtual KCanvasMasker *canvasResource();
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
+        virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
+        virtual KCanvasMasker* canvasResource();
 
     protected:
-        KCanvasImage *drawMaskerContent();
+        KCanvasImage* drawMaskerContent();
 
         ANIMATED_PROPERTY_FORWARD_DECLARATIONS(SVGURIReference, String, Href, href)
         ANIMATED_PROPERTY_FORWARD_DECLARATIONS(SVGExternalResourcesRequired, bool, ExternalResourcesRequired, externalResourcesRequired)
@@ -69,7 +68,7 @@ namespace WebCore
         virtual const SVGElement* contextElement() const { return this; }
 
     private:
-        KCanvasMasker *m_masker;
+        KCanvasMasker* m_masker;
         bool m_dirty;
     };
 

diff --git a/WebCore/ksvg2/svg/SVGPaint.cpp b/WebCore/ksvg2/svg/SVGPaint.cpp
index 682644f8a0d5b06f4cc2565aad6ac260a7447d51..fc4b381b0adf6acbd05b47d88d0e798e993fbc15 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPaint.cpp
+++ b/WebCore/ksvg2/svg/SVGPaint.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,7 +22,6 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "ksvg.h"
 #include "SVGPaint.h"
 
 namespace WebCore {
@@ -83,19 +82,19 @@ void SVGPaint::setPaint(SVGPaintType paintType, const String& uri, const String&
 {
     m_paintType = paintType;
 
-    if(m_paintType == SVG_PAINTTYPE_URI)
+    if (m_paintType == SVG_PAINTTYPE_URI)
         setUri(uri);
-    else if(m_paintType == SVG_PAINTTYPE_RGBCOLOR)
+    else if (m_paintType == SVG_PAINTTYPE_RGBCOLOR)
         setRGBColor(rgbPaint);
 }
 
 String SVGPaint::cssText() const
 {
-    if(m_paintType == SVG_PAINTTYPE_NONE)
+    if (m_paintType == SVG_PAINTTYPE_NONE)
         return "none";
-    else if(m_paintType == SVG_PAINTTYPE_CURRENTCOLOR)
+    else if (m_paintType == SVG_PAINTTYPE_CURRENTCOLOR)
         return "currentColor";
-    else if(m_paintType == SVG_PAINTTYPE_URI)
+    else if (m_paintType == SVG_PAINTTYPE_URI)
         return "url(" + m_uri + ")";
 
     return SVGColor::cssText();

diff --git a/WebCore/ksvg2/svg/SVGPaint.h b/WebCore/ksvg2/svg/SVGPaint.h
index eec537702ace6a243072fd761c902a878c087427..48de4197ed35c76be5cc034458e4221b068e4924 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPaint.h
+++ b/WebCore/ksvg2/svg/SVGPaint.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-    Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005, 2006 Rob Buis <buis@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmial.com)
 
     This file is part of the KDE project
@@ -25,8 +25,7 @@
 #define KSVG_SVGPaintImpl_H
 #ifdef SVG_SUPPORT
 
-#include "ksvg.h"
-#include <SVGColor.h>
+#include "SVGColor.h"
 
 namespace WebCore {