Reviewed by Mitz.

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

        Cleanup coding style in svg basic datastructure classes.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b65e9180e916ad7d674f0ac282357f6909e9aa8e..a151d3b49b33aa41ba9d2f7210a1dd6e4bad6a48 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,76 @@
+2006-10-14  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 basic datastructure classes.
+
+        * ksvg2/svg/SVGAngle.cpp:
+        (WebCore::SVGAngle::valueAsString):
+        (WebCore::SVGAngle::context):
+        (WebCore::SVGAngle::setContext):
+        * ksvg2/svg/SVGAngle.h:
+        * ksvg2/svg/SVGColor.cpp:
+        * ksvg2/svg/SVGColor.h:
+        * ksvg2/svg/SVGElement.cpp:
+        (WebCore::SVGElement::ownerSVGElement):
+        (WebCore::SVGElement::viewportElement):
+        (WebCore::SVGElement::parseMappedAttribute):
+        (WebCore::SVGElement::childShouldCreateRenderer):
+        * ksvg2/svg/SVGElement.h:
+        (WebCore::svg_dynamic_cast):
+        * ksvg2/svg/SVGFitToViewBox.cpp:
+        (WebCore::SVGFitToViewBox::parseViewBox):
+        * ksvg2/svg/SVGFitToViewBox.h:
+        * ksvg2/svg/SVGLangSpace.cpp:
+        (WebCore::SVGLangSpace::parseMappedAttribute):
+        * ksvg2/svg/SVGLangSpace.h:
+        * ksvg2/svg/SVGLength.cpp:
+        (WebCore::SVGLength::SVGLength):
+        (WebCore::SVGLength::setValueAsString):
+        (WebCore::SVGLength::dpi):
+        (WebCore::SVGLength::updateValue):
+        (WebCore::SVGLength::updateValueInSpecifiedUnits):
+        (WebCore::SVGLength::context):
+        (WebCore::SVGLength::setContext):
+        * ksvg2/svg/SVGLength.h:
+        * ksvg2/svg/SVGLengthList.cpp:
+        * ksvg2/svg/SVGLengthList.h:
+        * ksvg2/svg/SVGLocatable.cpp:
+        (WebCore::SVGLocatable::nearestViewportElement):
+        (WebCore::SVGLocatable::farthestViewportElement):
+        (WebCore::SVGLocatable::getBBox):
+        (WebCore::SVGLocatable::getCTM):
+        (WebCore::SVGLocatable::getScreenCTM):
+        * ksvg2/svg/SVGNumberList.cpp:
+        * ksvg2/svg/SVGNumberList.h:
+        * ksvg2/svg/SVGPreserveAspectRatio.cpp:
+        (WebCore::SVGPreserveAspectRatio::SVGPreserveAspectRatio):
+        (WebCore::SVGPreserveAspectRatio::getCTM):
+        * ksvg2/svg/SVGPreserveAspectRatio.h:
+        * ksvg2/svg/SVGStringList.cpp:
+        (WebCore::SVGStringList::reset):
+        * ksvg2/svg/SVGStringList.h:
+        * ksvg2/svg/SVGStylable.cpp:
+        * ksvg2/svg/SVGStylable.h:
+        * ksvg2/svg/SVGTests.cpp:
+        (WebCore::SVGTests::requiredFeatures):
+        (WebCore::SVGTests::requiredExtensions):
+        (WebCore::SVGTests::systemLanguage):
+        (WebCore::SVGTests::isValid):
+        (WebCore::SVGTests::parseMappedAttribute):
+        * ksvg2/svg/SVGTests.h:
+        * ksvg2/svg/SVGTransformable.cpp:
+        (WebCore::SVGTransformable::parseTransformAttribute):
+        * ksvg2/svg/SVGTransformable.h:
+        * ksvg2/svg/SVGURIReference.cpp:
+        (WebCore::SVGURIReference::parseMappedAttribute):
+        * ksvg2/svg/SVGZoomAndPan.cpp:
+        (WebCore::SVGZoomAndPan::parseMappedAttribute):
+        * ksvg2/svg/SVGZoomAndPan.h:
+
 2006-10-15  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver.

diff --git a/WebCore/ksvg2/svg/SVGAngle.cpp b/WebCore/ksvg2/svg/SVGAngle.cpp
index 63d93dc935f25f4617799efef8b16fae9e18f99b..5d950849a0bb294d14c3175078fe24d096072b24 100644 (file)
--- a/WebCore/ksvg2/svg/SVGAngle.cpp
+++ b/WebCore/ksvg2/svg/SVGAngle.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,11 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include <math.h>
-
-#include <ksvg2/ksvg.h>
-
-#include "DeprecatedString.h"
 #include "SVGAngle.h"
-#include "SVGHelper.h"
 
-using namespace WebCore;
+#include <math.h>
+
+namespace WebCore {
 
 const double deg2rad = 0.017453292519943295769; // pi/180
 const double deg2grad = 400.0 / 360.0;
@@ -111,7 +107,7 @@ String SVGAngle::valueAsString() const
 {
     m_valueAsString = String::number(m_valueInSpecifiedUnits);
 
-    switch(m_unitType) {
+    switch (m_unitType) {
         case SVG_ANGLETYPE_UNSPECIFIED:
         case SVG_ANGLETYPE_DEG:
             m_valueAsString += "deg";
@@ -178,16 +174,17 @@ double SVGAngle::shortestArcBisector(double angle1, double angle2)
     return bisector;
 }
 
-const SVGStyledElement *SVGAngle::context() const
+const SVGStyledElement* SVGAngle::context() const
 {
     return m_context;
 }
 
-void SVGAngle::setContext(const SVGStyledElement *context)
+void SVGAngle::setContext(const SVGStyledElement* context)
 {
     m_context = context;
 }
 
+}
 
 // vim:ts=4:noet
 #endif // SVG_SUPPORT

diff --git a/WebCore/ksvg2/svg/SVGAngle.h b/WebCore/ksvg2/svg/SVGAngle.h
index ca67bdb71c186b471c52904d4369eef860f5b256..5bc215b3ccc2e4323bf3fd752b54ee5e2854f5b7 100644 (file)
--- a/WebCore/ksvg2/svg/SVGAngle.h
+++ b/WebCore/ksvg2/svg/SVGAngle.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
 
@@ -72,7 +72,7 @@ namespace WebCore {
         float m_value;
         float m_valueInSpecifiedUnits;
         mutable String m_valueAsString;
-        const SVGStyledElement *m_context;
+        const SVGStyledElement* m_context;
 
         void calculate();
     };

diff --git a/WebCore/ksvg2/svg/SVGColor.cpp b/WebCore/ksvg2/svg/SVGColor.cpp
index 0285ce1d32fad6323605de712fea581ae81a87f7..1de468517bc87dfc146a1cbb5be01bf7a03bffdf 100644 (file)
--- a/WebCore/ksvg2/svg/SVGColor.cpp
+++ b/WebCore/ksvg2/svg/SVGColor.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,7 @@
 #ifdef SVG_SUPPORT
 #include "SVGColor.h"
 
-#include "ksvg.h"
+#include "SVGException.h"
 
 namespace WebCore {
 

diff --git a/WebCore/ksvg2/svg/SVGColor.h b/WebCore/ksvg2/svg/SVGColor.h
index 95b0aba14151a43f48b55d01e12ca9235979dbc2..26752048437403bb1ce413106c89bcb7e4f92ea3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGColor.h
+++ b/WebCore/ksvg2/svg/SVGColor.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
 
@@ -29,9 +29,9 @@
 #include "PlatformString.h"
 
 namespace WebCore {
-    class RGBColor;
+   
     typedef int ExceptionCode;
-    
+ 
     class SVGColor : public CSSValue {
     public:
         SVGColor();

diff --git a/WebCore/ksvg2/svg/SVGElement.cpp b/WebCore/ksvg2/svg/SVGElement.cpp
index 799023a4e73652c4042a5acf29835326738278b1..c9f6d341e4da91692fa3d2d6550d73da1bf954e0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGElement.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,8 @@
 #ifdef SVG_SUPPORT
 #include "SVGElement.h"
 
-#include "Attr.h"
-#include "Document.h"
 #include "DOMImplementation.h"
+#include "Document.h"
 #include "Event.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -36,7 +35,6 @@
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
 #include "XMLNames.h"
-#include "ksvg.h"
 
 namespace WebCore {
 
@@ -82,8 +80,8 @@ void SVGElement::setXmlbase(const String& value, ExceptionCode&)
 
 SVGSVGElement* SVGElement::ownerSVGElement() const
 {
-    Node *n = parentNode();
-    while(n) {
+    Node* n = parentNode();
+    while (n) {
         if (n->nodeType() == ELEMENT_NODE && n->hasTagName(SVGNames::svgTag))
             return static_cast<SVGSVGElement*>(n);
 
@@ -95,7 +93,7 @@ SVGSVGElement* SVGElement::ownerSVGElement() const
 
 SVGElement* SVGElement::viewportElement() const
 {
-    Node *n = parentNode();
+    Node* n = parentNode();
     while (n) {
         if (n->isElementNode() &&
             (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::symbolTag)))
@@ -129,7 +127,7 @@ void SVGElement::addSVGEventListener(const AtomicString& eventType, const Attrib
         createSVGEventListener(attr->localName().domString(), attr->value(), this));
 }
 
-void SVGElement::parseMappedAttribute(MappedAttribute *attr)
+void SVGElement::parseMappedAttribute(MappedAttribute* attr)
 {
     // standard events
     if (attr->name() == onloadAttr)
@@ -189,7 +187,7 @@ void SVGElement::closeRenderer()
     sendSVGLoadEventIfPossible();
 }
 
-bool SVGElement::childShouldCreateRenderer(Node *child) const
+bool SVGElement::childShouldCreateRenderer(Node* child) const
 {
     if (child->isSVGElement())
         return static_cast<SVGElement*>(child)->isValid();

diff --git a/WebCore/ksvg2/svg/SVGElement.h b/WebCore/ksvg2/svg/SVGElement.h
index 84b38845184f0755beedcb19d176988aabffe307..394bfa20491afc6a2b36f0478486409a7291ee35 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.h
+++ b/WebCore/ksvg2/svg/SVGElement.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
 
@@ -27,10 +27,9 @@
 #include "Document.h"
 #include "FloatRect.h"
 #include "StyledElement.h"
-
-#include "SVGNames.h"
 #include "SVGAnimatedTemplate.h"
 #include "SVGDocumentExtensions.h"
+#include "SVGNames.h"
 
 #define ANIMATED_PROPERTY_EMPTY_DECLARATIONS(BareType, NullType, UpperProperty, LowerProperty) \
 public: \
@@ -205,7 +204,7 @@ namespace WebCore {
 
     static inline SVGElement* svg_dynamic_cast(Node* node)
     {
-        SVGElement* svgElement = NULL;
+        SVGElement* svgElement = 0;
         if (node && node->isSVGElement())
             svgElement = static_cast<SVGElement*>(node);
         return svgElement;

diff --git a/WebCore/ksvg2/svg/SVGFitToViewBox.cpp b/WebCore/ksvg2/svg/SVGFitToViewBox.cpp
index 412228df96505b04b279ab3bc2b04a57ed71675d..61735ce47bf29ad1d46ab16a3a1679e7671ca3b0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFitToViewBox.cpp
+++ b/WebCore/ksvg2/svg/SVGFitToViewBox.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,11 +22,9 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
+#include "SVGFitToViewBox.h"
 
-#include "Attr.h"
 #include "FloatRect.h"
-#include "SVGPreserveAspectRatio.h"
-#include "SVGFitToViewBox.h"
 #include "SVGNames.h"
 #include "SVGPreserveAspectRatio.h"
 #include "SVGSVGElement.h"
@@ -52,9 +50,9 @@ void SVGFitToViewBox::parseViewBox(const String& str)
 {
     double x = 0, y = 0, w = 0, h = 0;
     DeprecatedString viewbox = str.deprecatedString();
-    const char *p = viewbox.latin1();
-    const char *end = p + viewbox.length();
-    const char *c = p;
+    const char* p = viewbox.latin1();
+    const char* end = p + viewbox.length();
+    const char* c = p;
     p = parseCoord(c, x);
     if (p == c)
         goto bail_out;
@@ -66,7 +64,7 @@ void SVGFitToViewBox::parseViewBox(const String& str)
 
     c = p;
     p = parseCoord(c, w);
-    if(w < 0.0 || p == c) // check that width is positive
+    if (w < 0.0 || p == c) // check that width is positive
         goto bail_out;
 
     c = p;

diff --git a/WebCore/ksvg2/svg/SVGFitToViewBox.h b/WebCore/ksvg2/svg/SVGFitToViewBox.h
index b0cf8766d0cdedddd41dd71c95a3659bb22bc585..a9997f36eb479a9281a45de13fa0c30d0b2c5388 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFitToViewBox.h
+++ b/WebCore/ksvg2/svg/SVGFitToViewBox.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,9 +28,9 @@
 
 namespace WebCore {
     class Attribute;
-    class StringImpl;
-    class SVGPreserveAspectRatio;
     class SVGMatrix;
+    class SVGPreserveAspectRatio;
+    class StringImpl;
 
     class SVGFitToViewBox {
     public:
@@ -39,9 +39,9 @@ namespace WebCore {
 
         // 'SVGFitToViewBox' functions
         void parseViewBox(const String&);
-        SVGMatrix *viewBoxToViewTransform(float viewWidth, float viewHeight) const;
+        SVGMatrix* viewBoxToViewTransform(float viewWidth, float viewHeight) const;
 
-        bool parseMappedAttribute(MappedAttribute *attr);
+        bool parseMappedAttribute(MappedAttribute*);
 
     protected:
         virtual const SVGElement* contextElement() const = 0;

diff --git a/WebCore/ksvg2/svg/SVGLangSpace.cpp b/WebCore/ksvg2/svg/SVGLangSpace.cpp
index e8f8a0c209c5c033184d205ffd3dc7fff30d826c..03dada655253d4f084bb56afda5952793f1545aa 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLangSpace.cpp
+++ b/WebCore/ksvg2/svg/SVGLangSpace.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,13 +24,10 @@
 #ifdef SVG_SUPPORT
 #include "SVGLangSpace.h"
 
-#include "Attr.h"
 #include "SVGElement.h"
 #include "SVGNames.h"
-#include "StringImpl.h"
-#include "ksvg.h"
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGLangSpace::SVGLangSpace()
 {
@@ -60,15 +57,12 @@ void SVGLangSpace::setXmlspace(const AtomicString& xmlSpace)
     m_space = xmlSpace;
 }
 
-bool SVGLangSpace::parseMappedAttribute(MappedAttribute *attr)
+bool SVGLangSpace::parseMappedAttribute(MappedAttribute* attr)
 {
-    if (attr->name() == SVGNames::langAttr)
-    {
+    if (attr->name() == SVGNames::langAttr) {
         setXmllang(attr->value());
         return true;
-    }
-    else if (attr->name() == SVGNames::spaceAttr)
-    {
+    } else if (attr->name() == SVGNames::spaceAttr) {
         setXmlspace(attr->value());
         return true;
     }
@@ -76,6 +70,8 @@ bool SVGLangSpace::parseMappedAttribute(MappedAttribute *attr)
     return false;
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGLangSpace.h b/WebCore/ksvg2/svg/SVGLangSpace.h
index 28749898ffc4d8d60d8a3bf5a54de5376675720e..8c1baabb3177cb5cd84617143dd34f91c0117739 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLangSpace.h
+++ b/WebCore/ksvg2/svg/SVGLangSpace.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
 
@@ -29,8 +29,6 @@
 namespace WebCore {
 
     class MappedAttribute;
-    class StringImpl;
-    class SVGLength;
 
     class SVGLangSpace {
     public:
@@ -44,7 +42,7 @@ namespace WebCore {
         const AtomicString& xmlspace() const;
         void setXmlspace(const AtomicString& xmlSpace);
 
-        bool parseMappedAttribute(MappedAttribute *attr);
+        bool parseMappedAttribute(MappedAttribute*);
 
     private:
         AtomicString m_lang;

diff --git a/WebCore/ksvg2/svg/SVGLength.cpp b/WebCore/ksvg2/svg/SVGLength.cpp
index 2b292235e31e132b0177ccb57021280dfa404625..c1b2c0e3f01fe5e378861966b15b9ebe0b3e5e10 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLength.cpp
+++ b/WebCore/ksvg2/svg/SVGLength.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
 
@@ -29,9 +29,7 @@
 #include "SVGElement.h"
 #include "SVGLength.h"
 #include "SVGSVGElement.h"
-#include "ksvg.h"
 #include "svgpathparser.h"
-
 #include <math.h>
 
 using namespace std;
@@ -49,7 +47,7 @@ static const char* UnitText[] =
 
 namespace WebCore {
 
-SVGLength::SVGLength(const SVGStyledElement *context, LengthMode mode, const SVGElement *viewport)
+SVGLength::SVGLength(const SVGStyledElement* context, LengthMode mode, const SVGElement* viewport)
     : Shared<SVGLength>()
     , m_value(0)
     , m_valueInSpecifiedUnits(0)
@@ -106,14 +104,14 @@ float SVGLength::valueInSpecifiedUnits() const
 
 void SVGLength::setValueAsString(const String& s)
 {
-    if(s.isEmpty())
+    if (s.isEmpty())
         return;
 
     DeprecatedString valueAsQString = s.deprecatedString();
 
     double convertedNumber = 0;
-    const char *start = valueAsQString.latin1();
-    const char *end = parseCoord(start, convertedNumber);
+    const char* start = valueAsQString.latin1();
+    const char* end = parseCoord(start, convertedNumber);
     m_valueInSpecifiedUnits = convertedNumber;
 
     unsigned int diff = end - start;
@@ -168,13 +166,12 @@ void SVGLength::convertToSpecifiedUnits(unsigned short unitType)
 double SVGLength::dpi() const
 {
     /* FIXME: DPI detection
-    if(context && context->ownerDoc())
-    {
-        if(mode == LM_WIDTH)
+    if (context && context->ownerDoc()) {
+        if (mode == LM_WIDTH)
             return 25.4 * context->ownerDoc()->screenPixelsPerMillimeterX();
-        else if(mode == LM_HEIGHT)
+        else if (mode == LM_HEIGHT)
             return 25.4 * context->ownerDoc()->screenPixelsPerMillimeterY();
-        else if(mode == LM_OTHER)
+        else if (mode == LM_OTHER)
             return 25.4 * context->ownerDoc()->screenPixelsPerMillimeterX();
     }
     */
@@ -184,8 +181,7 @@ double SVGLength::dpi() const
 
 void SVGLength::updateValue(bool notify)
 {
-    switch(m_unitType)
-    {
+    switch (m_unitType) {
         case SVG_LENGTHTYPE_PX:
             m_value = m_valueInSpecifiedUnits;
             break;
@@ -205,9 +201,8 @@ void SVGLength::updateValue(bool notify)
             m_value = (m_valueInSpecifiedUnits / 6.0) * dpi();
             break;
         case SVG_LENGTHTYPE_EMS:
-        case SVG_LENGTHTYPE_EXS:
-        {
-            RenderStyle *style = 0;
+        case SVG_LENGTHTYPE_EXS: {
+            RenderStyle* style = 0;
             if (m_context && m_context->renderer())
                 style = m_context->renderer()->style();
             else if (m_viewportElement && m_viewportElement->renderer())
@@ -240,11 +235,10 @@ void SVGLength::updateValue(bool notify)
 
 bool SVGLength::updateValueInSpecifiedUnits(bool notify)
 {
-    if(m_unitType == SVG_LENGTHTYPE_UNKNOWN)
+    if (m_unitType == SVG_LENGTHTYPE_UNKNOWN)
         return false;
 
-    switch(m_unitType)
-    {
+    switch (m_unitType) {
         case SVG_LENGTHTYPE_PERCENTAGE:
             //kdError() << "updateValueInSpecifiedUnits() SVG_LENGTHTYPE_PERCENTAGE - UNSUPPORTED! Please report!" << endl;
             return false;
@@ -293,12 +287,12 @@ void SVGLength::setBboxRelative(bool relative)
     m_bboxRelative = relative;
 }
 
-const SVGStyledElement *SVGLength::context() const
+const SVGStyledElement* SVGLength::context() const
 {
     return m_context;
 }
 
-void SVGLength::setContext(const SVGStyledElement *context)
+void SVGLength::setContext(const SVGStyledElement* context)
 {
     m_context = context;
 }

diff --git a/WebCore/ksvg2/svg/SVGLength.h b/WebCore/ksvg2/svg/SVGLength.h
index 05442fb8be2e3bb35bcbe4de0ef8fdf54560501e..9b754dd9cf14879ffac35635ca2dac4c857c6626 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLength.h
+++ b/WebCore/ksvg2/svg/SVGLength.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
 
@@ -25,7 +25,7 @@
 #ifdef SVG_SUPPORT
 
 #include "PlatformString.h"
-#include <ksvg2/svg/SVGHelper.h>
+#include "SVGHelper.h"
 
 namespace WebCore {
 
@@ -72,7 +72,7 @@ namespace WebCore {
         void setBboxRelative(bool);
 
         const SVGStyledElement* context() const;
-        void setContext(const SVGStyledElement *context);
+        void setContext(const SVGStyledElement* context);
 
     private:
         bool updateValueInSpecifiedUnits(bool notify = true);
@@ -88,8 +88,8 @@ namespace WebCore {
         SVGLengthType m_unitType : 4;
         bool m_requiresLayout : 1;
 
-        const SVGStyledElement *m_context;
-        const SVGElement *m_viewportElement;
+        const SVGStyledElement* m_context;
+        const SVGElement* m_viewportElement;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGLengthList.cpp b/WebCore/ksvg2/svg/SVGLengthList.cpp
index a9a76d9dcc8a56af1379989d0a4b98907f756acb..496dc965a2b61f51de6c545947504066abe14ed0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLengthList.cpp
+++ b/WebCore/ksvg2/svg/SVGLengthList.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
 
@@ -23,9 +23,9 @@
 #include "config.h"
 
 #ifdef SVG_SUPPORT
+#include "SVGLengthList.h"
 #include "SVGMatrix.h"
 #include "SVGSVGElement.h"
-#include "SVGLengthList.h"
 
 namespace WebCore {
 

diff --git a/WebCore/ksvg2/svg/SVGLengthList.h b/WebCore/ksvg2/svg/SVGLengthList.h
index 856be06a6e51f92bd7b6701386ba71cce933d1f5..af8670d0a691b9d77953c6b9983e0cb47f2b8b71 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLengthList.h
+++ b/WebCore/ksvg2/svg/SVGLengthList.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
 
@@ -25,8 +25,8 @@
 
 #ifdef SVG_SUPPORT
 
-#include "SVGList.h"
 #include "SVGLength.h"
+#include "SVGList.h"
 
 namespace WebCore
 {

diff --git a/WebCore/ksvg2/svg/SVGLocatable.cpp b/WebCore/ksvg2/svg/SVGLocatable.cpp
index 828ce0870a4eb8582c5ce5c38a9b252bf7610114..1ce5b5544526e8a0807c67f3f35c443b8b5cf049 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLocatable.cpp
+++ b/WebCore/ksvg2/svg/SVGLocatable.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,12 +24,11 @@
 #ifdef SVG_SUPPORT
 #include "SVGLocatable.h"
 
-#include "SVGElement.h"
+#include "RenderPath.h"
 #include "SVGMatrix.h"
 #include "SVGSVGElement.h"
-#include <kcanvas/RenderPath.h>
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGLocatable::SVGLocatable()
 {
@@ -39,13 +38,13 @@ SVGLocatable::~SVGLocatable()
 {
 }
 
-SVGElement *SVGLocatable::nearestViewportElement(const SVGStyledElement *e)
+SVGElement* SVGLocatable::nearestViewportElement(const SVGStyledElement* e)
 {
-    Node *n = e->parentNode();
+    Node* n = e->parentNode();
     while (n && !n->isDocumentNode()) {
         if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::symbolTag) ||
             n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::foreignObjectTag))
-            return static_cast<SVGElement *>(n);
+            return static_cast<SVGElement*>(n);
 
         n = n->parentNode();
     }
@@ -53,18 +52,18 @@ SVGElement *SVGLocatable::nearestViewportElement(const SVGStyledElement *e)
     return 0;
 }
 
-SVGElement *SVGLocatable::farthestViewportElement(const SVGStyledElement *e)
+SVGElement* SVGLocatable::farthestViewportElement(const SVGStyledElement* e)
 {
     // FIXME : likely this will be always the <svg> farthest away.
     // If we have a different implementation of documentElement(), one
     // that give the documentElement() of the svg fragment, it could be
     // used instead. This depends on cdf demands though(Rob.)
-    SVGElement *farthest = 0;
-    Node *n = e->parentNode();
+    SVGElement* farthest = 0;
+    Node* n = e->parentNode();
     while (n && !n->isDocumentNode()) {
         if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::symbolTag) ||
             n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::foreignObjectTag))
-            farthest = static_cast<SVGElement *>(n);
+            farthest = static_cast<SVGElement*>(n);
 
         n = n->parentNode();
     }
@@ -74,7 +73,7 @@ SVGElement *SVGLocatable::farthestViewportElement(const SVGStyledElement *e)
 
 // Spec:
 // http://www.w3.org/TR/2005/WD-SVGMobile12-20050413/svgudom.html#svg::SVGLocatable
-FloatRect SVGLocatable::getBBox(const SVGStyledElement *e)
+FloatRect SVGLocatable::getBBox(const SVGStyledElement* e)
 {
     FloatRect bboxRect;
     
@@ -86,19 +85,18 @@ FloatRect SVGLocatable::getBBox(const SVGStyledElement *e)
     return bboxRect;
 }
 
-SVGMatrix *SVGLocatable::getCTM(const SVGElement *element)
+SVGMatrix* SVGLocatable::getCTM(const SVGElement* element)
 {
-    if(!element)
+    if (!element)
         return 0;
 
-    SVGMatrix *ctm = SVGSVGElement::createSVGMatrix();
+    SVGMatrix* ctm = SVGSVGElement::createSVGMatrix();
 
-    Node *parent = element->parentNode();
+    Node* parent = element->parentNode();
     if (parent && parent->isElementNode()) {
-        SVGElement *parentElement = svg_dynamic_cast(parent);
-        if(parentElement && parentElement->isStyledLocatable())
-        {
-            RefPtr<SVGMatrix> parentCTM = static_cast<SVGStyledLocatableElement *>(parentElement)->getCTM();
+        SVGElement* parentElement = svg_dynamic_cast(parent);
+        if (parentElement && parentElement->isStyledLocatable()) {
+            RefPtr<SVGMatrix> parentCTM = static_cast<SVGStyledLocatableElement*>(parentElement)->getCTM();
             ctm->multiply(parentCTM.get());
         }
     }
@@ -106,20 +104,18 @@ SVGMatrix *SVGLocatable::getCTM(const SVGElement *element)
     return ctm;
 }
 
-SVGMatrix *SVGLocatable::getScreenCTM(const SVGElement *element)
+SVGMatrix* SVGLocatable::getScreenCTM(const SVGElement* element)
 {
-    if(!element)
+    if (!element)
         return 0;
 
-    SVGMatrix *ctm = SVGSVGElement::createSVGMatrix();
+    SVGMatrix* ctm = SVGSVGElement::createSVGMatrix();
 
-    Node *parent = element->parentNode();
-    if(parent && parent->isElementNode())
-    {
-        SVGElement *parentElement = static_cast<SVGElement *>(parent);
-        if(parentElement->isStyledLocatable())
-        {
-            RefPtr<SVGMatrix> parentCTM = static_cast<SVGStyledLocatableElement *>(parentElement)->getScreenCTM();
+    Node* parent = element->parentNode();
+    if (parent && parent->isElementNode()) {
+        SVGElement* parentElement = static_cast<SVGElement*>(parent);
+        if (parentElement->isStyledLocatable()) {
+            RefPtr<SVGMatrix> parentCTM = static_cast<SVGStyledLocatableElement*>(parentElement)->getScreenCTM();
             ctm->multiply(parentCTM.get());
         }
     }
@@ -127,6 +123,8 @@ SVGMatrix *SVGLocatable::getScreenCTM(const SVGElement *element)
     return ctm;
 }
 
+}
+
 #endif // SVG_SUPPORT
 
 // vim:ts=4:noet

diff --git a/WebCore/ksvg2/svg/SVGNumberList.cpp b/WebCore/ksvg2/svg/SVGNumberList.cpp
index c8198e248d1c2961cd60ea5c9734b06e6f3a5ce9..7f03e14242ebeb8bf3ba41242971735869241699 100644 (file)
--- a/WebCore/ksvg2/svg/SVGNumberList.cpp
+++ b/WebCore/ksvg2/svg/SVGNumberList.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
 
@@ -23,11 +23,12 @@
 #include "config.h"
 
 #ifdef SVG_SUPPORT
+#include "SVGNumberList.h"
+
 #include "SVGMatrix.h"
 #include "SVGSVGElement.h"
-#include "SVGNumberList.h"
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGNumberList::SVGNumberList()
     : SVGList<double>()
@@ -47,6 +48,8 @@ void SVGNumberList::parse(const String& value)
         appendItem(numbers[i].toDouble(), ec);
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGNumberList.h b/WebCore/ksvg2/svg/SVGNumberList.h
index 5af9042b82f2f479fbf37c9fa45ac1f817c8190b..e96ad2f53f9c83cac133528fb05d351f3d798d9b 100644 (file)
--- a/WebCore/ksvg2/svg/SVGNumberList.h
+++ b/WebCore/ksvg2/svg/SVGNumberList.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
 
@@ -29,7 +29,7 @@
 
 namespace WebCore
 {
-    class DeprecatedString;
+    class String;
 
     class SVGNumberList : public SVGList<double>
     {

diff --git a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp
index 4d1b915a89ee750785e97353d0f7ec7c645d0e08..d7020ffa0a7ba8eb5d7d1bb7e86a698e58971c64 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp
+++ b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.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 "ksvg.h"
+#include "SVGPreserveAspectRatio.h"
+
 #include "SVGMatrix.h"
 #include "SVGSVGElement.h"
-#include "SVGPreserveAspectRatio.h"
 
 namespace WebCore {
 
-SVGPreserveAspectRatio::SVGPreserveAspectRatio(const SVGStyledElement *context)
+SVGPreserveAspectRatio::SVGPreserveAspectRatio(const SVGStyledElement* context)
     : Shared<SVGPreserveAspectRatio>()
     , m_align(SVG_PRESERVEASPECTRATIO_XMIDYMID)
     , m_meetOrSlice(SVG_MEETORSLICE_MEET)
@@ -101,10 +101,12 @@ void SVGPreserveAspectRatio::parsePreserveAspectRatio(const String& string)
         m_context->notifyAttributeChange();
 }
 
-SVGMatrix *SVGPreserveAspectRatio::getCTM(float logicX, float logicY, float logicWidth, float logicHeight,
-                                                  float /*physX*/, float /*physY*/, float physWidth, float physHeight)
+SVGMatrix* SVGPreserveAspectRatio::getCTM(float logicX, float logicY,
+                                          float logicWidth, float logicHeight,
+                                          float /*physX*/, float /*physY*/,
+                                          float physWidth, float physHeight)
 {
-    SVGMatrix *temp = SVGSVGElement::createSVGMatrix();
+    SVGMatrix* temp = SVGSVGElement::createSVGMatrix();
 
     if (align() == SVG_PRESERVEASPECTRATIO_UNKNOWN)
         return temp;

diff --git a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
index 27612500bf42e578038ba7224c93ca9c6decf0a1..96185ea69d1f8729328600c91accc3364e2c8861 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
+++ b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.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
 
@@ -29,6 +29,7 @@
 
 namespace WebCore {
 
+    class String;
     class SVGMatrix;
     class SVGStyledElement;
 
@@ -54,7 +55,7 @@ namespace WebCore {
             SVG_MEETORSLICE_SLICE      = 2
         };
 
-        SVGPreserveAspectRatio(const SVGStyledElement *context);
+        SVGPreserveAspectRatio(const SVGStyledElement* context);
         virtual ~SVGPreserveAspectRatio();
 
         void setAlign(unsigned short);
@@ -63,10 +64,10 @@ namespace WebCore {
         void setMeetOrSlice(unsigned short);
         unsigned short meetOrSlice() const;
         
-        SVGMatrix *getCTM(float logicX, float logicY,
-                              float logicWidth, float logicHeight,
-                              float physX, float physY, float physWidth,
-                              float physHeight);
+        SVGMatrix* getCTM(float logicX, float logicY,
+                          float logicWidth, float logicHeight,
+                          float physX, float physY,
+                          float physWidth, float physHeight);
 
         // Helper
         void parsePreserveAspectRatio(const String&);
@@ -75,7 +76,7 @@ namespace WebCore {
         unsigned short m_align;
         unsigned short m_meetOrSlice;
 
-        const SVGStyledElement *m_context;
+        const SVGStyledElement* m_context;
     };
 
 } // namespace WebCore

diff --git a/WebCore/ksvg2/svg/SVGStringList.cpp b/WebCore/ksvg2/svg/SVGStringList.cpp
index 1f98dec9b77a514d6bacda5fe607087fcafb3244..b26ca1f315c9f72f2d3bea8c0c99c090e99d4347 100644 (file)
--- a/WebCore/ksvg2/svg/SVGStringList.cpp
+++ b/WebCore/ksvg2/svg/SVGStringList.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
 
@@ -21,7 +21,6 @@
 */
 
 #include "config.h"
-
 #ifdef SVG_SUPPORT
 #include "SVGStringList.h"
 
@@ -45,7 +44,7 @@ void SVGStringList::reset(const String& str)
         appendItem(String(""), ec); // Create empty string...
     } else {
         Vector<String>::const_iterator end = vector.end();
-        for(Vector<String>::const_iterator it = vector.begin(); it != end; ++it)
+        for (Vector<String>::const_iterator it = vector.begin(); it != end; ++it)
             appendItem(*it, ec);
     }
 }

diff --git a/WebCore/ksvg2/svg/SVGStringList.h b/WebCore/ksvg2/svg/SVGStringList.h
index 3e4f424f71cbe7d5dbc815a97c6de7041c1fb542..79a95fa9096dc926ffe80c1b3eb89467bff8cbd4 100644 (file)
--- a/WebCore/ksvg2/svg/SVGStringList.h
+++ b/WebCore/ksvg2/svg/SVGStringList.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
 
@@ -25,8 +25,8 @@
 
 #ifdef SVG_SUPPORT
 
-#include "SVGList.h"
 #include "PlatformString.h"
+#include "SVGList.h"
 
 namespace WebCore {
 

diff --git a/WebCore/ksvg2/svg/SVGStylable.cpp b/WebCore/ksvg2/svg/SVGStylable.cpp
index 24e2f5e5f105896fa80835845c39903060965d01..2ce02146d47dea92d4626d37c324024b3bead8ca 100644 (file)
--- a/WebCore/ksvg2/svg/SVGStylable.cpp
+++ b/WebCore/ksvg2/svg/SVGStylable.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,7 @@
 #ifdef SVG_SUPPORT
 #include "SVGStylable.h"
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGStylable::SVGStylable()
 {
@@ -34,6 +34,8 @@ SVGStylable::~SVGStylable()
 {
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGStylable.h b/WebCore/ksvg2/svg/SVGStylable.h
index 88df41b20d5038546941ae5f41a11ec10dbd7a99..cfb8bca522bbcb327109f0f3fce28ec7753ce926 100644 (file)
--- a/WebCore/ksvg2/svg/SVGStylable.h
+++ b/WebCore/ksvg2/svg/SVGStylable.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,13 +24,12 @@
 #define KSVG_SVGStylableImpl_H
 #ifdef SVG_SUPPORT
 
-#include "PlatformString.h"
-
 namespace WebCore {
 
-    class String;
     class CSSValue;
     class CSSStyleDeclaration;
+    class String;
+    class StringImpl;
 
     class SVGStylable {
     public:

diff --git a/WebCore/ksvg2/svg/SVGTests.cpp b/WebCore/ksvg2/svg/SVGTests.cpp
index bc486526b86415e3120fb34993df6683d07a496b..ad5548bcb721411613f551823411b8dbf64a3eac 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTests.cpp
+++ b/WebCore/ksvg2/svg/SVGTests.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
-                  2004, 2005 Rob Buis <buis@kde.org>
+                  2004, 2005 Rob, 2006 Buis <buis@kde.org>
 
     This file is part of the KDE project
 
@@ -24,13 +24,12 @@
 #ifdef SVG_SUPPORT
 #include "SVGTests.h"
 
+#include "DOMImplementation.h"
 #include "Language.h"
 #include "SVGElement.h"
 #include "SVGHelper.h"
 #include "SVGNames.h"
 #include "SVGStringList.h"
-#include "Attr.h"
-#include "DOMImplementation.h"
 
 namespace WebCore {
 
@@ -42,17 +41,17 @@ SVGTests::~SVGTests()
 {
 }
 
-SVGStringList *SVGTests::requiredFeatures() const
+SVGStringList* SVGTests::requiredFeatures() const
 {
     return lazy_create<SVGStringList>(m_features);
 }
 
-SVGStringList *SVGTests::requiredExtensions() const
+SVGStringList* SVGTests::requiredExtensions() const
 {
     return lazy_create<SVGStringList>(m_extensions);
 }
 
-SVGStringList *SVGTests::systemLanguage() const
+SVGStringList* SVGTests::systemLanguage() const
 {
     return lazy_create<SVGStringList>(m_systemLanguage);
 }
@@ -66,10 +65,10 @@ bool SVGTests::isValid() const
 {
     ExceptionCode ec = 0;
 
-    SVGStringList *list = requiredFeatures();
-    for (unsigned long i = 0;i < list->numberOfItems();i++) {
-        String value = String(list->getItem(i, ec));
-        if(value.isEmpty() || !DOMImplementation::instance()->hasFeature(value, String()))
+    SVGStringList* list = requiredFeatures();
+    for (unsigned long i = 0; i < list->numberOfItems(); i++) {
+        String value = list->getItem(i, ec);
+        if (value.isEmpty() || !DOMImplementation::instance()->hasFeature(value, String()))
             return false;
     }
 
@@ -79,13 +78,13 @@ bool SVGTests::isValid() const
             return false;
 
     list = requiredExtensions();
-    if(list->numberOfItems() > 0)
+    if (list->numberOfItems() > 0)
         return false;
 
     return true;
 }
 
-bool SVGTests::parseMappedAttribute(MappedAttribute *attr)
+bool SVGTests::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::requiredFeaturesAttr) {

diff --git a/WebCore/ksvg2/svg/SVGTests.h b/WebCore/ksvg2/svg/SVGTests.h
index 6457d1c06ed145b1f2bec0a90afd85745efeb5e8..e33d9a4b5f1c2603e1c145864b53216add1a7a73 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTests.h
+++ b/WebCore/ksvg2/svg/SVGTests.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
 
@@ -38,15 +38,15 @@ namespace WebCore {
         virtual ~SVGTests();
 
         // 'SVGTests' functions
-        SVGStringList *requiredFeatures() const;
-        SVGStringList *requiredExtensions() const;
-        SVGStringList *systemLanguage() const;
+        SVGStringList* requiredFeatures() const;
+        SVGStringList* requiredExtensions() const;
+        SVGStringList* systemLanguage() const;
 
         bool hasExtension(const String&) const;
 
         bool isValid() const;
         
-        bool parseMappedAttribute(MappedAttribute *attr);
+        bool parseMappedAttribute(MappedAttribute*);
 
     private:
         mutable RefPtr<SVGStringList> m_features;

diff --git a/WebCore/ksvg2/svg/SVGTransformable.cpp b/WebCore/ksvg2/svg/SVGTransformable.cpp
index 21a9f308f25c0823977c221d8db5b0bfb7961e8f..bf96eb80a07438b85ea6c7c92d81b447f8b28e64 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTransformable.cpp
+++ b/WebCore/ksvg2/svg/SVGTransformable.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 "RegularExpression.h"
-#include <wtf/RefPtr.h>
-
-#include "Attr.h"
-
-#include <kcanvas/RenderPath.h>
+#include "SVGTransformable.h"
 
-#include "SVGNames.h"
+#include "RegularExpression.h"
 #include "SVGHelper.h"
 #include "SVGMatrix.h"
-#include "SVGTransformable.h"
+#include "SVGNames.h"
 #include "SVGStyledElement.h"
 #include "SVGTransformList.h"
-#include "ksvg.h"
 
-using namespace WebCore;
+namespace WebCore {
 
 SVGTransformable::SVGTransformable() : SVGLocatable()
 {
@@ -47,7 +41,7 @@ SVGTransformable::~SVGTransformable()
 {
 }
 
-void SVGTransformable::parseTransformAttribute(SVGTransformList *list, const AtomicString& transform)
+void SVGTransformable::parseTransformAttribute(SVGTransformList* list, const AtomicString& transform)
 {
     // Split string for handling 1 transform statement at a time
     Vector<String> subtransforms = transform.domString().simplifyWhiteSpace().split(')');
@@ -103,12 +97,12 @@ void SVGTransformable::parseTransformAttribute(SVGTransformList *list, const Ato
         else if (subtransform[0] == "skewy" && (params.size() == 1))
             t->setSkewY(params[0].toDouble());
         else if (subtransform[0] == "matrix" && (params.size() == 6)) {
-            SVGMatrix *ret = new SVGMatrix(params[0].toDouble(),
-                                                   params[1].toDouble(),
-                                                   params[2].toDouble(),
-                                                   params[3].toDouble(),
-                                                   params[4].toDouble(),
-                                                   params[5].toDouble());
+            SVGMatrix* ret = new SVGMatrix(params[0].toDouble(),
+                                           params[1].toDouble(),
+                                           params[2].toDouble(),
+                                           params[3].toDouble(),
+                                           params[4].toDouble(),
+                                           params[5].toDouble());
             t->setMatrix(ret);
         }
         
@@ -122,6 +116,8 @@ void SVGTransformable::parseTransformAttribute(SVGTransformList *list, const Ato
     }
 }
 
+}
+
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/ksvg2/svg/SVGTransformable.h b/WebCore/ksvg2/svg/SVGTransformable.h
index 47642a2aeb3b751ba740863f758bf3990720caca..5b0a2f9a6c7fd193303a0e1d71d05d702d307b39 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTransformable.h
+++ b/WebCore/ksvg2/svg/SVGTransformable.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,11 +28,7 @@
 
 namespace WebCore {
     
-    class AffineTransform;
     class AtomicString;
-    class Attribute;
-    class Node;
-    class SVGTransformList;
     class SVGMatrix;
     class SVGTransformList;
 

diff --git a/WebCore/ksvg2/svg/SVGURIReference.cpp b/WebCore/ksvg2/svg/SVGURIReference.cpp
index 5c117981e207a5a1da72d84c71a92ff49bd37012..bf8de0d6507600e85b7a2bf483d44a4bacc1dce9 100644 (file)
--- a/WebCore/ksvg2/svg/SVGURIReference.cpp
+++ b/WebCore/ksvg2/svg/SVGURIReference.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,12 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Node.h"
-#include "Attr.h"
+#include "SVGURIReference.h"
 
-#include "SVGNames.h"
-#include "XLinkNames.h"
 #include "SVGHelper.h"
-#include "SVGURIReference.h"
+#include "SVGNames.h"
 #include "SVGStyledElement.h"
+#include "XLinkNames.h"
 
 namespace WebCore {
 
@@ -43,7 +41,7 @@ SVGURIReference::~SVGURIReference()
 
 ANIMATED_PROPERTY_DEFINITIONS_WITH_CONTEXT(SVGURIReference, String, String, string, Href, href, XLinkNames::hrefAttr.localName(), m_href)
 
-bool SVGURIReference::parseMappedAttribute(MappedAttribute *attr)
+bool SVGURIReference::parseMappedAttribute(MappedAttribute* attr)
 {
     if (attr->name().matches(XLinkNames::hrefAttr)) {
         setHrefBaseValue(attr->value());

diff --git a/WebCore/ksvg2/svg/SVGZoomAndPan.cpp b/WebCore/ksvg2/svg/SVGZoomAndPan.cpp
index bd64d670f9d7facdbdf1dc694f7d3fa93ede0557..4606afd98e41cd49d0fde07aafa7c09f4d7881b3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGZoomAndPan.cpp
+++ b/WebCore/ksvg2/svg/SVGZoomAndPan.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,11 @@
 
 #include "config.h"
 #ifdef SVG_SUPPORT
-#include "Attr.h"
-#include "MappedAttribute.h"
+#include "SVGZoomAndPan.h"
 
-#include "ksvg.h"
-#include "SVGNames.h"
 #include "SVGHelper.h"
+#include "SVGNames.h"
 #include "SVGSVGElement.h"
-#include "SVGZoomAndPan.h"
 
 namespace WebCore {
 
@@ -52,13 +49,13 @@ void SVGZoomAndPan::setZoomAndPan(unsigned short zoomAndPan)
     m_zoomAndPan = zoomAndPan;
 }
 
-bool SVGZoomAndPan::parseMappedAttribute(MappedAttribute *attr)
+bool SVGZoomAndPan::parseMappedAttribute(MappedAttribute* attr)
 {
     const String& value = attr->value();
     if (attr->name() == SVGNames::zoomAndPanAttr) {
-        if(value == "disable")
+        if (value == "disable")
             setZoomAndPan(SVGSVGElement::SVG_ZOOMANDPAN_DISABLE);
-        else if(value == "magnify")
+        else if (value == "magnify")
             setZoomAndPan(SVGSVGElement::SVG_ZOOMANDPAN_MAGNIFY);
         return true;
     }

diff --git a/WebCore/ksvg2/svg/SVGZoomAndPan.h b/WebCore/ksvg2/svg/SVGZoomAndPan.h
index 272d0db2f3c4e6a389fbe36161dd69aa611d2143..b48052b3895c33b47521eace49d422295dc52a05 100644 (file)
--- a/WebCore/ksvg2/svg/SVGZoomAndPan.h
+++ b/WebCore/ksvg2/svg/SVGZoomAndPan.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,7 +37,7 @@ namespace WebCore {
         unsigned short zoomAndPan() const;
         virtual void setZoomAndPan(unsigned short zoomAndPan);
 
-        bool parseMappedAttribute(MappedAttribute *attr);
+        bool parseMappedAttribute(MappedAttribute*);
 
     private:
         unsigned short m_zoomAndPan;