From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksvg/dom/SVGCircleElement.h | 2 +- ksvg/dom/SVGElementInstance.cc | 4 ++-- ksvg/dom/SVGElementInstance.h | 2 +- ksvg/dom/SVGEllipseElement.h | 2 +- ksvg/dom/SVGLength.cc | 2 +- ksvg/dom/SVGLineElement.h | 2 +- ksvg/dom/SVGLocatable.h | 4 ++-- ksvg/dom/SVGMaskElement.cc | 8 ++++---- ksvg/dom/SVGMaskElement.h | 4 ++-- ksvg/dom/SVGPathSeg.h | 8 ++++---- ksvg/dom/SVGPolygonElement.h | 6 +++--- ksvg/dom/SVGPolylineElement.h | 6 +++--- ksvg/dom/SVGRectElement.h | 6 +++--- ksvg/dom/SVGSVGElement.h | 10 +++++----- ksvg/dom/SVGTextElement.h | 6 +++--- 15 files changed, 36 insertions(+), 36 deletions(-) (limited to 'ksvg/dom') diff --git a/ksvg/dom/SVGCircleElement.h b/ksvg/dom/SVGCircleElement.h index 65406a1c..d621ce8b 100644 --- a/ksvg/dom/SVGCircleElement.h +++ b/ksvg/dom/SVGCircleElement.h @@ -51,7 +51,7 @@ class SVGAnimatedLength; * point and radius. * * For more info look here : 9.3 The + * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.3 The * 'circle' element. */ class SVGCircleElement : public SVGElement, diff --git a/ksvg/dom/SVGElementInstance.cc b/ksvg/dom/SVGElementInstance.cc index 9bc027c0..95b24964 100644 --- a/ksvg/dom/SVGElementInstance.cc +++ b/ksvg/dom/SVGElementInstance.cc @@ -78,10 +78,10 @@ SVGUseElement SVGElementInstance::correspondingUseElement() const return SVGUseElement(impl->correspondingUseElement()); } -SVGElementInstance SVGElementInstance::parentNode() const +SVGElementInstance SVGElementInstance::tqparentNode() const { if(!impl) return SVGElementInstance(0); - return SVGElementInstance(impl->parentNode()); + return SVGElementInstance(impl->tqparentNode()); } SVGElementInstanceList SVGElementInstance::childNodes() const diff --git a/ksvg/dom/SVGElementInstance.h b/ksvg/dom/SVGElementInstance.h index 51d81831..97335b32 100644 --- a/ksvg/dom/SVGElementInstance.h +++ b/ksvg/dom/SVGElementInstance.h @@ -39,7 +39,7 @@ public: SVGElement correspondingElement() const; SVGUseElement correspondingUseElement() const; - SVGElementInstance parentNode() const; + SVGElementInstance tqparentNode() const; SVGElementInstanceList childNodes() const; SVGElementInstance firstChild() const; SVGElementInstance lastChild() const; diff --git a/ksvg/dom/SVGEllipseElement.h b/ksvg/dom/SVGEllipseElement.h index 78399779..07d86504 100644 --- a/ksvg/dom/SVGEllipseElement.h +++ b/ksvg/dom/SVGEllipseElement.h @@ -52,7 +52,7 @@ class SVGEllipseElementImpl; * center point and two radii. * * For more info look here : 9.4 The + * "http://www.w3.org/TR/SVG/tqshapes.html#EllipseElement">9.4 The * 'ellipse' element. */ class SVGEllipseElement : public SVGElement, diff --git a/ksvg/dom/SVGLength.cc b/ksvg/dom/SVGLength.cc index bb2db73f..6ae3f55f 100644 --- a/ksvg/dom/SVGLength.cc +++ b/ksvg/dom/SVGLength.cc @@ -77,7 +77,7 @@ void SVGLength::setValue(float value) { impl->setValue(value); - // Automatic updating of the shape if any value is changed, imagine: + // Automatic updating of the tqshape if any value is changed, imagine: // SVGCircleElement c; [...] c.r().baseVal().setValue(150); if(impl->context() && dynamic_cast(impl->context())) dynamic_cast(impl->context())->update(UPDATE_TRANSFORM, 0, 0); diff --git a/ksvg/dom/SVGLineElement.h b/ksvg/dom/SVGLineElement.h index b08a78ba..0bd2e58f 100644 --- a/ksvg/dom/SVGLineElement.h +++ b/ksvg/dom/SVGLineElement.h @@ -51,7 +51,7 @@ class SVGLineElementImpl; * one point and ends at another. * * For more info look here : 9.5 The + * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.5 The * 'line' element. */ class SVGLineElement : public SVGElement, diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h index ecb93adc..fafe5204 100644 --- a/ksvg/dom/SVGLocatable.h +++ b/ksvg/dom/SVGLocatable.h @@ -66,7 +66,7 @@ public: /** * Returns the tight bounding box in current user space (i.e., after application of - * the transform attribute, if any) on the geometry of all contained graphics + * the transform attribute, if any) on the tqgeometry of all contained graphics * elements, exclusive of stroke-width and filter effects). * * @return An SVGRect object that defines the bounding box. @@ -84,7 +84,7 @@ public: /** * Returns the transformation matrix from current user units (i.e., after application of - * the transform attribute, if any) to the parent user agent's notice of a "pixel". + * the transform attribute, if any) to the tqparent user agent's notice of a "pixel". * For display devices, ideally this represents a physical screen pixel. For other devices or * environments where physical pixel sizes are not known, then an algorithm similar to the * CSS2 definition of a "pixel" can be used instead. diff --git a/ksvg/dom/SVGMaskElement.cc b/ksvg/dom/SVGMaskElement.cc index c4513adc..0ec23f0a 100644 --- a/ksvg/dom/SVGMaskElement.cc +++ b/ksvg/dom/SVGMaskElement.cc @@ -70,16 +70,16 @@ SVGMaskElement::~SVGMaskElement() impl->deref(); } -SVGAnimatedEnumeration SVGMaskElement::maskUnits() const +SVGAnimatedEnumeration SVGMaskElement::tqmaskUnits() const { if(!impl) return SVGAnimatedEnumeration(0); - return SVGAnimatedEnumeration(impl->maskUnits()); + return SVGAnimatedEnumeration(impl->tqmaskUnits()); } -SVGAnimatedEnumeration SVGMaskElement::maskContentUnits() const +SVGAnimatedEnumeration SVGMaskElement::tqmaskContentUnits() const { if(!impl) return SVGAnimatedEnumeration(0); - return SVGAnimatedEnumeration(impl->maskContentUnits()); + return SVGAnimatedEnumeration(impl->tqmaskContentUnits()); } SVGAnimatedLength SVGMaskElement::x() const diff --git a/ksvg/dom/SVGMaskElement.h b/ksvg/dom/SVGMaskElement.h index 6a8e26a4..a93958a7 100644 --- a/ksvg/dom/SVGMaskElement.h +++ b/ksvg/dom/SVGMaskElement.h @@ -48,8 +48,8 @@ public: SVGMaskElement(SVGMaskElementImpl *other); virtual ~SVGMaskElement(); - SVGAnimatedEnumeration maskUnits() const; - SVGAnimatedEnumeration maskContentUnits() const; + SVGAnimatedEnumeration tqmaskUnits() const; + SVGAnimatedEnumeration tqmaskContentUnits() const; SVGAnimatedLength x() const; SVGAnimatedLength y() const; SVGAnimatedLength width() const; diff --git a/ksvg/dom/SVGPathSeg.h b/ksvg/dom/SVGPathSeg.h index f82e3c80..0120276b 100644 --- a/ksvg/dom/SVGPathSeg.h +++ b/ksvg/dom/SVGPathSeg.h @@ -35,8 +35,8 @@ enum PATHSEG_LINETO_REL = 5, PATHSEG_CURVETO_CUBIC_ABS = 6, PATHSEG_CURVETO_CUBIC_REL = 7, - PATHSEG_CURVETO_QUADRATIC_ABS = 8, - PATHSEG_CURVETO_QUADRATIC_REL = 9, + PATHSEG_CURVETO_TQUADRATIC_ABS = 8, + PATHSEG_CURVETO_TQUADRATIC_REL = 9, PATHSEG_ARC_ABS = 10, PATHSEG_ARC_REL = 11, PATHSEG_LINETO_HORIZONTAL_ABS = 12, @@ -45,8 +45,8 @@ enum PATHSEG_LINETO_VERTICAL_REL = 15, PATHSEG_CURVETO_CUBIC_SMOOTH_ABS = 16, PATHSEG_CURVETO_CUBIC_SMOOTH_REL = 17, - PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS = 18, - PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL = 19 + PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS = 18, + PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL = 19 }; class SVGPathSegImpl; diff --git a/ksvg/dom/SVGPolygonElement.h b/ksvg/dom/SVGPolygonElement.h index 526e9815..4ad16863 100644 --- a/ksvg/dom/SVGPolygonElement.h +++ b/ksvg/dom/SVGPolygonElement.h @@ -48,11 +48,11 @@ class SVGPointList; class SVGPolygonElementImpl; /** - * The polygon element defines a closed shape consisting + * The polygon element defines a closed tqshape consisting * of connected straight line segments. * * For more info look here : 9.7 The + * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.7 The * 'polygon' element. */ class SVGPolygonElement : public SVGElement, @@ -81,7 +81,7 @@ public: /** * Provides access to the current animated contents of the points * attribute. - * If the given attribute or property is being animated, contains + * If the given attribute or property is being animated, tqcontains * the current animated value of the attribute or property. * If the given attribute or property is not currently being * animated, contains the same value as points'. diff --git a/ksvg/dom/SVGPolylineElement.h b/ksvg/dom/SVGPolylineElement.h index 35e948f7..2ab617fc 100644 --- a/ksvg/dom/SVGPolylineElement.h +++ b/ksvg/dom/SVGPolylineElement.h @@ -47,10 +47,10 @@ namespace KSVG /** * The polyline element defines a set of connected * straight line segments. Typically, polyline elements - * define open shapes. + * define open tqshapes. * * For more info look here : 9.6 The + * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.6 The * 'polyline' element. */ class SVGPointList; @@ -81,7 +81,7 @@ public: /** * Provides access to the current animated contents of the points * attribute. - * If the given attribute or property is being animated, contains + * If the given attribute or property is being animated, tqcontains * the current animated value of the attribute or property. * If the given attribute or property is not currently being * animated, contains the same value as points'. diff --git a/ksvg/dom/SVGRectElement.h b/ksvg/dom/SVGRectElement.h index 2a77420d..2c33b045 100644 --- a/ksvg/dom/SVGRectElement.h +++ b/ksvg/dom/SVGRectElement.h @@ -55,7 +55,7 @@ class SVGRectElementImpl; * for attributes x and y. * * For more info look here : 9.2 The + * "http://www.w3.org/TR/SVG/tqshapes.html#RectElement"> 9.2 The * 'rect' element. */ class SVGRectElement : public SVGElement, @@ -130,7 +130,7 @@ public: * "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing"> Error * processing). * - * See + * See * 9.2 The 'rect' element for info about what happens if the * attribute is not specified. * @@ -148,7 +148,7 @@ public: * "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing">Error * processing). * - * See + * See * 9.2 The 'rect' element for info about what happens if the * attribute is not specified. * diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h index 59621e2e..9380f992 100644 --- a/ksvg/dom/SVGSVGElement.h +++ b/ksvg/dom/SVGSVGElement.h @@ -56,7 +56,7 @@ class SVGSVGElementImpl; /** * A key interface definition is the SVGSVGElement interface, which is the - * interface that corresponds to the 'svg' element. This interface contains + * interface that corresponds to the 'svg' element. This interface tqcontains * various miscellaneous commonly-used utility methods, such as matrix * operations and the ability to control the time of redraw on visual * rendering devices. SVGSVGElement extends ViewCSS and DocumentCSS to provide @@ -185,13 +185,13 @@ public: * corresponds to this 'svg' element. When the user agent is actually * rendering the content, then the position and size values represent the * actual values when rendering. The position and size values are unitless - * values in the coordinate system of the parent element. If no parent element + * values in the coordinate system of the tqparent element. If no tqparent element * exists (i.e., 'svg' element represents the root of the document tree), if * this SVG document is embedded as part of another document (e.g., via the * HTML 'object' element), then the position and size are unitless values in - * the coordinate system of the parent document. (If the parent uses CSS or - * XSL layout, then unitless values represent pixel units for the current CSS - * or XSL viewport, as described in the CSS2 specification.) If the parent + * the coordinate system of the tqparent document. (If the tqparent uses CSS or + * XSL tqlayout, then unitless values represent pixel units for the current CSS + * or XSL viewport, as described in the CSS2 specification.) If the tqparent * element does not have a coordinate system, then the user agent should * provide reasonable default values for this attribute. * diff --git a/ksvg/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h index 0bf459fe..111d2929 100644 --- a/ksvg/dom/SVGTextElement.h +++ b/ksvg/dom/SVGTextElement.h @@ -57,11 +57,11 @@ class SVGTextElementImpl; * specification and painting attributes which describe how exactly to render * the characters. Since text elements are rendered using the * same rendering methods as other graphics elements, all of the same - * coordinate system transformations, painting, clipping and masking - * features that apply to shapes such as paths and rectangles also + * coordinate system transformations, painting, clipping and tqmasking + * features that apply to tqshapes such as paths and rectangles also * apply to text elements. * - * It is possible to apply a gradient, pattern, clipping path, mask or + * It is possible to apply a gradient, pattern, clipping path, tqmask or * filter to text.When one of these facilities is applied to text and * keyword objectBoundingBox is used to specify a graphical effect * relative to the "object bounding box", then the object bounding box -- cgit v1.2.3