Reviewed by aroben.

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

        Cleanup coding style in svg shape classes.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c64e23f3ca386f563f94f20127b8b2de0c87e52d..8f69d2b20873929bdfd761e971d2a7a751767171 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,48 @@
+2006-10-09  Rob Buis  <buis@kde.org>
+
+        Reviewed by aroben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11217
+        Cleanup svg coding style
+
+        Cleanup coding style in svg shape classes.
+
+        * ksvg2/svg/SVGCircleElement.cpp:
+        (WebCore::SVGCircleElement::SVGCircleElement):
+        (WebCore::SVGCircleElement::parseMappedAttribute):
+        (WebCore::SVGCircleElement::pushAttributeContext):
+        * ksvg2/svg/SVGCircleElement.h:
+        (WebCore::SVGCircleElement::rendererIsNeeded):
+        * ksvg2/svg/SVGEllipseElement.cpp:
+        * ksvg2/svg/SVGEllipseElement.h:
+        (WebCore::SVGEllipseElement::rendererIsNeeded):
+        * ksvg2/svg/SVGLineElement.cpp:
+        (WebCore::SVGLineElement::parseMappedAttribute):
+        (WebCore::SVGLineElement::pushAttributeContext):
+        * ksvg2/svg/SVGLineElement.h:
+        (WebCore::SVGLineElement::rendererIsNeeded):
+        * ksvg2/svg/SVGPolyElement.cpp:
+        (WebCore::SVGPolyElement::SVGPolyElement):
+        (WebCore::SVGPolyElement::points):
+        (WebCore::SVGPolyElement::animatedPoints):
+        (WebCore::SVGPolyElement::parseMappedAttribute):
+        (WebCore::SVGPolyElement::notifyAttributeChange):
+        * ksvg2/svg/SVGPolyElement.h:
+        (WebCore::SVGPolyElement::rendererIsNeeded):
+        * ksvg2/svg/SVGPolygonElement.cpp:
+        (WebCore::SVGPolygonElement::SVGPolygonElement):
+        (WebCore::SVGPolygonElement::toPathData):
+        * ksvg2/svg/SVGPolygonElement.h:
+        * ksvg2/svg/SVGPolylineElement.cpp:
+        (WebCore::SVGPolylineElement::SVGPolylineElement):
+        (WebCore::SVGPolylineElement::toPathData):
+        * ksvg2/svg/SVGPolylineElement.h:
+        * ksvg2/svg/SVGRectElement.cpp:
+        (WebCore::SVGRectElement::parseMappedAttribute):
+        (WebCore::SVGRectElement::pushAttributeContext):
+        * ksvg2/svg/SVGRectElement.h:
+        (WebCore::SVGRectElement::rendererIsNeeded):
+
 2006-10-08  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/ksvg2/svg/SVGCircleElement.cpp b/WebCore/ksvg2/svg/SVGCircleElement.cpp
index 5cb555bd9b3c6b72bbacc3918719d760369b2d9f..0db7a760890fb0b73e6b5f4d85221bb69ea518e1 100644 (file)
--- a/WebCore/ksvg2/svg/SVGCircleElement.cpp
+++ b/WebCore/ksvg2/svg/SVGCircleElement.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 "SVGCircleElement.h"
 
 #include "FloatPoint.h"
-
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGCircleElement.h"
 #include "SVGLength.h"
+#include "SVGNames.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGCircleElement::SVGCircleElement(const QualifiedName& tagName, Document *doc)
+SVGCircleElement::SVGCircleElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledTransformableElement(tagName, doc)
     , SVGTests()
     , SVGLangSpace()
@@ -52,7 +50,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGCircleElement, SVGLength*, Length, length, Cx,
 ANIMATED_PROPERTY_DEFINITIONS(SVGCircleElement, SVGLength*, Length, length, Cy, cy, SVGNames::cyAttr.localName(), m_cy.get())
 ANIMATED_PROPERTY_DEFINITIONS(SVGCircleElement, SVGLength*, Length, length, R, r, SVGNames::rAttr.localName(), m_r.get())
 
-void SVGCircleElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGCircleElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::cxAttr)
@@ -80,10 +78,10 @@ Path SVGCircleElement::toPathData() const
     return Path::createCircle(FloatPoint(_cx, _cy), _r);
 }
 
-const SVGStyledElement *SVGCircleElement::pushAttributeContext(const SVGStyledElement *context)
+const SVGStyledElement* SVGCircleElement::pushAttributeContext(const SVGStyledElement* context)
 {
     // All attribute's contexts are equal (so just take the one from 'cx').
-    const SVGStyledElement *restore = cx()->context();
+    const SVGStyledElement* restore = cx()->context();
 
     cx()->setContext(context);
     cy()->setContext(context);
@@ -103,6 +101,8 @@ bool SVGCircleElement::hasPercentageValues() const
     return false;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGCircleElement.h b/WebCore/ksvg2/svg/SVGCircleElement.h
index 4567e7d5c8ad2580afb3e1a8dc410266c29158c9..27df376ed75e9b18198d3f936474c3530f915705 100644 (file)
--- a/WebCore/ksvg2/svg/SVGCircleElement.h
+++ b/WebCore/ksvg2/svg/SVGCircleElement.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,18 +24,18 @@
 #define KSVG_SVGCircleElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
 #include "SVGStyledTransformableElement.h"
-#include "SVGExternalResourcesRequired.h"
+#include "SVGTests.h"
 
 namespace WebCore
 {
     class SVGLength;
     class SVGCircleElement : public SVGStyledTransformableElement,
-                                 public SVGTests,
-                                 public SVGLangSpace,
-                                 public SVGExternalResourcesRequired
+                             public SVGTests,
+                             public SVGLangSpace,
+                             public SVGExternalResourcesRequired
     {
     public:
         SVGCircleElement(const QualifiedName&, Document*);
@@ -44,12 +44,12 @@ namespace WebCore
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         // 'SVGCircleElement' functions
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
         virtual Path toPathData() const;
 
-        virtual const SVGStyledElement *pushAttributeContext(const SVGStyledElement *context);
+        virtual const SVGStyledElement* pushAttributeContext(const SVGStyledElement* context);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }

diff --git a/WebCore/ksvg2/svg/SVGEllipseElement.cpp b/WebCore/ksvg2/svg/SVGEllipseElement.cpp
index 5c7292780643e461b920769ae5e0cbefb841fdce..4c427ebbf98fa5b6acf81433e20d0370930aab99 100644 (file)
--- a/WebCore/ksvg2/svg/SVGEllipseElement.cpp
+++ b/WebCore/ksvg2/svg/SVGEllipseElement.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 "SVGEllipseElement.h"
 
 #include "FloatPoint.h"
-
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGEllipseElement.h"
 #include "SVGLength.h"
+#include "SVGNames.h"
 
 namespace WebCore {
 
-SVGEllipseElement::SVGEllipseElement(const QualifiedName& tagName, Document *doc)
+SVGEllipseElement::SVGEllipseElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledTransformableElement(tagName, doc)
     , SVGTests()
     , SVGLangSpace()
@@ -54,7 +52,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGEllipseElement, SVGLength*, Length, length, Cy,
 ANIMATED_PROPERTY_DEFINITIONS(SVGEllipseElement, SVGLength*, Length, length, Rx, rx, SVGNames::rxAttr.localName(), m_rx.get())
 ANIMATED_PROPERTY_DEFINITIONS(SVGEllipseElement, SVGLength*, Length, length, Ry, ry, SVGNames::ryAttr.localName(), m_ry.get())
 
-void SVGEllipseElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGEllipseElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::cxAttr)
@@ -84,10 +82,10 @@ Path SVGEllipseElement::toPathData() const
     return Path::createEllipse(FloatPoint(_cx, _cy), _rx, _ry);
 }
 
-const SVGStyledElement *SVGEllipseElement::pushAttributeContext(const SVGStyledElement *context)
+const SVGStyledElement* SVGEllipseElement::pushAttributeContext(const SVGStyledElement* context)
 {
     // All attribute's contexts are equal (so just take the one from 'cx').
-    const SVGStyledElement *restore = cx()->context();
+    const SVGStyledElement* restore = cx()->context();
 
     cx()->setContext(context);
     cy()->setContext(context);

diff --git a/WebCore/ksvg2/svg/SVGEllipseElement.h b/WebCore/ksvg2/svg/SVGEllipseElement.h
index 73232fa2191ad1aefedb8bf4ff3f43ef9db3184f..62d8e1e23eb1eb25c4258c8fefbd79425ce7e5e8 100644 (file)
--- a/WebCore/ksvg2/svg/SVGEllipseElement.h
+++ b/WebCore/ksvg2/svg/SVGEllipseElement.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,18 +24,18 @@
 #define KSVG_SVGEllipseElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
 #include "SVGStyledTransformableElement.h"
-#include "SVGExternalResourcesRequired.h"
+#include "SVGTests.h"
 
 namespace WebCore
 {
     class SVGLength;
     class SVGEllipseElement : public SVGStyledTransformableElement,
-                                  public SVGTests,
-                                  public SVGLangSpace,
-                                  public SVGExternalResourcesRequired
+                              public SVGTests,
+                              public SVGLangSpace,
+                              public SVGExternalResourcesRequired
     {
     public:
         SVGEllipseElement(const QualifiedName&, Document*);
@@ -44,12 +44,12 @@ namespace WebCore
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         // 'SVGEllipseElement' functions
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
         virtual Path toPathData() const;
 
-        virtual const SVGStyledElement *pushAttributeContext(const SVGStyledElement *context);
+        virtual const SVGStyledElement* pushAttributeContext(const SVGStyledElement* context);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }

diff --git a/WebCore/ksvg2/svg/SVGLineElement.cpp b/WebCore/ksvg2/svg/SVGLineElement.cpp
index 0e31ae7f8336918bf13763c88bb6a010af577ed7..8a1d5d31f850070b59e9aeb3d97b42a67fcc19a0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLineElement.cpp
+++ b/WebCore/ksvg2/svg/SVGLineElement.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 "SVGLineElement.h"
 
 #include "FloatPoint.h"
-
-#include "SVGNames.h"
 #include "SVGHelper.h"
-#include "SVGLineElement.h"
 #include "SVGLength.h"
+#include "SVGNames.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGLineElement::SVGLineElement(const QualifiedName& tagName, Document *doc)
+SVGLineElement::SVGLineElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledTransformableElement(tagName, doc)
     , SVGTests()
     , SVGLangSpace()
@@ -54,7 +52,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGLineElement, SVGLength*, Length, length, Y1, y1
 ANIMATED_PROPERTY_DEFINITIONS(SVGLineElement, SVGLength*, Length, length, X2, x2, SVGNames::x2Attr.localName(), m_x2.get())
 ANIMATED_PROPERTY_DEFINITIONS(SVGLineElement, SVGLength*, Length, length, Y2, y2, SVGNames::y2Attr.localName(), m_y2.get())
 
-void SVGLineElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGLineElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::x1Attr)
@@ -67,9 +65,9 @@ void SVGLineElement::parseMappedAttribute(MappedAttribute *attr)
         y2BaseValue()->setValueAsString(value);
     else
     {
-        if(SVGTests::parseMappedAttribute(attr)) return;
-        if(SVGLangSpace::parseMappedAttribute(attr)) return;
-        if(SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
+        if (SVGTests::parseMappedAttribute(attr)) return;
+        if (SVGLangSpace::parseMappedAttribute(attr)) return;
+        if (SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
         SVGStyledTransformableElement::parseMappedAttribute(attr);
     }
 }
@@ -82,10 +80,10 @@ Path SVGLineElement::toPathData() const
     return Path::createLine(FloatPoint(_x1, _y1), FloatPoint(_x2, _y2));
 }
 
-const SVGStyledElement *SVGLineElement::pushAttributeContext(const SVGStyledElement *context)
+const SVGStyledElement* SVGLineElement::pushAttributeContext(const SVGStyledElement* context)
 {
     // All attribute's contexts are equal (so just take the one from 'x1').
-    const SVGStyledElement *restore = x1()->context();
+    const SVGStyledElement* restore = x1()->context();
 
     x1()->setContext(context);
     y1()->setContext(context);
@@ -107,6 +105,8 @@ bool SVGLineElement::hasPercentageValues() const
     return false;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGLineElement.h b/WebCore/ksvg2/svg/SVGLineElement.h
index dde014b66e450cddb1262b82db23dfa04a5d1819..8deb0e5337f37a2d443f07627a987585447f2857 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLineElement.h
+++ b/WebCore/ksvg2/svg/SVGLineElement.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,18 +24,18 @@
 #define KSVG_SVGLineElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
 #include "SVGStyledTransformableElement.h"
-#include "SVGExternalResourcesRequired.h"
+#include "SVGTests.h"
 
 namespace WebCore
 {
     class SVGLength;
     class SVGLineElement : public SVGStyledTransformableElement,
-                               public SVGTests,
-                               public SVGLangSpace,
-                               public SVGExternalResourcesRequired
+                           public SVGTests,
+                           public SVGLangSpace,
+                           public SVGExternalResourcesRequired
     {
     public:
         SVGLineElement(const QualifiedName&, Document*);
@@ -44,12 +44,12 @@ namespace WebCore
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         // 'SVGLineElement' functions
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
         virtual Path toPathData() const;
 
-        virtual const SVGStyledElement *pushAttributeContext(const SVGStyledElement *context);
+        virtual const SVGStyledElement* pushAttributeContext(const SVGStyledElement* context);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }

diff --git a/WebCore/ksvg2/svg/SVGPolyElement.cpp b/WebCore/ksvg2/svg/SVGPolyElement.cpp
index 27dac592fbfa16e4bca1518776aa4ab81bc1628d..c7c36b4a7cd483854e2392298987eef25b7406cb 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolyElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPolyElement.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,16 +24,20 @@
 #ifdef SVG_SUPPORT
 #include "SVGPolyElement.h"
 
-#include "Attr.h"
 #include "Document.h"
 #include "SVGHelper.h"
 #include "SVGNames.h"
 #include "SVGPointList.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGPolyElement::SVGPolyElement(const QualifiedName& tagName, Document *doc)
-: SVGStyledTransformableElement(tagName, doc), SVGTests(), SVGLangSpace(), SVGExternalResourcesRequired(), SVGAnimatedPoints(), SVGPolyParser()
+SVGPolyElement::SVGPolyElement(const QualifiedName& tagName, Document* doc)
+    : SVGStyledTransformableElement(tagName, doc)
+    , SVGTests()
+    , SVGLangSpace()
+    , SVGExternalResourcesRequired()
+    , SVGAnimatedPoints()
+    , SVGPolyParser()
 {
 }
 
@@ -41,26 +45,26 @@ SVGPolyElement::~SVGPolyElement()
 {
 }
 
-SVGPointList *SVGPolyElement::points() const
+SVGPointList* SVGPolyElement::points() const
 {
     return lazy_create<SVGPointList>(m_points);
 }
 
-SVGPointList *SVGPolyElement::animatedPoints() const
+SVGPointList* SVGPolyElement::animatedPoints() const
 {
     return 0;
 }
 
-void SVGPolyElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGPolyElement::parseMappedAttribute(MappedAttribute* attr)
 {
     if (attr->name() == SVGNames::pointsAttr) {
         ExceptionCode ec = 0;
         points()->clear(ec);
         parsePoints(attr->value().deprecatedString());
     } else {
-        if(SVGTests::parseMappedAttribute(attr)) return;
-        if(SVGLangSpace::parseMappedAttribute(attr)) return;
-        if(SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
+        if (SVGTests::parseMappedAttribute(attr)) return;
+        if (SVGLangSpace::parseMappedAttribute(attr)) return;
+        if (SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
         SVGStyledTransformableElement::parseMappedAttribute(attr);
     }
 }
@@ -92,7 +96,7 @@ void SVGPolyElement::notifyAttributeChange() const
     }
 
     String p("points");
-    RefPtr<Attr> attr = const_cast<SVGPolyElement *>(this)->getAttributeNode(p.impl());
+    RefPtr<Attr> attr = const_cast<SVGPolyElement*>(this)->getAttributeNode(p.impl());
     if (attr) {
         ExceptionCode ec = 0;
         ignoreNotifications = true; // prevent recursion.
@@ -101,6 +105,8 @@ void SVGPolyElement::notifyAttributeChange() const
     }
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGPolyElement.h b/WebCore/ksvg2/svg/SVGPolyElement.h
index 78467f2e42b4ab9961c6b6fea5d5a9cb70b5d7d5..309a7a567e17d23cae98554d009d0f96dfe125bb 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolyElement.h
+++ b/WebCore/ksvg2/svg/SVGPolyElement.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,21 +24,21 @@
 #define KSVG_SVGPolyElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
-#include "svgpathparser.h"
-#include "SVGLangSpace.h"
-#include "SVGStyledTransformableElement.h"
 #include "SVGAnimatedPoints.h"
 #include "SVGExternalResourcesRequired.h"
+#include "SVGLangSpace.h"
+#include "SVGStyledTransformableElement.h"
+#include "SVGTests.h"
+#include "svgpathparser.h"
 
 namespace WebCore
 {
     class SVGPolyElement :  public SVGStyledTransformableElement,
-                                public SVGTests,
-                                public SVGLangSpace,
-                                public SVGExternalResourcesRequired,
-                                public SVGAnimatedPoints,
-                                public SVGPolyParser
+                            public SVGTests,
+                            public SVGLangSpace,
+                            public SVGExternalResourcesRequired,
+                            public SVGAnimatedPoints,
+                            public SVGPolyParser
     {
     public:
         SVGPolyElement(const QualifiedName&, Document*);
@@ -47,12 +47,12 @@ namespace WebCore
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         // Derived from: 'SVGAnimatedPoints'
-        virtual SVGPointList *points() const;
-        virtual SVGPointList *animatedPoints() const;
+        virtual SVGPointList* points() const;
+        virtual SVGPointList* animatedPoints() const;
 
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
  
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
 
         virtual void notifyAttributeChange() const;
 

diff --git a/WebCore/ksvg2/svg/SVGPolygonElement.cpp b/WebCore/ksvg2/svg/SVGPolygonElement.cpp
index dc0daab16db85c37a9ba553d6e4f491c0db442e8..97041c69d71cc9d97277d688ba58a9960e73bdf8 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolygonElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPolygonElement.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,15 +22,14 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "SVGPointList.h"
 #include "SVGPolygonElement.h"
 
-#include <kcanvas/device/KRenderingDevice.h>
+#include "SVGPointList.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGPolygonElement::SVGPolygonElement(const QualifiedName& tagName, Document *doc)
-: SVGPolyElement(tagName, doc)
+SVGPolygonElement::SVGPolygonElement(const QualifiedName& tagName, Document* doc)
+    : SVGPolyElement(tagName, doc)
 {
 }
 
@@ -42,7 +41,7 @@ Path SVGPolygonElement::toPathData() const
 {
     Path polyData;
     int len = points()->numberOfItems();
-    if(len < 1)
+    if (len < 1)
         return polyData;
     
     ExceptionCode ec = 0;
@@ -54,6 +53,8 @@ Path SVGPolygonElement::toPathData() const
     return polyData;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGPolygonElement.h b/WebCore/ksvg2/svg/SVGPolygonElement.h
index 181e0daf8646254ee7cc16b848bd90d52127d845..f71b0ba8b080e6f21f92b21e8ebecc06f1717d65 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolygonElement.h
+++ b/WebCore/ksvg2/svg/SVGPolygonElement.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
 
@@ -28,7 +28,7 @@
 
 namespace WebCore
 {
-    class SVGPolygonElement :    public SVGPolyElement
+    class SVGPolygonElement : public SVGPolyElement
     {
     public:
         SVGPolygonElement(const QualifiedName&, Document*);

diff --git a/WebCore/ksvg2/svg/SVGPolylineElement.cpp b/WebCore/ksvg2/svg/SVGPolylineElement.cpp
index 691365845180acc7ed55573b8f46e90ee8ae639e..f3f5e624863f01f9d6176e1873cac687729c6a63 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolylineElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPolylineElement.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,15 +22,14 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "SVGPointList.h"
 #include "SVGPolylineElement.h"
 
-#include <kcanvas/device/KRenderingDevice.h>
+#include "SVGPointList.h"
 
-using namespace WebCore;
+namespace WebCore {
 
-SVGPolylineElement::SVGPolylineElement(const QualifiedName& tagName, Document *doc)
-: SVGPolyElement(tagName, doc)
+SVGPolylineElement::SVGPolylineElement(const QualifiedName& tagName, Document* doc)
+    : SVGPolyElement(tagName, doc)
 {
 }
 
@@ -42,7 +41,7 @@ Path SVGPolylineElement::toPathData() const
 {
     Path polyData;
     int len = points()->numberOfItems();
-    if(len < 1)
+    if (len < 1)
         return polyData;
 
     ExceptionCode ec = 0;
@@ -53,6 +52,8 @@ Path SVGPolylineElement::toPathData() const
     return polyData;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGPolylineElement.h b/WebCore/ksvg2/svg/SVGPolylineElement.h
index 618feea85c2c3e56baa383761d513a44b1e4b819..bdbcf254a792fa1bb5602e3b4e51c1d7b0c15278 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolylineElement.h
+++ b/WebCore/ksvg2/svg/SVGPolylineElement.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
 

diff --git a/WebCore/ksvg2/svg/SVGRectElement.cpp b/WebCore/ksvg2/svg/SVGRectElement.cpp
index a62dffa53f5412e146b4790e85dbca01e925aa47..a56eb9fc10e27e85fb98c2f913acae58ce409e4c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGRectElement.cpp
+++ b/WebCore/ksvg2/svg/SVGRectElement.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,6 @@
 #ifdef SVG_SUPPORT
 #include "SVGRectElement.h"
 
-#include "Attr.h"
-#include "KRenderingDevice.h"
-#include "KRenderingFillPainter.h"
-#include "KRenderingPaintServerSolid.h"
 #include "SVGHelper.h"
 #include "SVGLength.h"
 #include "SVGNames.h"
@@ -59,7 +55,7 @@ ANIMATED_PROPERTY_DEFINITIONS(SVGRectElement, SVGLength*, Length, length, Height
 ANIMATED_PROPERTY_DEFINITIONS(SVGRectElement, SVGLength*, Length, length, Rx, rx, SVGNames::rxAttr.localName(), m_rx.get())
 ANIMATED_PROPERTY_DEFINITIONS(SVGRectElement, SVGLength*, Length, length, Ry, ry, SVGNames::ryAttr.localName(), m_ry.get())
 
-void SVGRectElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGRectElement::parseMappedAttribute(MappedAttribute* attr)
 {
     const AtomicString& value = attr->value();
     if (attr->name() == SVGNames::xAttr)
@@ -100,10 +96,10 @@ Path SVGRectElement::toPathData() const
     return Path::createRectangle(rect);
 }
 
-const SVGStyledElement *SVGRectElement::pushAttributeContext(const SVGStyledElement *context)
+const SVGStyledElement* SVGRectElement::pushAttributeContext(const SVGStyledElement* context)
 {
     // All attribute's contexts are equal (so just take the one from 'x').
-    const SVGStyledElement *restore = x()->context();
+    const SVGStyledElement* restore = x()->context();
 
     x()->setContext(context);
     y()->setContext(context);

diff --git a/WebCore/ksvg2/svg/SVGRectElement.h b/WebCore/ksvg2/svg/SVGRectElement.h
index cc961ce48586aff20b52d7f8578a067805601ce2..4d69427e8de59d5e1a9714e1d6f31f58a49f8cdc 100644 (file)
--- a/WebCore/ksvg2/svg/SVGRectElement.h
+++ b/WebCore/ksvg2/svg/SVGRectElement.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,18 +24,18 @@
 #define KSVG_SVGRectElementImpl_H
 #ifdef SVG_SUPPORT
 
-#include "SVGTests.h"
+#include "SVGExternalResourcesRequired.h"
 #include "SVGLangSpace.h"
 #include "SVGStyledTransformableElement.h"
-#include "SVGExternalResourcesRequired.h"
+#include "SVGTests.h"
 
 namespace WebCore
 {
     class SVGLength;
     class SVGRectElement : public SVGStyledTransformableElement,
-                               public SVGTests,
-                               public SVGLangSpace,
-                               public SVGExternalResourcesRequired
+                           public SVGTests,
+                           public SVGLangSpace,
+                           public SVGExternalResourcesRequired
     {
     public:
         SVGRectElement(const QualifiedName&, Document*);
@@ -44,12 +44,12 @@ namespace WebCore
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         // 'SVGRectElement' functions
-        virtual void parseMappedAttribute(MappedAttribute *attr);
+        virtual void parseMappedAttribute(MappedAttribute* attr);
 
-        virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
+        virtual bool rendererIsNeeded(RenderStyle* style) { return StyledElement::rendererIsNeeded(style); }
         virtual Path toPathData() const;
 
-        virtual const SVGStyledElement *pushAttributeContext(const SVGStyledElement *context);
+        virtual const SVGStyledElement* pushAttributeContext(const SVGStyledElement* context);
 
     protected:
         virtual const SVGElement* contextElement() const { return this; }