2006-09-09 Eric Seidel <eric@eseidel.com>
Reviewed by Tim H.
Remove DeprecatedString usage and fix style.
http://bugzilla.opendarwin.org/show_bug.cgi?id=10787
No tests were harmed in the making of this patch.
* kcanvas/KCanvasFilters.cpp:
(WebCore::KCanvasFilterEffect::in):
(WebCore::KCanvasFilterEffect::setIn):
(WebCore::KCanvasFilterEffect::result):
(WebCore::KCanvasFilterEffect::setResult):
(WebCore::KCanvasFEMerge::externalRepresentation):
* kcanvas/KCanvasFilters.h:
(WebCore::KCanvasFEBlend::in2):
(WebCore::KCanvasFEBlend::setIn2):
(WebCore::KCanvasFEComposite::in2):
(WebCore::KCanvasFEComposite::setIn2):
(WebCore::KCanvasFEDisplacementMap::in2):
(WebCore::KCanvasFEDisplacementMap::setIn2):
(WebCore::KCanvasFEMerge::mergeInputs):
(WebCore::KCanvasFEMerge::setMergeInputs):
* kcanvas/KCanvasResources.cpp:
(WebCore::KCanvasResource::idInRegistry):
(WebCore::KCanvasResource::setIdInRegistry):
(WebCore::getResourceById):
* kcanvas/KCanvasResources.h:
* kcanvas/RenderPath.cpp:
(WebCore::RenderPath::getAbsoluteRepaintRect):
(WebCore::RenderPath::paint):
(WebCore::RenderPath::drawMarkersIfNeeded):
* kcanvas/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::paint):
(WebCore::RenderSVGContainer::getAbsoluteRepaintRect):
* kcanvas/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::paint):
(WebCore::RenderSVGImage::getAbsoluteRepaintRect):
* kcanvas/RenderSVGText.cpp:
(WebCore::RenderSVGText::paint):
* kcanvas/device/KRenderingPaintServer.h:
(WebCore::KRenderingPaintServer::idInRegistry):
(WebCore::KRenderingPaintServer::setIdInRegistry):
* kcanvas/device/quartz/KCanvasFilterQuartz.h:
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
(WebCore::KCanvasFilterQuartz::imageForName):
(WebCore::KCanvasFilterQuartz::setImageForName):
(WebCore::KCanvasFEMergeQuartz::getCIFilter):
* ksvg2/css/SVGCSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applySVGProperty):
* ksvg2/css/SVGRenderStyle.cpp:
* ksvg2/css/SVGRenderStyle.h:
* ksvg2/css/SVGRenderStyleDefs.h:
* ksvg2/ecma/GlobalObject.cpp:
(GlobalObject::get):
* ksvg2/misc/KSVGTimeScheduler.cpp:
(WebCore::SVGTimer::notifyAll):
* ksvg2/svg/SVGDescElement.cpp:
(WebCore::SVGDescElement::SVGDescElement):
(WebCore::SVGDescElement::description):
* ksvg2/svg/SVGDescElement.h:
* ksvg2/svg/SVGFEBlendElement.cpp:
(WebCore::SVGFEBlendElement::SVGFEBlendElement):
(WebCore::SVGFEBlendElement::filterEffect):
* ksvg2/svg/SVGFEColorMatrixElement.cpp:
(SVGFEColorMatrixElement::SVGFEColorMatrixElement):
(SVGFEColorMatrixElement::filterEffect):
* ksvg2/svg/SVGFEComponentTransferElement.cpp:
(WebCore::SVGFEComponentTransferElement::SVGFEComponentTransferElement):
(WebCore::SVGFEComponentTransferElement::filterEffect):
* ksvg2/svg/SVGFECompositeElement.cpp:
(SVGFECompositeElement::SVGFECompositeElement):
(SVGFECompositeElement::filterEffect):
* ksvg2/svg/SVGFEDiffuseLightingElement.cpp:
(WebCore::SVGFEDiffuseLightingElement::SVGFEDiffuseLightingElement):
(WebCore::SVGFEDiffuseLightingElement::filterEffect):
* ksvg2/svg/SVGFEDisplacementMapElement.cpp:
(SVGFEDisplacementMapElement::SVGFEDisplacementMapElement):
(SVGFEDisplacementMapElement::filterEffect):
* ksvg2/svg/SVGFEFloodElement.cpp:
(WebCore::SVGFEFloodElement::SVGFEFloodElement):
(WebCore::SVGFEFloodElement::filterEffect):
* ksvg2/svg/SVGFEGaussianBlurElement.cpp:
(SVGFEGaussianBlurElement::SVGFEGaussianBlurElement):
(SVGFEGaussianBlurElement::filterEffect):
* ksvg2/svg/SVGFELightElement.cpp:
* ksvg2/svg/SVGFEMergeElement.cpp:
(SVGFEMergeElement::filterEffect):
* ksvg2/svg/SVGFEOffsetElement.cpp:
(SVGFEOffsetElement::SVGFEOffsetElement):
(SVGFEOffsetElement::filterEffect):
* ksvg2/svg/SVGFESpecularLightingElement.cpp:
(SVGFESpecularLightingElement::SVGFESpecularLightingElement):
(SVGFESpecularLightingElement::filterEffect):
* ksvg2/svg/SVGFETileElement.cpp:
(WebCore::SVGFETileElement::SVGFETileElement):
(WebCore::SVGFETileElement::filterEffect):
* ksvg2/svg/SVGFETurbulenceElement.cpp:
(SVGFETurbulenceElement::SVGFETurbulenceElement):
* ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp:
(SVGFilterPrimitiveStandardAttributes::setStandardAttributes):
* ksvg2/svg/SVGFitToViewBox.cpp:
(WebCore::SVGFitToViewBox::parseViewBox):
(WebCore::SVGFitToViewBox::parseMappedAttribute):
* ksvg2/svg/SVGFitToViewBox.h:
* ksvg2/svg/SVGLinearGradientElement.cpp:
(SVGLinearGradientElement::buildGradient):
* ksvg2/svg/SVGPatternElement.cpp:
(WebCore::SVGPatternElement::fillAttributesFromReferencePattern):
(WebCore::SVGPatternElement::notifyAttributeChange):
* ksvg2/svg/SVGPreserveAspectRatio.cpp:
(WebCore::SVGPreserveAspectRatio::SVGPreserveAspectRatio):
(WebCore::SVGPreserveAspectRatio::parsePreserveAspectRatio):
(WebCore::SVGPreserveAspectRatio::getCTM):
* ksvg2/svg/SVGPreserveAspectRatio.h:
* ksvg2/svg/SVGRadialGradientElement.cpp:
(WebCore::SVGRadialGradientElement::buildGradient):
* ksvg2/svg/SVGStyleElement.cpp:
* ksvg2/svg/SVGStyledTransformableElement.cpp:
* ksvg2/svg/SVGViewElement.cpp:
(WebCore::SVGViewElement::SVGViewElement):
(WebCore::SVGViewElement::parseMappedAttribute):
* ksvg2/svg/SVGZoomAndPan.cpp:
(WebCore::SVGZoomAndPan::SVGZoomAndPan):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16276 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 37fd51d..6a6d8dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,130 @@
+
+2006-09-09 Eric Seidel <eric@eseidel.com>
+
+ Reviewed by Tim H.
+
+ Remove DeprecatedString usage and fix style.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=10787
+
+ No tests were harmed in the making of this patch.
+
+ * kcanvas/KCanvasFilters.cpp:
+ (WebCore::KCanvasFilterEffect::in):
+ (WebCore::KCanvasFilterEffect::setIn):
+ (WebCore::KCanvasFilterEffect::result):
+ (WebCore::KCanvasFilterEffect::setResult):
+ (WebCore::KCanvasFEMerge::externalRepresentation):
+ * kcanvas/KCanvasFilters.h:
+ (WebCore::KCanvasFEBlend::in2):
+ (WebCore::KCanvasFEBlend::setIn2):
+ (WebCore::KCanvasFEComposite::in2):
+ (WebCore::KCanvasFEComposite::setIn2):
+ (WebCore::KCanvasFEDisplacementMap::in2):
+ (WebCore::KCanvasFEDisplacementMap::setIn2):
+ (WebCore::KCanvasFEMerge::mergeInputs):
+ (WebCore::KCanvasFEMerge::setMergeInputs):
+ * kcanvas/KCanvasResources.cpp:
+ (WebCore::KCanvasResource::idInRegistry):
+ (WebCore::KCanvasResource::setIdInRegistry):
+ (WebCore::getResourceById):
+ * kcanvas/KCanvasResources.h:
+ * kcanvas/RenderPath.cpp:
+ (WebCore::RenderPath::getAbsoluteRepaintRect):
+ (WebCore::RenderPath::paint):
+ (WebCore::RenderPath::drawMarkersIfNeeded):
+ * kcanvas/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::paint):
+ (WebCore::RenderSVGContainer::getAbsoluteRepaintRect):
+ * kcanvas/RenderSVGImage.cpp:
+ (WebCore::RenderSVGImage::paint):
+ (WebCore::RenderSVGImage::getAbsoluteRepaintRect):
+ * kcanvas/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::paint):
+ * kcanvas/device/KRenderingPaintServer.h:
+ (WebCore::KRenderingPaintServer::idInRegistry):
+ (WebCore::KRenderingPaintServer::setIdInRegistry):
+ * kcanvas/device/quartz/KCanvasFilterQuartz.h:
+ * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+ (WebCore::KCanvasFilterQuartz::imageForName):
+ (WebCore::KCanvasFilterQuartz::setImageForName):
+ (WebCore::KCanvasFEMergeQuartz::getCIFilter):
+ * ksvg2/css/SVGCSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applySVGProperty):
+ * ksvg2/css/SVGRenderStyle.cpp:
+ * ksvg2/css/SVGRenderStyle.h:
+ * ksvg2/css/SVGRenderStyleDefs.h:
+ * ksvg2/ecma/GlobalObject.cpp:
+ (GlobalObject::get):
+ * ksvg2/misc/KSVGTimeScheduler.cpp:
+ (WebCore::SVGTimer::notifyAll):
+ * ksvg2/svg/SVGDescElement.cpp:
+ (WebCore::SVGDescElement::SVGDescElement):
+ (WebCore::SVGDescElement::description):
+ * ksvg2/svg/SVGDescElement.h:
+ * ksvg2/svg/SVGFEBlendElement.cpp:
+ (WebCore::SVGFEBlendElement::SVGFEBlendElement):
+ (WebCore::SVGFEBlendElement::filterEffect):
+ * ksvg2/svg/SVGFEColorMatrixElement.cpp:
+ (SVGFEColorMatrixElement::SVGFEColorMatrixElement):
+ (SVGFEColorMatrixElement::filterEffect):
+ * ksvg2/svg/SVGFEComponentTransferElement.cpp:
+ (WebCore::SVGFEComponentTransferElement::SVGFEComponentTransferElement):
+ (WebCore::SVGFEComponentTransferElement::filterEffect):
+ * ksvg2/svg/SVGFECompositeElement.cpp:
+ (SVGFECompositeElement::SVGFECompositeElement):
+ (SVGFECompositeElement::filterEffect):
+ * ksvg2/svg/SVGFEDiffuseLightingElement.cpp:
+ (WebCore::SVGFEDiffuseLightingElement::SVGFEDiffuseLightingElement):
+ (WebCore::SVGFEDiffuseLightingElement::filterEffect):
+ * ksvg2/svg/SVGFEDisplacementMapElement.cpp:
+ (SVGFEDisplacementMapElement::SVGFEDisplacementMapElement):
+ (SVGFEDisplacementMapElement::filterEffect):
+ * ksvg2/svg/SVGFEFloodElement.cpp:
+ (WebCore::SVGFEFloodElement::SVGFEFloodElement):
+ (WebCore::SVGFEFloodElement::filterEffect):
+ * ksvg2/svg/SVGFEGaussianBlurElement.cpp:
+ (SVGFEGaussianBlurElement::SVGFEGaussianBlurElement):
+ (SVGFEGaussianBlurElement::filterEffect):
+ * ksvg2/svg/SVGFELightElement.cpp:
+ * ksvg2/svg/SVGFEMergeElement.cpp:
+ (SVGFEMergeElement::filterEffect):
+ * ksvg2/svg/SVGFEOffsetElement.cpp:
+ (SVGFEOffsetElement::SVGFEOffsetElement):
+ (SVGFEOffsetElement::filterEffect):
+ * ksvg2/svg/SVGFESpecularLightingElement.cpp:
+ (SVGFESpecularLightingElement::SVGFESpecularLightingElement):
+ (SVGFESpecularLightingElement::filterEffect):
+ * ksvg2/svg/SVGFETileElement.cpp:
+ (WebCore::SVGFETileElement::SVGFETileElement):
+ (WebCore::SVGFETileElement::filterEffect):
+ * ksvg2/svg/SVGFETurbulenceElement.cpp:
+ (SVGFETurbulenceElement::SVGFETurbulenceElement):
+ * ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp:
+ (SVGFilterPrimitiveStandardAttributes::setStandardAttributes):
+ * ksvg2/svg/SVGFitToViewBox.cpp:
+ (WebCore::SVGFitToViewBox::parseViewBox):
+ (WebCore::SVGFitToViewBox::parseMappedAttribute):
+ * ksvg2/svg/SVGFitToViewBox.h:
+ * ksvg2/svg/SVGLinearGradientElement.cpp:
+ (SVGLinearGradientElement::buildGradient):
+ * ksvg2/svg/SVGPatternElement.cpp:
+ (WebCore::SVGPatternElement::fillAttributesFromReferencePattern):
+ (WebCore::SVGPatternElement::notifyAttributeChange):
+ * ksvg2/svg/SVGPreserveAspectRatio.cpp:
+ (WebCore::SVGPreserveAspectRatio::SVGPreserveAspectRatio):
+ (WebCore::SVGPreserveAspectRatio::parsePreserveAspectRatio):
+ (WebCore::SVGPreserveAspectRatio::getCTM):
+ * ksvg2/svg/SVGPreserveAspectRatio.h:
+ * ksvg2/svg/SVGRadialGradientElement.cpp:
+ (WebCore::SVGRadialGradientElement::buildGradient):
+ * ksvg2/svg/SVGStyleElement.cpp:
+ * ksvg2/svg/SVGStyledTransformableElement.cpp:
+ * ksvg2/svg/SVGViewElement.cpp:
+ (WebCore::SVGViewElement::SVGViewElement):
+ (WebCore::SVGViewElement::parseMappedAttribute):
+ * ksvg2/svg/SVGZoomAndPan.cpp:
+ (WebCore::SVGZoomAndPan::SVGZoomAndPan):
+
2006-09-08 Darin Adler <darin@apple.com>
Reviewed by Tim H.
diff --git a/WebCore/kcanvas/KCanvasFilters.cpp b/WebCore/kcanvas/KCanvasFilters.cpp
index b990f78..aaffc5b 100644
--- a/WebCore/kcanvas/KCanvasFilters.cpp
+++ b/WebCore/kcanvas/KCanvasFilters.cpp
@@ -103,21 +103,22 @@
m_subregion = subregion;
}
-DeprecatedString KCanvasFilterEffect::in() const
+String KCanvasFilterEffect::in() const
{
return m_in;
}
-void KCanvasFilterEffect::setIn(const DeprecatedString &in)
+
+void KCanvasFilterEffect::setIn(const String &in)
{
m_in = in;
}
-DeprecatedString KCanvasFilterEffect::result() const
+String KCanvasFilterEffect::result() const
{
return m_result;
}
-void KCanvasFilterEffect::setResult(const DeprecatedString &result)
+void KCanvasFilterEffect::setResult(const String &result)
{
m_result = result;
}
@@ -421,7 +422,16 @@
{
ts << "[type=MERGE] ";
KCanvasFilterEffect::externalRepresentation(ts);
- ts << "[merge inputs=" << m_mergeInputs << "]";
+ ts << "[merge inputs=[";
+ unsigned x = 0;
+ unsigned size = m_mergeInputs.size();
+ while (x < size) {
+ ts << m_mergeInputs[x];
+ x++;
+ if (x < m_mergeInputs.size())
+ ts << ", ";
+ }
+ ts << "]]";
return ts;
}
diff --git a/WebCore/kcanvas/KCanvasFilters.h b/WebCore/kcanvas/KCanvasFilters.h
index 7d35ee8..638be86 100644
--- a/WebCore/kcanvas/KCanvasFilters.h
+++ b/WebCore/kcanvas/KCanvasFilters.h
@@ -25,7 +25,6 @@
#define KCanvasFilters_H
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
#include "KCanvasResources.h"
#ifdef __OBJC__
@@ -143,11 +142,11 @@
FloatRect subRegion() const;
void setSubRegion(const FloatRect &subregion);
- DeprecatedString in() const;
- void setIn(const DeprecatedString &in);
+ String in() const;
+ void setIn(const String &in);
- DeprecatedString result() const;
- void setResult(const DeprecatedString &result);
+ String result() const;
+ void setResult(const String &result);
#if __APPLE__
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const = 0;
@@ -157,8 +156,8 @@
private:
FloatRect m_subregion;
- DeprecatedString m_in;
- DeprecatedString m_result;
+ String m_in;
+ String m_result;
};
TextStream &operator<<(TextStream &, const KCanvasFilterEffect &);
@@ -173,8 +172,8 @@
class KCanvasFEBlend : public KCanvasFilterEffect {
public:
- DeprecatedString in2() const { return m_in2; }
- void setIn2(const DeprecatedString &in2) { m_in2 = in2; }
+ String in2() const { return m_in2; }
+ void setIn2(const String &in2) { m_in2 = in2; }
KCBlendModeType blendMode() const { return m_mode; }
void setBlendMode(KCBlendModeType mode) { m_mode = mode; }
@@ -183,7 +182,7 @@
private:
KCBlendModeType m_mode;
- DeprecatedString m_in2;
+ String m_in2;
};
typedef enum {
@@ -265,8 +264,8 @@
class KCanvasFEComposite : public KCanvasFilterEffect {
public:
- DeprecatedString in2() const { return m_in2; }
- void setIn2(const DeprecatedString &in2) { m_in2 = in2; }
+ String in2() const { return m_in2; }
+ void setIn2(const String &in2) { m_in2 = in2; }
KCCompositeOperationType operation() const { return m_operation; }
void setOperation(KCCompositeOperationType oper) { m_operation = oper; }
@@ -283,7 +282,7 @@
TextStream &externalRepresentation(TextStream &) const;
private:
- DeprecatedString m_in2;
+ String m_in2;
KCCompositeOperationType m_operation;
float m_k1;
float m_k2;
@@ -475,8 +474,8 @@
{
}
- DeprecatedString in2() const { return m_in2; }
- void setIn2(const DeprecatedString &in2) { m_in2 = in2; }
+ String in2() const { return m_in2; }
+ void setIn2(const String &in2) { m_in2 = in2; }
KCChannelSelectorType xChannelSelector() const { return m_xChannelSelector; }
void setXChannelSelector(const KCChannelSelectorType xChannelSelector) { m_xChannelSelector = xChannelSelector; }
@@ -490,7 +489,7 @@
TextStream &externalRepresentation(TextStream &) const;
private:
- DeprecatedString m_in2;
+ String m_in2;
KCChannelSelectorType m_xChannelSelector;
KCChannelSelectorType m_yChannelSelector;
float m_scale;
@@ -548,13 +547,13 @@
class KCanvasFEMerge : public KCanvasFilterEffect {
public:
- DeprecatedStringList mergeInputs() const { return m_mergeInputs; }
- void setMergeInputs(const DeprecatedStringList &mergeInputs) { m_mergeInputs = mergeInputs; }
+ const Vector<String>& mergeInputs() const { return m_mergeInputs; }
+ void setMergeInputs(const Vector<String>& mergeInputs) { m_mergeInputs = mergeInputs; }
TextStream &externalRepresentation(TextStream &) const;
private:
- DeprecatedStringList m_mergeInputs;
+ Vector<String> m_mergeInputs;
};
typedef enum {
diff --git a/WebCore/kcanvas/KCanvasResources.cpp b/WebCore/kcanvas/KCanvasResources.cpp
index 122123e..2da36f8 100644
--- a/WebCore/kcanvas/KCanvasResources.cpp
+++ b/WebCore/kcanvas/KCanvasResources.cpp
@@ -96,14 +96,14 @@
const_cast<RenderPath *>(*it)->repaint();
}
-DeprecatedString KCanvasResource::idInRegistry() const
+String KCanvasResource::idInRegistry() const
{
- return registryId;
+ return m_registryId;
}
-void KCanvasResource::setIdInRegistry(const DeprecatedString& newId)
+void KCanvasResource::setIdInRegistry(const String& newId)
{
- registryId = newId;
+ m_registryId = newId;
}
TextStream& KCanvasResource::externalRepresentation(TextStream &ts) const
@@ -288,8 +288,6 @@
SVGElement *svgElement = svg_dynamic_cast(element);
if (svgElement && svgElement->isStyled())
return static_cast<SVGStyledElement *>(svgElement)->canvasResource();
- else
- fprintf(stderr, "Failed to find resource with id: %s\n", id.deprecatedString().ascii());
return 0;
}
diff --git a/WebCore/kcanvas/KCanvasResources.h b/WebCore/kcanvas/KCanvasResources.h
index 53e43b7..633de27 100644
--- a/WebCore/kcanvas/KCanvasResources.h
+++ b/WebCore/kcanvas/KCanvasResources.h
@@ -59,8 +59,8 @@
const RenderPathList &clients() const;
- DeprecatedString idInRegistry() const;
- void setIdInRegistry(const DeprecatedString& newId);
+ String idInRegistry() const;
+ void setIdInRegistry(const String&);
virtual bool isPaintServer() const { return false; }
virtual bool isFilter() const { return false; }
@@ -71,7 +71,7 @@
virtual TextStream& externalRepresentation(TextStream &) const;
private:
RenderPathList m_clients;
- DeprecatedString registryId;
+ String m_registryId;
};
// Clipping paths
diff --git a/WebCore/kcanvas/RenderPath.cpp b/WebCore/kcanvas/RenderPath.cpp
index cd7ff2c..5c76952 100644
--- a/WebCore/kcanvas/RenderPath.cpp
+++ b/WebCore/kcanvas/RenderPath.cpp
@@ -149,7 +149,7 @@
FloatRect repaintRect = absoluteTransform().mapRect(relativeBBox(true));
// Filters can expand the bounding box
- KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+ KCanvasFilter* filter = getFilterById(document(), style()->svgStyle()->filter().substring(1));
if (filter)
repaintRect.unite(filter->filterBBoxForItemBBox(repaintRect));
@@ -197,16 +197,16 @@
context->concatCTM(localTransform());
// setup to apply filters
- KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+ KCanvasFilter* filter = getFilterById(document(), style()->svgStyle()->filter().substring(1));
if (filter) {
filter->prepareFilter(relativeBBox(true));
context = device->currentContext();
}
- if (KCanvasClipper *clipper = getClipperById(document(), style()->svgStyle()->clipPath().mid(1)))
+ if (KCanvasClipper* clipper = getClipperById(document(), style()->svgStyle()->clipPath().substring(1)))
clipper->applyClip(relativeBBox(true));
- if (KCanvasMasker *masker = getMaskerById(document(), style()->svgStyle()->maskElement().mid(1)))
+ if (KCanvasMasker* masker = getMaskerById(document(), style()->svgStyle()->maskElement().substring(1)))
masker->applyMask(relativeBBox(true));
context->clearPath();
@@ -432,9 +432,9 @@
Document *doc = document();
const SVGRenderStyle *svgStyle = style()->svgStyle();
- KCanvasMarker *startMarker = getMarkerById(doc, svgStyle->startMarker().mid(1));
- KCanvasMarker *midMarker = getMarkerById(doc, svgStyle->midMarker().mid(1));
- KCanvasMarker *endMarker = getMarkerById(doc, svgStyle->endMarker().mid(1));
+ KCanvasMarker* startMarker = getMarkerById(doc, svgStyle->startMarker().substring(1));
+ KCanvasMarker* midMarker = getMarkerById(doc, svgStyle->midMarker().substring(1));
+ KCanvasMarker* endMarker = getMarkerById(doc, svgStyle->endMarker().substring(1));
if (!startMarker && !midMarker && !endMarker)
return;
diff --git a/WebCore/kcanvas/RenderSVGContainer.cpp b/WebCore/kcanvas/RenderSVGContainer.cpp
index cd522d7..6134172 100644
--- a/WebCore/kcanvas/RenderSVGContainer.cpp
+++ b/WebCore/kcanvas/RenderSVGContainer.cpp
@@ -150,7 +150,7 @@
if (paintInfo.phase != PaintPhaseForeground || !drawsContents() || style()->visibility() == HIDDEN)
return;
- KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+ KCanvasFilter* filter = getFilterById(document(), style()->svgStyle()->filter().substring(1));
if (!firstChild() && !filter)
return; // Spec: groups w/o children still may render filter content.
@@ -180,10 +180,10 @@
if (!localTransform().isIdentity())
deviceContext->concatCTM(localTransform());
- if (KCanvasClipper *clipper = getClipperById(document(), style()->svgStyle()->clipPath().mid(1)))
+ if (KCanvasClipper *clipper = getClipperById(document(), style()->svgStyle()->clipPath().substring(1)))
clipper->applyClip(relativeBBox(true));
- if (KCanvasMasker *masker = getMaskerById(document(), style()->svgStyle()->maskElement().mid(1)))
+ if (KCanvasMasker *masker = getMaskerById(document(), style()->svgStyle()->maskElement().substring(1)))
masker->applyMask(relativeBBox(true));
float opacity = style()->opacity();
@@ -261,7 +261,7 @@
repaintRect.unite(current->getAbsoluteRepaintRect());
// Filters can expand the bounding box
- KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+ KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().substring(1));
if (filter)
repaintRect.unite(enclosingIntRect(filter->filterBBoxForItemBBox(repaintRect)));
diff --git a/WebCore/kcanvas/RenderSVGImage.cpp b/WebCore/kcanvas/RenderSVGImage.cpp
index fb9c5ba..a1a89a7 100644
--- a/WebCore/kcanvas/RenderSVGImage.cpp
+++ b/WebCore/kcanvas/RenderSVGImage.cpp
@@ -145,13 +145,13 @@
FloatRect boundingBox = FloatRect(0, 0, width(), height());
const SVGRenderStyle *svgStyle = style()->svgStyle();
- if (KCanvasClipper *clipper = getClipperById(document(), svgStyle->clipPath().mid(1)))
+ if (KCanvasClipper* clipper = getClipperById(document(), svgStyle->clipPath().substring(1)))
clipper->applyClip(boundingBox);
- if (KCanvasMasker *masker = getMaskerById(document(), svgStyle->maskElement().mid(1)))
+ if (KCanvasMasker* masker = getMaskerById(document(), svgStyle->maskElement().substring(1)))
masker->applyMask(boundingBox);
- KCanvasFilter *filter = getFilterById(document(), svgStyle->filter().mid(1));
+ KCanvasFilter* filter = getFilterById(document(), svgStyle->filter().substring(1));
if (filter)
filter->prepareFilter(boundingBox);
@@ -260,7 +260,7 @@
FloatRect repaintRect = absoluteTransform().mapRect(FloatRect(image->x()->value(), image->y()->value(), width(), height()));
// Filters can expand the bounding box
- KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().mid(1));
+ KCanvasFilter *filter = getFilterById(document(), style()->svgStyle()->filter().substring(1));
if (filter)
repaintRect.unite(filter->filterBBoxForItemBBox(repaintRect));
diff --git a/WebCore/kcanvas/RenderSVGText.cpp b/WebCore/kcanvas/RenderSVGText.cpp
index 6584cc6..af1c5b9 100644
--- a/WebCore/kcanvas/RenderSVGText.cpp
+++ b/WebCore/kcanvas/RenderSVGText.cpp
@@ -80,13 +80,13 @@
FloatRect boundingBox(0, 0, width(), height());
const SVGRenderStyle *svgStyle = style()->svgStyle();
- if (KCanvasClipper *clipper = getClipperById(document(), svgStyle->clipPath().mid(1)))
+ if (KCanvasClipper* clipper = getClipperById(document(), svgStyle->clipPath().substring(1)))
clipper->applyClip(boundingBox);
- if (KCanvasMasker *masker = getMaskerById(document(), svgStyle->maskElement().mid(1)))
+ if (KCanvasMasker* masker = getMaskerById(document(), svgStyle->maskElement().substring(1)))
masker->applyMask(boundingBox);
- KCanvasFilter *filter = getFilterById(document(), svgStyle->filter().mid(1));
+ KCanvasFilter* filter = getFilterById(document(), svgStyle->filter().substring(1));
if (filter)
filter->prepareFilter(boundingBox);
diff --git a/WebCore/kcanvas/device/KRenderingPaintServer.h b/WebCore/kcanvas/device/KRenderingPaintServer.h
index 1a46fc8..e81d0b7 100644
--- a/WebCore/kcanvas/device/KRenderingPaintServer.h
+++ b/WebCore/kcanvas/device/KRenderingPaintServer.h
@@ -60,8 +60,8 @@
const RenderPath *activeClient() const { return m_activeClient;}
void setActiveClient(const RenderPath *client) { m_activeClient = client; }
- DeprecatedString idInRegistry() const { return m_registryId; }
- void setIdInRegistry(const DeprecatedString& newId) { m_registryId = newId; }
+ String idInRegistry() const { return m_registryId; }
+ void setIdInRegistry(const String& newId) { m_registryId = newId; }
virtual KCPaintServerType type() const = 0;
@@ -79,7 +79,7 @@
virtual void renderPath(KRenderingDeviceContext*, const RenderPath*, KCPaintTargetType) const = 0;
private:
const RenderPath *m_activeClient;
- DeprecatedString m_registryId;
+ String m_registryId;
bool m_paintingText;
};
diff --git a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
index 76bce3c..8367e33 100644
--- a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
+++ b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
@@ -47,8 +47,8 @@
virtual void prepareFilter(const FloatRect& bbox);
virtual void applyFilter(const FloatRect& bbox);
- CIImage *imageForName(const DeprecatedString &name) const;
- void setImageForName(CIImage *image, const DeprecatedString &name);
+ CIImage *imageForName(const String &name) const;
+ void setImageForName(CIImage *image, const String &name);
void setOutputImage(const KCanvasFilterEffect *filterEffect, CIImage *output);
CIImage *inputImage(const KCanvasFilterEffect *filterEffect);
diff --git a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
index 7a1797e..9d57854 100644
--- a/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
@@ -188,14 +188,14 @@
return filterEffects;
}
-CIImage *KCanvasFilterQuartz::imageForName(const DeprecatedString& name) const
+CIImage *KCanvasFilterQuartz::imageForName(const String& name) const
{
- return [m_imagesByName objectForKey:name.getNSString()];
+ return [m_imagesByName objectForKey:name];
}
-void KCanvasFilterQuartz::setImageForName(CIImage *image, const DeprecatedString &name)
+void KCanvasFilterQuartz::setImageForName(CIImage *image, const String &name)
{
- [m_imagesByName setValue:image forKey:name.getNSString()];
+ [m_imagesByName setValue:image forKey:name];
}
void KCanvasFilterQuartz::setOutputImage(const KCanvasFilterEffect *filterEffect, CIImage *output)
@@ -770,15 +770,13 @@
{
CIFilter *filter = nil;
BEGIN_BLOCK_OBJC_EXCEPTIONS;
- DeprecatedStringList inputs = mergeInputs();
- DeprecatedValueListIterator<DeprecatedString> it = inputs.begin();
- DeprecatedValueListIterator<DeprecatedString> end = inputs.end();
+ const Vector<String>& inputs = mergeInputs();
CIImage *previousOutput = quartzFilter->inputImage(this);
- for (;it != end; it++) {
- CIImage *inputImage = quartzFilter->imageForName(*it);
- FE_QUARTZ_CHECK_INPUT(inputImage);
- FE_QUARTZ_CHECK_INPUT(previousOutput);
+ for (unsigned x = 0; x < inputs.size(); x++) {
+ CIImage *inputImage = quartzFilter->imageForName(inputs[x]);
+ FE_QUARTZ_CHECK_INPUT(inputImage);
+ FE_QUARTZ_CHECK_INPUT(previousOutput);
filter = [CIFilter filterWithName:@"CISourceOverCompositing"];
[filter setDefaults];
[filter setValue:inputImage forKey:@"inputImage"];
diff --git a/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp b/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp
index 1ee1cf4..e71f2f2 100644
--- a/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp
+++ b/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp
@@ -480,10 +480,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
@@ -496,10 +496,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
@@ -512,10 +512,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
@@ -566,10 +566,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
svgstyle->setFilter(s);
@@ -581,10 +581,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
@@ -597,10 +597,10 @@
if (!primitiveValue)
return;
- DeprecatedString s;
+ String s;
int type = primitiveValue->primitiveType();
if (type == CSSPrimitiveValue::CSS_URI)
- s = primitiveValue->getStringValue().deprecatedString();
+ s = primitiveValue->getStringValue();
else
return;
diff --git a/WebCore/ksvg2/css/SVGRenderStyle.cpp b/WebCore/ksvg2/css/SVGRenderStyle.cpp
index 1cf3cb0..0f7656d 100644
--- a/WebCore/ksvg2/css/SVGRenderStyle.cpp
+++ b/WebCore/ksvg2/css/SVGRenderStyle.cpp
@@ -30,7 +30,7 @@
#ifdef SVG_SUPPORT
#include "SVGRenderStyle.h"
-using namespace WebCore;
+namespace WebCore {
SVGRenderStyle *SVGRenderStyle::s_defaultStyle = 0;
@@ -110,6 +110,8 @@
svg_inherited_flags = svgInheritParent->svg_inherited_flags;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/css/SVGRenderStyle.h b/WebCore/ksvg2/css/SVGRenderStyle.h
index 964e969..89ecf30 100644
--- a/WebCore/ksvg2/css/SVGRenderStyle.h
+++ b/WebCore/ksvg2/css/SVGRenderStyle.h
@@ -106,13 +106,13 @@
RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stops, opacity, StopOpacity, stopOpacity, 1.0)
RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, stops, color, StopColor, stopColor, Color(0, 0, 0))
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, clip, clipPath, ClipPath, clipPath, DeprecatedString())
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, mask, maskElement, MaskElement, maskElement, DeprecatedString())
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, markers, startMarker, StartMarker, startMarker, DeprecatedString())
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, markers, midMarker, MidMarker, midMarker, DeprecatedString())
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, markers, endMarker, EndMarker, endMarker, DeprecatedString())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, clip, clipPath, ClipPath, clipPath, String())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, mask, maskElement, MaskElement, maskElement, String())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, startMarker, StartMarker, startMarker, String())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, midMarker, MidMarker, midMarker, String())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, endMarker, EndMarker, endMarker, String())
- RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(DeprecatedString, misc, filter, Filter, filter, DeprecatedString())
+ RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, misc, filter, Filter, filter, String())
RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, misc, floodOpacity, FloodOpacity, floodOpacity, 1.0)
RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, misc, floodColor, FloodColor, floodColor, Color(0, 0, 0))
diff --git a/WebCore/ksvg2/css/SVGRenderStyleDefs.h b/WebCore/ksvg2/css/SVGRenderStyleDefs.h
index 73d5ab5..91f3620 100644
--- a/WebCore/ksvg2/css/SVGRenderStyleDefs.h
+++ b/WebCore/ksvg2/css/SVGRenderStyleDefs.h
@@ -26,11 +26,10 @@
Boston, MA 02111-1307, USA.
*/
-#ifndef KSVG_SVGRenderStyleDefs_H
-#define KSVG_SVGRenderStyleDefs_H
+#ifndef SVGRenderStyleDefs_H
+#define SVGRenderStyleDefs_H
#ifdef SVG_SUPPORT
-#include "DeprecatedString.h"
#include "Path.h"
// Helper macros for 'SVGRenderStyle'
@@ -175,7 +174,7 @@
return !(*this == other);
}
- DeprecatedString clipPath;
+ String clipPath;
private:
StyleClipData &operator=(const StyleClipData &);
@@ -189,7 +188,7 @@
bool operator==(const StyleMaskData &other) const;
bool operator!=(const StyleMaskData &other) const { return !(*this == other); }
- DeprecatedString maskElement;
+ String maskElement;
private:
StyleMaskData &operator=(const StyleMaskData &);
@@ -206,9 +205,9 @@
return !(*this == other);
}
- DeprecatedString startMarker;
- DeprecatedString midMarker;
- DeprecatedString endMarker;
+ String startMarker;
+ String midMarker;
+ String endMarker;
private:
StyleMarkerData &operator=(const StyleMarkerData &);
@@ -226,7 +225,7 @@
return !(*this == other);
}
- DeprecatedString filter;
+ String filter;
Color floodColor;
float floodOpacity;
diff --git a/WebCore/ksvg2/ecma/GlobalObject.cpp b/WebCore/ksvg2/ecma/GlobalObject.cpp
index 5515346..5e39222 100644
--- a/WebCore/ksvg2/ecma/GlobalObject.cpp
+++ b/WebCore/ksvg2/ecma/GlobalObject.cpp
@@ -58,8 +58,6 @@
KJS::JSValue *GlobalObject::get(KJS::ExecState *exec, const KJS::Identifier &p) const
{
- kdDebug(26004) << "WebCore::GlobalObject (" << this << ")::get " << p.deprecatedString() << endl;
-
KJS::JSValue *ret = GlobalObject::get(exec, p);
if(ret->type() != KJS::UndefinedType)
return ret;
@@ -96,7 +94,6 @@
// This isn't necessarily a bug. Some code uses if(!window.blah) window.blah=1
// But it can also mean something isn't loaded or implemented...
- kdDebug(26004) << "GlobalObject::get property not found: " << p.deprecatedString() << endl;
return KJS::jsUndefined();
}
diff --git a/WebCore/ksvg2/misc/KSVGTimeScheduler.cpp b/WebCore/ksvg2/misc/KSVGTimeScheduler.cpp
index b8ef4b4..cdba1e2 100644
--- a/WebCore/ksvg2/misc/KSVGTimeScheduler.cpp
+++ b/WebCore/ksvg2/misc/KSVGTimeScheduler.cpp
@@ -218,7 +218,7 @@
if(!animColor)
continue;
- DeprecatedString name = animColor->attributeName();
+ String name = animColor->attributeName();
Color color = animColor->color();
if(!targetColor.contains(name))
diff --git a/WebCore/ksvg2/svg/SVGDescElement.cpp b/WebCore/ksvg2/svg/SVGDescElement.cpp
index dcaec23..78773a0 100644
--- a/WebCore/ksvg2/svg/SVGDescElement.cpp
+++ b/WebCore/ksvg2/svg/SVGDescElement.cpp
@@ -24,9 +24,11 @@
#ifdef SVG_SUPPORT
#include "SVGDescElement.h"
-using namespace WebCore;
+namespace WebCore {
-SVGDescElement::SVGDescElement(const QualifiedName& tagName, Document *doc) : SVGStyledElement(tagName, doc), SVGLangSpace()
+SVGDescElement::SVGDescElement(const QualifiedName& tagName, Document *doc)
+ : SVGStyledElement(tagName, doc)
+ , SVGLangSpace()
{
}
@@ -34,9 +36,11 @@
{
}
-StringImpl *SVGDescElement::description() const
+String SVGDescElement::description() const
{
- return new StringImpl(String(textContent()).deprecatedString().simplifyWhiteSpace());
+ return textContent().deprecatedString().simplifyWhiteSpace();
+}
+
}
// vim:ts=4:noet
diff --git a/WebCore/ksvg2/svg/SVGDescElement.h b/WebCore/ksvg2/svg/SVGDescElement.h
index 43d553b..8aec01e 100644
--- a/WebCore/ksvg2/svg/SVGDescElement.h
+++ b/WebCore/ksvg2/svg/SVGDescElement.h
@@ -36,7 +36,7 @@
SVGDescElement(const QualifiedName&, Document*);
virtual ~SVGDescElement();
- StringImpl *description() const;
+ String description() const;
};
} // namespace WebCore
diff --git a/WebCore/ksvg2/svg/SVGFEBlendElement.cpp b/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
index 56c916f..6f930a0 100644
--- a/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEBlendElement.cpp
@@ -22,8 +22,6 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
#include <kcanvas/KCanvasFilters.h>
@@ -34,13 +32,13 @@
#include "SVGRenderStyle.h"
#include "SVGFEBlendElement.h"
-using namespace WebCore;
+namespace WebCore {
SVGFEBlendElement::SVGFEBlendElement(const QualifiedName& tagName, Document *doc)
: SVGFilterPrimitiveStandardAttributes(tagName, doc)
, m_mode(0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEBlendElement::~SVGFEBlendElement()
@@ -83,12 +81,14 @@
if (!m_filterEffect)
return 0;
m_filterEffect->setBlendMode((KCBlendModeType)(mode()-1));
- m_filterEffect->setIn(in().deprecatedString());
- m_filterEffect->setIn2(String(in2()).deprecatedString());
+ m_filterEffect->setIn(in());
+ m_filterEffect->setIn2(in2());
setStandardAttributes(m_filterEffect);
return m_filterEffect;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
index dd8fb6da..8c9d5c8 100644
--- a/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEColorMatrixElement.cpp
@@ -44,8 +44,8 @@
: SVGFilterPrimitiveStandardAttributes(tagName, doc)
, m_type(0)
, m_values(new SVGNumberList(0))
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEColorMatrixElement::~SVGFEColorMatrixElement()
@@ -60,8 +60,7 @@
void SVGFEColorMatrixElement::parseMappedAttribute(MappedAttribute *attr)
{
const String& value = attr->value();
- if (attr->name() == SVGNames::typeAttr)
- {
+ if (attr->name() == SVGNames::typeAttr) {
if(value == "matrix")
setTypeBaseValue(SVG_FECOLORMATRIX_TYPE_MATRIX);
else if(value == "saturate")
@@ -86,7 +85,7 @@
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
DeprecatedValueList<float> _values;
SVGNumberList *numbers = values();
diff --git a/WebCore/ksvg2/svg/SVGFEComponentTransferElement.cpp b/WebCore/ksvg2/svg/SVGFEComponentTransferElement.cpp
index 1502fcf..f67d067 100644
--- a/WebCore/ksvg2/svg/SVGFEComponentTransferElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEComponentTransferElement.cpp
@@ -22,13 +22,11 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
-#include <kcanvas/KCanvasResources.h>
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "KCanvasResources.h"
+#include "KCanvasFilters.h"
+#include "KRenderingDevice.h"
#include "SVGNames.h"
#include "SVGHelper.h"
@@ -39,12 +37,12 @@
#include "SVGFEFuncBElement.h"
#include "SVGFEFuncAElement.h"
-using namespace WebCore;
+namespace WebCore {
SVGFEComponentTransferElement::SVGFEComponentTransferElement(const QualifiedName& tagName, Document *doc)
: SVGFilterPrimitiveStandardAttributes(tagName, doc)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEComponentTransferElement::~SVGFEComponentTransferElement()
@@ -70,7 +68,7 @@
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
for (Node *n = firstChild(); n != 0; n = n->nextSibling()) {
@@ -87,6 +85,8 @@
return m_filterEffect;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGFECompositeElement.cpp b/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
index 797d5f0..00be6ba 100644
--- a/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFECompositeElement.cpp
@@ -22,14 +22,12 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
-#include <kcanvas/KCanvasResources.h>
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
-#include <kcanvas/device/KRenderingPaintServerGradient.h>
+#include "KCanvasResources.h"
+#include "KCanvasFilters.h"
+#include "KRenderingDevice.h"
+#include "KRenderingPaintServerGradient.h"
#include "ksvg.h"
#include "SVGNames.h"
@@ -46,8 +44,8 @@
, m_k2(0.0)
, m_k3(0.0)
, m_k4(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFECompositeElement::~SVGFECompositeElement()
@@ -104,8 +102,8 @@
if (!m_filterEffect)
return 0;
m_filterEffect->setOperation((KCCompositeOperationType)(_operator() - 1));
- m_filterEffect->setIn(in().deprecatedString());
- m_filterEffect->setIn2(String(in2()).deprecatedString());
+ m_filterEffect->setIn(in());
+ m_filterEffect->setIn2(in2());
setStandardAttributes(m_filterEffect);
m_filterEffect->setK1(k1());
m_filterEffect->setK2(k2());
diff --git a/WebCore/ksvg2/svg/SVGFEDiffuseLightingElement.cpp b/WebCore/ksvg2/svg/SVGFEDiffuseLightingElement.cpp
index f0c1b71..095d21b 100644
--- a/WebCore/ksvg2/svg/SVGFEDiffuseLightingElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEDiffuseLightingElement.cpp
@@ -43,8 +43,8 @@
, m_lightingColor(new SVGColor())
, m_kernelUnitLengthX(0.0)
, m_kernelUnitLengthY(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEDiffuseLightingElement::~SVGFEDiffuseLightingElement()
@@ -85,7 +85,7 @@
{
if (!m_filterEffect)
m_filterEffect = static_cast<KCanvasFEDiffuseLighting *>(renderingDevice()->createFilterEffect(FE_DIFFUSE_LIGHTING));
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
m_filterEffect->setDiffuseConstant((diffuseConstant()));
m_filterEffect->setSurfaceScale((surfaceScale()));
diff --git a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
index d42337b..77079cc 100644
--- a/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEDisplacementMapElement.cpp
@@ -39,8 +39,8 @@
, m_xChannelSelector(0)
, m_yChannelSelector(0)
, m_scale(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEDisplacementMapElement::~SVGFEDisplacementMapElement()
@@ -93,8 +93,8 @@
return 0;
m_filterEffect->setXChannelSelector((KCChannelSelectorType)(xChannelSelector()));
m_filterEffect->setYChannelSelector((KCChannelSelectorType)(yChannelSelector()));
- m_filterEffect->setIn(in().deprecatedString());
- m_filterEffect->setIn2(String(in2()).deprecatedString());
+ m_filterEffect->setIn(in());
+ m_filterEffect->setIn2(in2());
m_filterEffect->setScale(scale());
setStandardAttributes(m_filterEffect);
return m_filterEffect;
diff --git a/WebCore/ksvg2/svg/SVGFEFloodElement.cpp b/WebCore/ksvg2/svg/SVGFEFloodElement.cpp
index 4b89791..d90d9a9 100644
--- a/WebCore/ksvg2/svg/SVGFEFloodElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEFloodElement.cpp
@@ -25,20 +25,19 @@
#include "SVGFEFloodElement.h"
#include "Attr.h"
-#include "DeprecatedStringList.h"
#include "RenderView.h"
#include "SVGHelper.h"
#include "SVGNames.h"
#include "SVGRenderStyle.h"
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "KCanvasFilters.h"
+#include "KRenderingDevice.h"
-using namespace WebCore;
+namespace WebCore {
-SVGFEFloodElement::SVGFEFloodElement(const QualifiedName& tagName, Document *doc) :
-SVGFilterPrimitiveStandardAttributes(tagName, doc)
+SVGFEFloodElement::SVGFEFloodElement(const QualifiedName& tagName, Document *doc)
+ : SVGFilterPrimitiveStandardAttributes(tagName, doc)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEFloodElement::~SVGFEFloodElement()
@@ -63,7 +62,7 @@
m_filterEffect = static_cast<KCanvasFEFlood *>(renderingDevice()->createFilterEffect(FE_FLOOD));
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
RenderStyle *filterStyle = const_cast<SVGFEFloodElement *>(this)->styleForRenderer(parentNode()->renderer());
const SVGRenderStyle *svgStyle = filterStyle->svgStyle();
@@ -74,6 +73,8 @@
return m_filterEffect;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
index cbfc510..bb74787 100644
--- a/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEGaussianBlurElement.cpp
@@ -42,8 +42,8 @@
: SVGFilterPrimitiveStandardAttributes(tagName, doc)
, m_stdDeviationX(0.0)
, m_stdDeviationY(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEGaussianBlurElement::~SVGFEGaussianBlurElement()
@@ -82,7 +82,7 @@
m_filterEffect = static_cast<KCanvasFEGaussianBlur *>(renderingDevice()->createFilterEffect(FE_GAUSSIAN_BLUR));
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
m_filterEffect->setStdDeviationX(stdDeviationX());
m_filterEffect->setStdDeviationY(stdDeviationY());
diff --git a/WebCore/ksvg2/svg/SVGFELightElement.cpp b/WebCore/ksvg2/svg/SVGFELightElement.cpp
index 9d60227..f399b9e 100644
--- a/WebCore/ksvg2/svg/SVGFELightElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFELightElement.cpp
@@ -21,13 +21,11 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
-#include <kcanvas/KCanvasResources.h>
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingDevice.h>
+#include "KCanvasResources.h"
+#include "KCanvasFilters.h"
+#include "KRenderingDevice.h"
#include "SVGNames.h"
#include "SVGHelper.h"
diff --git a/WebCore/ksvg2/svg/SVGFEMergeElement.cpp b/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
index b02d164..cf03d19 100644
--- a/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEMergeElement.cpp
@@ -56,10 +56,10 @@
return 0;
setStandardAttributes(m_filterEffect);
- DeprecatedStringList mergeInputs;
- for (Node *n = firstChild(); n != 0; n = n->nextSibling()) {
+ Vector<String> mergeInputs;
+ for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
if (n->hasTagName(SVGNames::feMergeNodeTag))
- mergeInputs.append(static_cast<SVGFEMergeNodeElement *>(n)->in().deprecatedString());
+ mergeInputs.append(static_cast<SVGFEMergeNodeElement *>(n)->in());
}
m_filterEffect->setMergeInputs(mergeInputs);
diff --git a/WebCore/ksvg2/svg/SVGFEOffsetElement.cpp b/WebCore/ksvg2/svg/SVGFEOffsetElement.cpp
index e91dfa3..2878a5a 100644
--- a/WebCore/ksvg2/svg/SVGFEOffsetElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFEOffsetElement.cpp
@@ -41,8 +41,8 @@
: SVGFilterPrimitiveStandardAttributes(tagName, doc)
, m_dx(0.0)
, m_dy(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFEOffsetElement::~SVGFEOffsetElement()
@@ -73,7 +73,7 @@
m_filterEffect = static_cast<KCanvasFEOffset *>(renderingDevice()->createFilterEffect(FE_OFFSET));
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
m_filterEffect->setDx(dx());
m_filterEffect->setDy(dy());
diff --git a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
index 8957245..51ec411 100644
--- a/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFESpecularLightingElement.cpp
@@ -46,8 +46,8 @@
, m_lightingColor(new SVGColor())
, m_kernelUnitLengthX(0.0)
, m_kernelUnitLengthY(0.0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFESpecularLightingElement::~SVGFESpecularLightingElement()
@@ -91,7 +91,7 @@
{
if (!m_filterEffect)
m_filterEffect = static_cast<KCanvasFESpecularLighting *>(renderingDevice()->createFilterEffect(FE_SPECULAR_LIGHTING));
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
m_filterEffect->setSpecularConstant((specularConstant()));
m_filterEffect->setSpecularExponent((specularExponent()));
diff --git a/WebCore/ksvg2/svg/SVGFETileElement.cpp b/WebCore/ksvg2/svg/SVGFETileElement.cpp
index 2fafe51..66d1697 100644
--- a/WebCore/ksvg2/svg/SVGFETileElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFETileElement.cpp
@@ -22,8 +22,6 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
#include <kcanvas/KCanvasFilters.h>
@@ -33,12 +31,12 @@
#include "SVGRenderStyle.h"
#include "SVGFETileElement.h"
-using namespace WebCore;
+namespace WebCore {
-SVGFETileElement::SVGFETileElement(const QualifiedName& tagName, Document *doc) :
-SVGFilterPrimitiveStandardAttributes(tagName, doc)
+SVGFETileElement::SVGFETileElement(const QualifiedName& tagName, Document *doc)
+ : SVGFilterPrimitiveStandardAttributes(tagName, doc)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFETileElement::~SVGFETileElement()
@@ -63,11 +61,13 @@
m_filterEffect = static_cast<KCanvasFETile *>(renderingDevice()->createFilterEffect(FE_TILE));
if (!m_filterEffect)
return 0;
- m_filterEffect->setIn(in().deprecatedString());
+ m_filterEffect->setIn(in());
setStandardAttributes(m_filterEffect);
return m_filterEffect;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp b/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
index 599803e..06d6bb2 100644
--- a/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
+++ b/WebCore/ksvg2/svg/SVGFETurbulenceElement.cpp
@@ -46,8 +46,8 @@
, m_seed(0.0)
, m_stitchTiles(0)
, m_type(0)
+ , m_filterEffect(0)
{
- m_filterEffect = 0;
}
SVGFETurbulenceElement::~SVGFETurbulenceElement()
diff --git a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
index e6c3795..6809b9b 100644
--- a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -95,7 +95,7 @@
else
filterEffect->setSubRegion(FloatRect(_x, _y, _width, _height));
- filterEffect->setResult(result().deprecatedString());
+ filterEffect->setResult(result());
}
// vim:ts=4:noet
diff --git a/WebCore/ksvg2/svg/SVGFitToViewBox.cpp b/WebCore/ksvg2/svg/SVGFitToViewBox.cpp
index eed4356..157586f 100644
--- a/WebCore/ksvg2/svg/SVGFitToViewBox.cpp
+++ b/WebCore/ksvg2/svg/SVGFitToViewBox.cpp
@@ -49,10 +49,10 @@
ANIMATED_PROPERTY_DEFINITIONS_WITH_CONTEXT(SVGFitToViewBox, SVGRect*, Rect, rect, ViewBox, viewBox, SVGNames::viewBoxAttr.localName(), m_viewBox.get())
ANIMATED_PROPERTY_DEFINITIONS_WITH_CONTEXT(SVGFitToViewBox, SVGPreserveAspectRatio*, PreserveAspectRatio, preserveAspectRatio, PreserveAspectRatio, preserveAspectRatio, SVGNames::preserveAspectRatioAttr.localName(), m_preserveAspectRatio.get())
-void SVGFitToViewBox::parseViewBox(StringImpl* str)
+void SVGFitToViewBox::parseViewBox(const String& str)
{
double x = 0, y = 0, w = 0, h = 0;
- DeprecatedString viewbox = String(str).deprecatedString();
+ DeprecatedString viewbox = str.deprecatedString();
const char *p = viewbox.latin1();
const char *end = p + viewbox.length();
const char *c = p;
@@ -102,7 +102,7 @@
bool SVGFitToViewBox::parseMappedAttribute(MappedAttribute* attr)
{
if (attr->name() == SVGNames::viewBoxAttr) {
- parseViewBox(attr->value().impl());
+ parseViewBox(attr->value());
return true;
} else if (attr->name() == SVGNames::preserveAspectRatioAttr) {
preserveAspectRatioBaseValue()->parsePreserveAspectRatio(attr->value().impl());
diff --git a/WebCore/ksvg2/svg/SVGFitToViewBox.h b/WebCore/ksvg2/svg/SVGFitToViewBox.h
index bc8981d..3812c5a 100644
--- a/WebCore/ksvg2/svg/SVGFitToViewBox.h
+++ b/WebCore/ksvg2/svg/SVGFitToViewBox.h
@@ -39,7 +39,7 @@
virtual ~SVGFitToViewBox();
// 'SVGFitToViewBox' functions
- void parseViewBox(StringImpl *str);
+ void parseViewBox(const String&);
SVGMatrix *viewBoxToViewTransform(float viewWidth, float viewHeight) const;
bool parseMappedAttribute(MappedAttribute *attr);
diff --git a/WebCore/ksvg2/svg/SVGLinearGradientElement.cpp b/WebCore/ksvg2/svg/SVGLinearGradientElement.cpp
index 3b197d0..42af40a 100644
--- a/WebCore/ksvg2/svg/SVGLinearGradientElement.cpp
+++ b/WebCore/ksvg2/svg/SVGLinearGradientElement.cpp
@@ -94,7 +94,7 @@
if (gradientTransform()->numberOfItems() > 0)
mat = gradientTransform()->consolidate()->matrix()->matrix();
- DeprecatedString ref = String(href()).deprecatedString();
+ DeprecatedString ref = href().deprecatedString();
KRenderingPaintServer *pserver = getPaintServerById(document(), ref.mid(1));
if (pserver && (pserver->type() == PS_RADIAL_GRADIENT || pserver->type() == PS_LINEAR_GRADIENT))
diff --git a/WebCore/ksvg2/svg/SVGPatternElement.cpp b/WebCore/ksvg2/svg/SVGPatternElement.cpp
index 9b4efec..baf2607 100644
--- a/WebCore/ksvg2/svg/SVGPatternElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPatternElement.cpp
@@ -141,7 +141,7 @@
void SVGPatternElement::fillAttributesFromReferencePattern(const SVGPatternElement* target, AffineTransform& patternTransformMatrix)
{
- DeprecatedString ref = String(href()).deprecatedString();
+ DeprecatedString ref = href().deprecatedString();
KRenderingPaintServer *refServer = getPaintServerById(document(), ref.mid(1));
if (!refServer || refServer->type() != PS_PATTERN)
@@ -302,7 +302,7 @@
const Node *test = this;
while(test && !test->hasChildNodes())
{
- DeprecatedString ref = String(target->href()).deprecatedString();
+ DeprecatedString ref = target->href().deprecatedString();
test = ownerDocument()->getElementById(String(ref.mid(1)).impl());
if (test && test->hasTagName(SVGNames::patternTag))
target = static_cast<const SVGPatternElement* >(test);
diff --git a/WebCore/ksvg2/svg/SVGPoint.cpp b/WebCore/ksvg2/svg/SVGPoint.cpp
index eee7e8a..3f3f5b6 100644
--- a/WebCore/ksvg2/svg/SVGPoint.cpp
+++ b/WebCore/ksvg2/svg/SVGPoint.cpp
@@ -28,7 +28,7 @@
#include "SVGStyledElement.h"
#include "IntPoint.h"
-using namespace WebCore;
+namespace WebCore {
SVGPoint::SVGPoint(const SVGStyledElement *context)
{
@@ -87,6 +87,8 @@
return 0;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp
index 517ca3e..3630dbb 100644
--- a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp
+++ b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.cpp
@@ -22,23 +22,21 @@
#include "config.h"
#ifdef SVG_SUPPORT
-#include "DeprecatedString.h"
#include "DeprecatedStringList.h"
-#include "StringImpl.h"
-
#include "ksvg.h"
#include "SVGMatrix.h"
#include "SVGSVGElement.h"
#include "SVGPreserveAspectRatio.h"
-using namespace WebCore;
+namespace WebCore {
-SVGPreserveAspectRatio::SVGPreserveAspectRatio(const SVGStyledElement *context) : Shared<SVGPreserveAspectRatio>()
+SVGPreserveAspectRatio::SVGPreserveAspectRatio(const SVGStyledElement *context)
+ : Shared<SVGPreserveAspectRatio>()
+ , m_align(SVG_PRESERVEASPECTRATIO_XMIDYMID)
+ , m_meetOrSlice(SVG_MEETORSLICE_MEET)
+ , m_context(context)
{
- m_context = context;
- m_meetOrSlice = SVG_MEETORSLICE_MEET;
- m_align = SVG_PRESERVEASPECTRATIO_XMIDYMID;
}
SVGPreserveAspectRatio::~SVGPreserveAspectRatio()
@@ -65,15 +63,13 @@
return m_meetOrSlice;
}
-void SVGPreserveAspectRatio::parsePreserveAspectRatio(StringImpl *strImpl)
+void SVGPreserveAspectRatio::parsePreserveAspectRatio(const String& string)
{
// Spec: set the defaults
setAlign(SVG_PRESERVEASPECTRATIO_NONE);
setMeetOrSlice(SVG_MEETORSLICE_MEET);
- String s(strImpl);
- DeprecatedString str = s.deprecatedString();
- DeprecatedStringList params = DeprecatedStringList::split(' ', str.simplifyWhiteSpace());
+ DeprecatedStringList params = DeprecatedStringList::split(' ', string.deprecatedString().simplifyWhiteSpace());
if (params[0] == "none")
m_align = SVG_PRESERVEASPECTRATIO_NONE;
@@ -118,13 +114,10 @@
float vpar = logicWidth / logicHeight;
float svgar = physWidth / physHeight;
- if (align() == SVG_PRESERVEASPECTRATIO_NONE)
- {
+ if (align() == SVG_PRESERVEASPECTRATIO_NONE) {
temp->scaleNonUniform(physWidth / logicWidth, physHeight / logicHeight);
temp->translate(-logicX, -logicY);
- }
- else if (vpar < svgar && (meetOrSlice() == SVG_MEETORSLICE_MEET) || vpar >= svgar && (meetOrSlice() == SVG_MEETORSLICE_SLICE))
- {
+ } else if (vpar < svgar && (meetOrSlice() == SVG_MEETORSLICE_MEET) || vpar >= svgar && (meetOrSlice() == SVG_MEETORSLICE_SLICE)) {
temp->scale(physHeight / logicHeight);
if (align() == SVG_PRESERVEASPECTRATIO_XMINYMIN || align() == SVG_PRESERVEASPECTRATIO_XMINYMID || align() == SVG_PRESERVEASPECTRATIO_XMINYMAX)
@@ -133,9 +126,7 @@
temp->translate(-logicX - (logicWidth - physWidth * logicHeight / physHeight) / 2, -logicY);
else
temp->translate(-logicX - (logicWidth - physWidth * logicHeight / physHeight), -logicY);
- }
- else
- {
+ } else {
temp->scale(physWidth / logicWidth);
if (align() == SVG_PRESERVEASPECTRATIO_XMINYMIN || align() == SVG_PRESERVEASPECTRATIO_XMIDYMIN || align() == SVG_PRESERVEASPECTRATIO_XMAXYMIN)
@@ -149,6 +140,8 @@
return temp;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
index be9ae78..50ae3dd 100644
--- a/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
+++ b/WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
@@ -49,7 +49,7 @@
float physHeight);
// Helper
- void parsePreserveAspectRatio(StringImpl *string);
+ void parsePreserveAspectRatio(const String&);
protected:
unsigned short m_align;
diff --git a/WebCore/ksvg2/svg/SVGRadialGradientElement.cpp b/WebCore/ksvg2/svg/SVGRadialGradientElement.cpp
index 0568d69..2bb1cbe 100644
--- a/WebCore/ksvg2/svg/SVGRadialGradientElement.cpp
+++ b/WebCore/ksvg2/svg/SVGRadialGradientElement.cpp
@@ -103,7 +103,7 @@
if(gradientTransform()->numberOfItems() > 0)
mat = gradientTransform()->consolidate()->matrix()->matrix();
- DeprecatedString ref = String(href()).deprecatedString();
+ DeprecatedString ref = href().deprecatedString();
KRenderingPaintServer *pserver = getPaintServerById(document(), ref.mid(1));
if(pserver && (pserver->type() == PS_RADIAL_GRADIENT || pserver->type() == PS_LINEAR_GRADIENT))
diff --git a/WebCore/ksvg2/svg/SVGStyleElement.cpp b/WebCore/ksvg2/svg/SVGStyleElement.cpp
index 42924be..1936451 100644
--- a/WebCore/ksvg2/svg/SVGStyleElement.cpp
+++ b/WebCore/ksvg2/svg/SVGStyleElement.cpp
@@ -26,7 +26,6 @@
#include "SVGStyleElement.h"
#include "CSSStyleSheet.h"
-#include "DeprecatedString.h"
#include "Document.h"
#include "ExceptionCode.h"
#include "MediaList.h"
diff --git a/WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp b/WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp
index 0b113e9..47eae46 100644
--- a/WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp
+++ b/WebCore/ksvg2/svg/SVGStyledTransformableElement.cpp
@@ -23,8 +23,6 @@
#include "config.h"
#ifdef SVG_SUPPORT
#include "RegularExpression.h"
-#include "DeprecatedStringList.h"
-
#include "Attr.h"
#include <kcanvas/RenderPath.h>
diff --git a/WebCore/ksvg2/svg/SVGViewElement.cpp b/WebCore/ksvg2/svg/SVGViewElement.cpp
index f4b7f23..92f3949 100644
--- a/WebCore/ksvg2/svg/SVGViewElement.cpp
+++ b/WebCore/ksvg2/svg/SVGViewElement.cpp
@@ -32,11 +32,13 @@
#include "SVGStringList.h"
#include "SVGZoomAndPan.h"
-using namespace WebCore;
+namespace WebCore {
SVGViewElement::SVGViewElement(const QualifiedName& tagName, Document *doc)
-: SVGStyledElement(tagName, doc), SVGExternalResourcesRequired(),
-SVGFitToViewBox(), SVGZoomAndPan()
+ : SVGStyledElement(tagName, doc)
+ , SVGExternalResourcesRequired()
+ , SVGFitToViewBox()
+ , SVGZoomAndPan()
{
}
@@ -52,9 +54,9 @@
void SVGViewElement::parseMappedAttribute(MappedAttribute *attr)
{
const String& value = attr->value();
- if (attr->name() == SVGNames::viewTargetAttr) {
+ if (attr->name() == SVGNames::viewTargetAttr)
viewTarget()->reset(value.deprecatedString());
- } else {
+ else {
if(SVGExternalResourcesRequired::parseMappedAttribute(attr)
|| SVGFitToViewBox::parseMappedAttribute(attr)
|| SVGZoomAndPan::parseMappedAttribute(attr))
@@ -64,5 +66,7 @@
}
}
+}
+
#endif // SVG_SUPPORT
diff --git a/WebCore/ksvg2/svg/SVGZoomAndPan.cpp b/WebCore/ksvg2/svg/SVGZoomAndPan.cpp
index 95c4719..f26ace5 100644
--- a/WebCore/ksvg2/svg/SVGZoomAndPan.cpp
+++ b/WebCore/ksvg2/svg/SVGZoomAndPan.cpp
@@ -30,11 +30,11 @@
#include "SVGHelper.h"
#include "SVGZoomAndPan.h"
-using namespace WebCore;
+namespace WebCore {
SVGZoomAndPan::SVGZoomAndPan()
+ : m_zoomAndPan(SVG_ZOOMANDPAN_MAGNIFY)
{
- m_zoomAndPan = SVG_ZOOMANDPAN_MAGNIFY;
}
SVGZoomAndPan::~SVGZoomAndPan()
@@ -65,6 +65,8 @@
return false;
}
+}
+
// vim:ts=4:noet
#endif // SVG_SUPPORT
