From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- ksvg/core/CanvasItems.cpp | 20 ++++----- ksvg/core/CanvasItems.h | 8 ++-- ksvg/core/KSVGCanvas.cpp | 18 ++++---- ksvg/core/KSVGCanvas.h | 4 +- ksvg/core/KSVGReader.cc | 18 ++++---- ksvg/data/SVGGlyphElementImpl.lut.h | 2 +- ksvg/data/SVGStylableImpl.lut.h | 2 +- ksvg/dom/SVGCircleElement.h | 2 +- ksvg/dom/SVGEllipseElement.h | 2 +- ksvg/dom/SVGLength.cc | 2 +- ksvg/dom/SVGLineElement.h | 2 +- ksvg/dom/SVGLocatable.h | 2 +- ksvg/dom/SVGPolygonElement.h | 4 +- ksvg/dom/SVGPolylineElement.h | 4 +- ksvg/dom/SVGRectElement.h | 6 +-- ksvg/dom/SVGSVGElement.h | 2 +- ksvg/dom/SVGTextElement.h | 2 +- ksvg/ecma/ksvg_ecma.cpp | 10 ++--- ksvg/ecma/ksvg_helper.cpp | 4 +- ksvg/ecma/ksvg_window.cpp | 6 +-- ksvg/impl/SVGAnimateMotionElementImpl.cc | 2 +- ksvg/impl/SVGContainerImpl.cc | 36 ++++++++-------- ksvg/impl/SVGContainerImpl.h | 2 +- ksvg/impl/SVGDocumentImpl.cc | 8 ++-- ksvg/impl/SVGEcma.cc | 6 +-- ksvg/impl/SVGElementImpl.cc | 6 +-- ksvg/impl/SVGEventImpl.cc | 10 ++--- ksvg/impl/SVGGlyphElementImpl.cc | 2 +- ksvg/impl/SVGHelperImpl.cc | 10 ++--- ksvg/impl/SVGImageElementImpl.cc | 14 +++---- ksvg/impl/SVGImageElementImpl.h | 2 +- ksvg/impl/SVGLocatableImpl.cc | 18 ++++---- ksvg/impl/SVGMarkerElementImpl.cc | 12 +++--- ksvg/impl/SVGMaskElementImpl.cc | 38 ++++++++--------- ksvg/impl/SVGMaskElementImpl.h | 6 +-- ksvg/impl/SVGPathSegArcImpl.h | 4 +- ksvg/impl/SVGPathSegCurvetoCubicImpl.h | 4 +- ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h | 4 +- ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h | 4 +- ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h | 4 +- ksvg/impl/SVGPathSegLinetoHorizontalImpl.h | 4 +- ksvg/impl/SVGPathSegLinetoImpl.h | 4 +- ksvg/impl/SVGPathSegLinetoVerticalImpl.h | 4 +- ksvg/impl/SVGPathSegMovetoImpl.h | 4 +- ksvg/impl/SVGPatternElementImpl.cc | 12 +++--- ksvg/impl/SVGSVGElementImpl.cc | 32 +++++++-------- ksvg/impl/SVGShapeImpl.cc | 4 +- ksvg/impl/SVGShapeImpl.h | 2 +- ksvg/impl/SVGStylableImpl.cc | 12 +++--- ksvg/impl/SVGSwitchElementImpl.cc | 4 +- ksvg/impl/SVGTimeScheduler.cc | 6 +-- ksvg/impl/SVGUseElementImpl.cc | 32 +++++++-------- ksvg/impl/SVGUseElementImpl.h | 2 +- ksvg/impl/SVGWindowImpl.cc | 6 +-- ksvg/impl/libs/art_support/art_rgba_svp.c | 4 +- ksvg/impl/libs/libtext2path/src/Converter.cpp | 28 ++++++------- ksvg/impl/libs/libtext2path/src/Font.cpp | 6 +-- ksvg/impl/libs/libtext2path/src/Glyph.cpp | 6 +-- ksvg/impl/libs/libtext2path/src/Glyph.h | 4 +- .../libs/xrgbrender/gdk-pixbuf-xlib-drawable.c | 10 ++--- ksvg/plugin/backends/agg/AggCanvasItems.cpp | 34 +++++++-------- ksvg/plugin/backends/agg/AggCanvasItems.h | 8 ++-- ksvg/plugin/backends/libart/LibartCanvas.cpp | 24 +++++------ ksvg/plugin/backends/libart/LibartCanvasItems.cpp | 48 +++++++++++----------- ksvg/plugin/backends/libart/LibartCanvasItems.h | 6 +-- ksvg/plugin/ksvg_plugin.cpp | 4 +- ksvg/test/W3C_TESTSUITE_1.1 | 12 +++--- ksvg/test/ZVON-TEST-PASSED | 18 ++++---- ksvg/test/ecma/bbox/bbox.js | 14 +++---- 69 files changed, 333 insertions(+), 333 deletions(-) (limited to 'ksvg') diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp index 2e43a97f..333f4608 100644 --- a/ksvg/core/CanvasItems.cpp +++ b/ksvg/core/CanvasItems.cpp @@ -380,7 +380,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons params->setTextPathStartOffset(pathAdvance); if(tp && tp->dy()->baseVal()->numberOfItems() > 0) pathDy += tp->dy()->baseVal()->getItem(0)->value(); - TQString shift = TQString("%1%%").tqarg((pathDy / font->fontParams()->size()) * -100.0); + TQString shift = TQString("%1%%").arg((pathDy / font->fontParams()->size()) * -100.0); params->setBaselineShift(shift.latin1()); } @@ -484,26 +484,26 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons // ##### -void MarkerHelper::doMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId) +void MarkerHelper::doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId) { - SVGMarkerElementImpl *marker = dynamic_cast(tqshape->ownerSVGElement()->getElementById(markerId)); + SVGMarkerElementImpl *marker = dynamic_cast(shape->ownerSVGElement()->getElementById(markerId)); if(marker) - marker->draw(tqshape, x, y, style->getStrokeWidth()->baseVal()->value(), angle); + marker->draw(shape, x, y, style->getStrokeWidth()->baseVal()->value(), angle); } -void MarkerHelper::doStartMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle) +void MarkerHelper::doStartMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle) { - doMarker(tqshape, style, x, y, angle, style->getStartMarker()); + doMarker(shape, style, x, y, angle, style->getStartMarker()); } -void MarkerHelper::doMidMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle) +void MarkerHelper::doMidMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle) { - doMarker(tqshape, style, x, y, angle, style->getMidMarker()); + doMarker(shape, style, x, y, angle, style->getMidMarker()); } -void MarkerHelper::doEndMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle) +void MarkerHelper::doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle) { - doMarker(tqshape, style, x, y, angle, style->getEndMarker()); + doMarker(shape, style, x, y, angle, style->getEndMarker()); } // vim:ts=4:noet diff --git a/ksvg/core/CanvasItems.h b/ksvg/core/CanvasItems.h index 45818712..9f5eed43 100644 --- a/ksvg/core/CanvasItems.h +++ b/ksvg/core/CanvasItems.h @@ -80,12 +80,12 @@ protected: class MarkerHelper { protected: - void doStartMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0); - void doMidMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0); - void doEndMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle = 0.0); + void doStartMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0); + void doMidMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0); + void doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle = 0.0); private: - void doMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle, const TQString &marker); + void doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &marker); }; class CanvasText : public CanvasItem diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp index d16676ab..bbd63524 100644 --- a/ksvg/core/KSVGCanvas.cpp +++ b/ksvg/core/KSVGCanvas.cpp @@ -362,7 +362,7 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons return fontVisualParams; } -void KSVGCanvas::tqinvalidate(CanvasItem *item, bool recalc) +void KSVGCanvas::invalidate(CanvasItem *item, bool recalc) { if(m_chunksByItem.find(item) != m_chunksByItem.end()) { @@ -395,7 +395,7 @@ void KSVGCanvas::insert(CanvasItem *item, int z) bool visible = item->isVisible(); if(visible) - tqinvalidate(item, false); + invalidate(item, false); if(m_immediateUpdate) { @@ -462,15 +462,15 @@ void KSVGCanvas::addToChunks(CanvasItem *item) unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element, unsigned int z) { - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); - if(tqshape) + if(shape) { - CanvasItem *item = tqshape->item(); + CanvasItem *item = shape->item(); if(item) { - SVGImageElementImpl *image = dynamic_cast(tqshape); + SVGImageElementImpl *image = dynamic_cast(shape); if(image && image->svgImageRootElement()) { @@ -481,7 +481,7 @@ unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element, else { item->setZIndex(z); - tqinvalidate(item, false); + invalidate(item, false); z++; } } @@ -766,7 +766,7 @@ void KSVGCanvas::blit() void KSVGCanvas::ChunkManager::addChunk(CanvasChunk *chunk) { - TQString key = TQString("%1 %2").tqarg(chunk->x()).tqarg(chunk->y()); + TQString key = TQString("%1 %2").arg(chunk->x()).arg(chunk->y()); // kdDebug(26005) << k_funcinfo << "Adding chunk : " << chunk << endl; m_chunks.insert(key, chunk); } @@ -774,7 +774,7 @@ void KSVGCanvas::ChunkManager::addChunk(CanvasChunk *chunk) CanvasChunk *KSVGCanvas::ChunkManager::getChunk(short x, short y) const { // kdDebug(26005) << k_funcinfo << "getting chunk from : " << x << ", " << y << endl; - TQString key = TQString("%1 %2").tqarg(x).tqarg(y); + TQString key = TQString("%1 %2").arg(x).arg(y); return m_chunks[key]; } diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h index 367d17d4..24f28ac6 100644 --- a/ksvg/core/KSVGCanvas.h +++ b/ksvg/core/KSVGCanvas.h @@ -75,7 +75,7 @@ public: void update(const TQPoint &panPoint, bool erase = true); void resize(unsigned int w, unsigned int h); void retune(unsigned int csh, unsigned int csv); - void tqinvalidate(CanvasItem *item, bool recalc = true); + void invalidate(CanvasItem *item, bool recalc = true); CanvasItemList collisions(const TQPoint &p, bool exact = false) const; void setBackgroundColor(const TQColor &c) { m_backgroundColor = c; } @@ -126,7 +126,7 @@ public: T2P::FontVisualParams *fontVisualParams(SVGStylableImpl *style) const; virtual T2P::BezierPath *toBezierPath(CanvasItem *item) const { Q_UNUSED(item); return 0; } - // Assign z indices to the element and its tqchildren, starting with z, and + // Assign z indices to the element and its children, starting with z, and // return the next z value to be used. unsigned int setElementItemZIndexRecursive(SVGElementImpl *element, unsigned int z); diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc index 6d142b1d..e3dc186f 100644 --- a/ksvg/core/KSVGReader.cc +++ b/ksvg/core/KSVGReader.cc @@ -146,13 +146,13 @@ SVGSVGElementImpl *Helper::nextSVGElement(SVGElementImpl *elem) SVGSVGElementImpl *Helper::nextSVGElement(DOM::Node elem) { DOM::Node foundSVG; - DOM::Node tqshape = elem.parentNode(); + DOM::Node shape = elem.parentNode(); - for(; !tqshape.isNull(); tqshape = tqshape.parentNode()) + for(; !shape.isNull(); shape = shape.parentNode()) { - if(reinterpret_cast(tqshape).nodeName() == "svg") + if(reinterpret_cast(shape).nodeName() == "svg") { - foundSVG = tqshape; + foundSVG = shape; break; } } @@ -245,7 +245,7 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &, SVGLengthImpl *height = SVGSVGElementImpl::createSVGLength(); width->setValueAsString(svg->getAttribute("width").string()); height->setValueAsString(svg->getAttribute("height").string()); - TQString viewbox = TQString("0 0 %1 %2").tqarg(width->value()).tqarg(height->value()); + TQString viewbox = TQString("0 0 %1 %2").arg(width->value()).arg(height->value()); //kdDebug(26001) << "VIEWBOX : " << viewbox.latin1() << endl; svg->setAttribute("viewBox", viewbox); width->deref(); @@ -349,7 +349,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString SVGSVGElementImpl *root = Helper::self()->nextSVGElement(*m_currentNode); SVGElementImpl *element = root ? root->ownerDoc()->getElementFromHandle(m_currentNode->handle()) : Helper::self()->doc()->getElementFromHandle(m_currentNode->handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); @@ -386,7 +386,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString if(haveCanvas && (tests ? tests->ok() : true)) { - if((tqshape && !tqshape->isContainer()) || (!tqshape && element)) + if((shape && !shape->isContainer()) || (!shape && element)) element->createItem(); } } @@ -397,7 +397,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString m_noRendering = false; bool ok = tests ? tests->ok() : true; - if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (tqshape && tqshape->directRender())) + if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (shape && shape->directRender())) element->createItem(); } @@ -429,7 +429,7 @@ bool InputHandler::fatalError(const TQXmlParseException &e) Helper::self()->setErrorDescription(TQString()); } else - error = TQString("[%1:%2]: FATAL ERROR: %3").tqarg(e.lineNumber()).tqarg(e.columnNumber()).tqarg(e.message()); + error = TQString("[%1:%2]: FATAL ERROR: %3").arg(e.lineNumber()).arg(e.columnNumber()).arg(e.message()); kdDebug(26001) << "InputHandler::fatalError, " << error << endl; diff --git a/ksvg/data/SVGGlyphElementImpl.lut.h b/ksvg/data/SVGGlyphElementImpl.lut.h index 8a4bb903..8300e1c8 100644 --- a/ksvg/data/SVGGlyphElementImpl.lut.h +++ b/ksvg/data/SVGGlyphElementImpl.lut.h @@ -13,7 +13,7 @@ static const char SVGGlyphElementImpl__s_hashTableStrings[] = { "orientation\0" "glyph-name\0" "vert-adv-y\0" - "tqunicode\0" + "unicode\0" "lang\0" "d\0" }; diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h index d652d4cb..838001a7 100644 --- a/ksvg/data/SVGStylableImpl.lut.h +++ b/ksvg/data/SVGStylableImpl.lut.h @@ -23,7 +23,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = { "fill-opacity\0" "marker-start\0" "stroke-width\0" - "tqunicode-bidi\0" + "unicode-bidi\0" "word-spacing\0" "writing-mode\0" "font-family\0" diff --git a/ksvg/dom/SVGCircleElement.h b/ksvg/dom/SVGCircleElement.h index d621ce8b..65406a1c 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/shapes.html#CircleElement">9.3 The * 'circle' element. */ class SVGCircleElement : public SVGElement, diff --git a/ksvg/dom/SVGEllipseElement.h b/ksvg/dom/SVGEllipseElement.h index 07d86504..78399779 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/shapes.html#EllipseElement">9.4 The * 'ellipse' element. */ class SVGEllipseElement : public SVGElement, diff --git a/ksvg/dom/SVGLength.cc b/ksvg/dom/SVGLength.cc index 6ae3f55f..bb2db73f 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 tqshape if any value is changed, imagine: + // Automatic updating of the shape 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 0bd2e58f..b08a78ba 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/shapes.html#CircleElement">9.5 The * 'line' element. */ class SVGLineElement : public SVGElement, diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h index f078b778..ecb93adc 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 tqgeometry of all contained graphics + * the transform attribute, if any) on the geometry of all contained graphics * elements, exclusive of stroke-width and filter effects). * * @return An SVGRect object that defines the bounding box. diff --git a/ksvg/dom/SVGPolygonElement.h b/ksvg/dom/SVGPolygonElement.h index 7347c53f..526e9815 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 tqshape consisting + * The polygon element defines a closed shape consisting * of connected straight line segments. * * For more info look here : 9.7 The + * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.7 The * 'polygon' element. */ class SVGPolygonElement : public SVGElement, diff --git a/ksvg/dom/SVGPolylineElement.h b/ksvg/dom/SVGPolylineElement.h index 78afaf2f..35e948f7 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 tqshapes. + * define open shapes. * * For more info look here : 9.6 The + * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.6 The * 'polyline' element. */ class SVGPointList; diff --git a/ksvg/dom/SVGRectElement.h b/ksvg/dom/SVGRectElement.h index 2c33b045..2a77420d 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/shapes.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 cdb0ef74..59621e2e 100644 --- a/ksvg/dom/SVGSVGElement.h +++ b/ksvg/dom/SVGSVGElement.h @@ -190,7 +190,7 @@ public: * 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 tqlayout, then unitless values represent pixel units for the current CSS + * XSL layout, then unitless values represent pixel units for the current CSS * or XSL viewport, as described in the CSS2 specification.) If the parent * 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 e4fb8a9f..0bf459fe 100644 --- a/ksvg/dom/SVGTextElement.h +++ b/ksvg/dom/SVGTextElement.h @@ -58,7 +58,7 @@ class SVGTextElementImpl; * 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 tqshapes such as paths and rectangles also + * features that apply to shapes such as paths and rectangles also * apply to text elements. * * It is possible to apply a gradient, pattern, clipping path, mask or diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp index 7fb9c6c1..aa2af84b 100644 --- a/ksvg/ecma/ksvg_ecma.cpp +++ b/ksvg/ecma/ksvg_ecma.cpp @@ -38,16 +38,16 @@ using namespace KSVG; using namespace KJS; -class AsynctqStatus : public ObjectImp +class AsyncStatus : public ObjectImp { public: - AsynctqStatus() : ObjectImp() { } + AsyncStatus() : ObjectImp() { } virtual bool implementsCall() const { return true; } virtual Value call(ExecState *exec, Object &thisObj, const List &args); }; -Value AsynctqStatus::call(ExecState *exec, Object &, const List &args) +Value AsyncStatus::call(ExecState *exec, Object &, const List &args) { kdDebug(26004) << "[AsyncStatus] " << args[0].toString(exec).ascii() << endl; @@ -194,7 +194,7 @@ void KSVGEcma::finishedWithEvent(SVGEventImpl *event) Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); // FIXME: Security issue, allows local testing of getURL(), REMOVE BEFORE RELEASE! (Niko) TQString svgDocument = KSVGLoader::getUrl(url, true); @@ -214,7 +214,7 @@ Value KSVGEcma::getUrl(ExecState *exec, ::KURL url) void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const TQString &mimeType, const TQString &contentEncoding, Object &callBackFunction) { - Object *status = new Object(new AsynctqStatus()); + Object *status = new Object(new AsyncStatus()); status->put(exec, Identifier("content"), String("")); status->put(exec, Identifier("success"), Boolean(false)); diff --git a/ksvg/ecma/ksvg_helper.cpp b/ksvg/ecma/ksvg_helper.cpp index 1d41733e..24f05101 100644 --- a/ksvg/ecma/ksvg_helper.cpp +++ b/ksvg/ecma/ksvg_helper.cpp @@ -33,7 +33,7 @@ KJS::UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } @@ -41,7 +41,7 @@ KJS::UString::UString(const TQString &d) { unsigned int len = d.length(); KJS::UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = KJS::UString::Rep::create(dat, len); } diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index 90194781..5574cd5a 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/ksvg/ecma/ksvg_window.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -330,11 +330,11 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args) case KSVG::Window::_GetURL: { KURL url((const_cast(window))->doc()->baseUrl(), args[0].toString(exec).qstring()); - Value asynctqStatus = (const_cast(window))->doc()->ecmaEngine()->getUrl(exec, url); + Value asyncStatus = (const_cast(window))->doc()->ecmaEngine()->getUrl(exec, url); Object callBackFunction = Object::dynamicCast(args[1]); List callBackArgs; - callBackArgs.append(asynctqStatus); + callBackArgs.append(asyncStatus); callBackFunction.call(exec, callBackFunction, callBackArgs); return Undefined(); diff --git a/ksvg/impl/SVGAnimateMotionElementImpl.cc b/ksvg/impl/SVGAnimateMotionElementImpl.cc index 9be742c0..fe816769 100644 --- a/ksvg/impl/SVGAnimateMotionElementImpl.cc +++ b/ksvg/impl/SVGAnimateMotionElementImpl.cc @@ -64,7 +64,7 @@ void SVGAnimateMotionElementImpl::setAttributes() /* if(!m_pathArray) { bool temp; - m_pathArray = m_path->preparePath(&temp, p->tqworldMatrix()); + m_pathArray = m_path->preparePath(&temp, p->worldMatrix()); }*/ //} diff --git a/ksvg/impl/SVGContainerImpl.cc b/ksvg/impl/SVGContainerImpl.cc index 63487227..e4a7c0db 100644 --- a/ksvg/impl/SVGContainerImpl.cc +++ b/ksvg/impl/SVGContainerImpl.cc @@ -36,21 +36,21 @@ SVGContainerImpl::~SVGContainerImpl() SVGRectImpl *SVGContainerImpl::getBBox() { - // just get the union of the tqchildren bboxes + // just get the union of the children bboxes TQRect rect; DOM::Node node = firstChild(); for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *elem = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(elem); + SVGShapeImpl *shape = dynamic_cast(elem); SVGTestsImpl *tests = dynamic_cast(elem); SVGStylableImpl *style = dynamic_cast(elem); bool ok = tests ? tests->ok() : true; - if(tqshape && style && ok && style->getVisible() && style->getDisplay()) + if(shape && style && ok && style->getVisible() && style->getDisplay()) { - SVGRectImpl *current = tqshape->getBBox(); + SVGRectImpl *current = shape->getBBox(); rect = rect.unite(current->qrect()); current->deref(); } @@ -90,21 +90,21 @@ void SVGContainerImpl::update(CanvasItemUpdate reason, int param1, int param2) for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(tqshape) - tqshape->update(reason, param1, param2); + SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(shape) + shape->update(reason, param1, param2); } } -void SVGContainerImpl::tqinvalidate(KSVGCanvas *c, bool recalc) +void SVGContainerImpl::invalidate(KSVGCanvas *c, bool recalc) { - SVGShapeImpl::tqinvalidate(c, recalc); + SVGShapeImpl::invalidate(c, recalc); for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(tqshape) - tqshape->tqinvalidate(c, recalc); + SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(shape) + shape->invalidate(c, recalc); } } @@ -114,9 +114,9 @@ void SVGContainerImpl::setReferenced(bool referenced) for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(tqshape) - tqshape->setReferenced(referenced); + SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(shape) + shape->setReferenced(referenced); } } @@ -126,9 +126,9 @@ void SVGContainerImpl::draw() for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(tqshape) - tqshape->draw(); + SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(shape) + shape->draw(); } } diff --git a/ksvg/impl/SVGContainerImpl.h b/ksvg/impl/SVGContainerImpl.h index 2d01fdc8..353a6154 100644 --- a/ksvg/impl/SVGContainerImpl.h +++ b/ksvg/impl/SVGContainerImpl.h @@ -40,7 +40,7 @@ public: virtual void removeItem(KSVGCanvas *c); virtual void update(CanvasItemUpdate reason, int param1, int param2); - virtual void tqinvalidate(KSVGCanvas *c, bool recalc); + virtual void invalidate(KSVGCanvas *c, bool recalc); virtual void setReferenced(bool referenced); virtual void draw(); diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc index 4e541847..c2b412f3 100644 --- a/ksvg/impl/SVGDocumentImpl.cc +++ b/ksvg/impl/SVGDocumentImpl.cc @@ -112,9 +112,9 @@ SVGDocumentImpl::~SVGDocumentImpl() DOM::Node node = firstChild(); for(; !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *tqshape = dynamic_cast(getElementFromHandle(node.handle())); - if(tqshape) - killList.append(tqshape); + SVGShapeImpl *shape = dynamic_cast(getElementFromHandle(node.handle())); + if(shape) + killList.append(shape); } SVGShapeImpl *rend = 0; @@ -478,7 +478,7 @@ bool SVGDocumentImpl::dispatchRecursiveEvent(SVGEvent::EventId id, DOM::Node sta if(element && element->hasChildNodes()) { - // Dispatch to all tqchildren + // Dispatch to all children eventExecuted = dispatchRecursiveEvent(id, element->lastChild()) ? true : eventExecuted; // Dispatch, locally diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc index 111b2887..87eca6e0 100644 --- a/ksvg/impl/SVGEcma.cc +++ b/ksvg/impl/SVGEcma.cc @@ -169,9 +169,9 @@ void removeItem(ExecState *exec, DOM::Node &node) SVGDocumentImpl *doc = KSVG::Window::retrieveActive(exec)->doc(); // Update canvas - SVGShapeImpl *tqshape = dynamic_cast(doc->getElementFromHandle(node.handle())); - if(tqshape && tqshape->item()) - doc->canvas()->removeItem(tqshape->item()); + SVGShapeImpl *shape = dynamic_cast(doc->getElementFromHandle(node.handle())); + if(shape && shape->item()) + doc->canvas()->removeItem(shape->item()); } // parseXML + getURL() need all these 5 functions to work properly diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc index deab7476..940790f2 100644 --- a/ksvg/impl/SVGElementImpl.cc +++ b/ksvg/impl/SVGElementImpl.cc @@ -496,9 +496,9 @@ void SVGElementImpl::setAttributes(bool deep) bool SVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SVGMouseEventImpl *mev) { - SVGShapeImpl *tqshape = dynamic_cast(this); - if(tqshape) - return tqshape->prepareMouseEvent(p, a, mev); + SVGShapeImpl *shape = dynamic_cast(this); + if(shape) + return shape->prepareMouseEvent(p, a, mev); return false; } diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc index f665d25c..e1252af8 100644 --- a/ksvg/impl/SVGEventImpl.cc +++ b/ksvg/impl/SVGEventImpl.cc @@ -43,7 +43,7 @@ SVGEventImpl::SVGEventImpl() m_defaultPrevented = false; m_id = SVGEvent::UNKNOWN_EVENT; m_eventPhase = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; m_target = 0; @@ -62,7 +62,7 @@ SVGEventImpl::SVGEventImpl(SVGEvent::EventId _id, bool canBubbleArg, bool cancel m_defaultPrevented = false; m_id = _id; m_eventPhase = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; m_target = 0; @@ -507,17 +507,17 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv break; } - // m_keyVal should contain the tqunicode value + // m_keyVal should contain the unicode value // of the pressed key if available. if (!key->text().isNull()) - m_keyVal = TQString(key->text()).tqunicode()[0]; + m_keyVal = TQString(key->text()).unicode()[0]; // m_numPad = ??? // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. m_modifier = key->state(); - // key->text() returns the tqunicode sequence as a TQString + // key->text() returns the unicode sequence as a TQString m_outputString = DOM::DOMString(key->text()); } diff --git a/ksvg/impl/SVGGlyphElementImpl.cc b/ksvg/impl/SVGGlyphElementImpl.cc index ef891912..4975b2c5 100644 --- a/ksvg/impl/SVGGlyphElementImpl.cc +++ b/ksvg/impl/SVGGlyphElementImpl.cc @@ -43,7 +43,7 @@ TQString SVGGlyphElementImpl::d() const /* @namespace KSVG @begin SVGGlyphElementImpl::s_hashTable 11 - tqunicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly + unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly d SVGGlyphElementImpl::D DontDelete|ReadOnly orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly diff --git a/ksvg/impl/SVGHelperImpl.cc b/ksvg/impl/SVGHelperImpl.cc index 0a5f1093..7378b8f4 100644 --- a/ksvg/impl/SVGHelperImpl.cc +++ b/ksvg/impl/SVGHelperImpl.cc @@ -58,13 +58,13 @@ void SVGHelperImpl::updateItem(KJS::ExecState *exec, const DOM::Node node) SVGDocumentImpl *doc = Window::retrieveActive(exec)->doc(); // Update canvas, recursively if needed - SVGShapeImpl *tqshape = dynamic_cast(doc->getElementFromHandle(node.handle())); + SVGShapeImpl *shape = dynamic_cast(doc->getElementFromHandle(node.handle())); - if(tqshape && tqshape->item()) + if(shape && shape->item()) { - tqshape->item()->update(UPDATE_TRANSFORM); - tqshape->item()->draw(); - tqshape->blit(doc->canvas()); + shape->item()->update(UPDATE_TRANSFORM); + shape->item()->draw(); + shape->blit(doc->canvas()); } if(const_cast(node).hasChildNodes()) diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc index 258ce95e..49f48e7d 100644 --- a/ksvg/impl/SVGImageElementImpl.cc +++ b/ksvg/impl/SVGImageElementImpl.cc @@ -320,10 +320,10 @@ void SVGImageElementImpl::removeItem(KSVGCanvas *c) void SVGImageElementImpl::setupSVGElement(SVGSVGElementImpl *svg) { // Set up the root svg for an svg image. - svg->setAttributeInternal("x", TQString("%1").tqarg(x()->baseVal()->value())); - svg->setAttributeInternal("y", TQString("%1").tqarg(y()->baseVal()->value())); - svg->setAttributeInternal("width", TQString("%1").tqarg(width()->baseVal()->value())); - svg->setAttributeInternal("height", TQString("%1").tqarg(height()->baseVal()->value())); + svg->setAttributeInternal("x", TQString("%1").arg(x()->baseVal()->value())); + svg->setAttributeInternal("y", TQString("%1").arg(y()->baseVal()->value())); + svg->setAttributeInternal("width", TQString("%1").arg(width()->baseVal()->value())); + svg->setAttributeInternal("height", TQString("%1").arg(height()->baseVal()->value())); TQString par = getAttribute("preserveAspectRatio").string().stripWhiteSpace(); @@ -408,7 +408,7 @@ void SVGImageElementImpl::setImage(TQImage *image) if(m_item) { - ownerDoc()->canvas()->tqinvalidate(m_item, false); + ownerDoc()->canvas()->invalidate(m_item, false); ownerDoc()->rerender(); } } @@ -508,12 +508,12 @@ void SVGImageElementImpl::applyColorProfile(SVGColorProfileElementImpl *profile, if(image->m_image) { - // Image is already painted, we apply the color profile and tqrepaint it + // Image is already painted, we apply the color profile and repaint it image->applyColorProfile(); if(image->item()) { - image->ownerDoc()->canvas()->tqinvalidate(image->item(), false); + image->ownerDoc()->canvas()->invalidate(image->item(), false); image->ownerDoc()->rerender(); } } diff --git a/ksvg/impl/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h index 64a96421..fc9be8cc 100644 --- a/ksvg/impl/SVGImageElementImpl.h +++ b/ksvg/impl/SVGImageElementImpl.h @@ -86,7 +86,7 @@ public: virtual SVGRectImpl *getBBox(); - // Screen-space clipping tqshape + // Screen-space clipping shape KSVGPolygon clippingShape(); void onScreenCTMUpdated(); diff --git a/ksvg/impl/SVGLocatableImpl.cc b/ksvg/impl/SVGLocatableImpl.cc index 63384d7e..0ae143fa 100644 --- a/ksvg/impl/SVGLocatableImpl.cc +++ b/ksvg/impl/SVGLocatableImpl.cc @@ -92,13 +92,13 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCT // Notify the element onScreenCTMUpdated(); - SVGShapeImpl *tqshape = dynamic_cast(this); + SVGShapeImpl *shape = dynamic_cast(this); - if(tqshape) + if(shape) { // TODO: Update due to matrix animations - //if(tqshape->item()) - // tqshape->item()->update(updateReason); + //if(shape->item()) + // shape->item()->update(updateReason); SVGElementImpl *element = dynamic_cast(this); @@ -119,9 +119,9 @@ void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM if(m_cachedScreenCTMIsValid) { SVGElementImpl *element = dynamic_cast(this); - SVGShapeImpl *tqshape = dynamic_cast(this); + SVGShapeImpl *shape = dynamic_cast(this); - if(tqshape) + if(shape) { DOM::Node node = element->firstChild(); for(; !node.isNull(); node = node.nextSibling()) @@ -184,9 +184,9 @@ Value SVGLocatableImplProtoFunc::call(ExecState *exec, Object &thisObj, const Li return container->getBBox()->cache(exec); else { - SVGShapeImpl *tqshape = dynamic_cast(obj); - if(tqshape) - return tqshape->getBBox()->cache(exec); + SVGShapeImpl *shape = dynamic_cast(obj); + if(shape) + return shape->getBBox()->cache(exec); else return obj->getBBox()->cache(exec); } diff --git a/ksvg/impl/SVGMarkerElementImpl.cc b/ksvg/impl/SVGMarkerElementImpl.cc index c10d5280..a621b47f 100644 --- a/ksvg/impl/SVGMarkerElementImpl.cc +++ b/ksvg/impl/SVGMarkerElementImpl.cc @@ -236,21 +236,21 @@ void SVGMarkerElementImpl::draw(SVGShapeImpl *referencingElement, double x, doub for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && style && ok && style->getVisible() && style->getDisplay()) + if(element && shape && style && ok && style->getVisible() && style->getDisplay()) { SVGLocatableImpl *locatable = dynamic_cast(element); if(locatable) locatable->updateCachedScreenCTM(mtx); - tqshape->update(UPDATE_TRANSFORM); - tqshape->setReferenced(true); - tqshape->draw(); - tqshape->setReferenced(false); + shape->update(UPDATE_TRANSFORM); + shape->setReferenced(true); + shape->draw(); + shape->setReferenced(false); } } diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc index 51c97be9..16491eb9 100644 --- a/ksvg/impl/SVGMaskElementImpl.cc +++ b/ksvg/impl/SVGMaskElementImpl.cc @@ -296,22 +296,22 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && style && ok && style->getVisible() && style->getDisplay()) + if(element && shape && style && ok && style->getVisible() && style->getDisplay()) { SVGLocatableImpl *locatable = dynamic_cast(element); if(locatable) locatable->updateCachedScreenCTM(baseMatrix); element->createItem(m_canvas); - if(tqshape->item()) + if(shape->item()) { - tqshape->item()->setReferenced(true); - m_canvas->tqinvalidate(tqshape->item(), true); + shape->item()->setReferenced(true); + m_canvas->invalidate(shape->item(), true); } } } @@ -321,15 +321,15 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && style && ok && style->getVisible() && style->getDisplay()) + if(element && shape && style && ok && style->getVisible() && style->getDisplay()) { - if(tqshape) - tqshape->removeItem(m_canvas); + if(shape) + shape->removeItem(m_canvas); } } @@ -453,17 +453,17 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin return mask; } -TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle) +TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle) { TQByteArray cumulativeMask; do { - SVGStylableImpl *style = dynamic_cast(tqshape); + SVGStylableImpl *style = dynamic_cast(shape); if(style && style->hasMask()) { - SVGElementImpl *element = tqshape->ownerDoc()->rootElement()->getElementById(style->getMask()); + SVGElementImpl *element = shape->ownerDoc()->rootElement()->getElementById(style->getMask()); if(element) { @@ -471,7 +471,7 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec if(maskElement) { - SVGMaskElementImpl::Mask mask = maskElement->createMask(tqshape); + SVGMaskElementImpl::Mask mask = maskElement->createMask(shape); if(!mask.isEmpty()) { @@ -495,21 +495,21 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec } } - DOM::Node parentNode = tqshape->parentNode(); + DOM::Node parentNode = shape->parentNode(); if(!parentNode.isNull()) { - SVGElementImpl *parent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle()); + SVGElementImpl *parent = shape->ownerDoc()->getElementFromHandle(parentNode.handle()); if(parent) - tqshape = dynamic_cast(parent); + shape = dynamic_cast(parent); else - tqshape = 0; + shape = 0; } else - tqshape = 0; + shape = 0; - } while(tqshape); + } while(shape); return cumulativeMask; } diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h index 5b61d713..2a96967c 100644 --- a/ksvg/impl/SVGMaskElementImpl.h +++ b/ksvg/impl/SVGMaskElementImpl.h @@ -89,10 +89,10 @@ public: Mask createMask(SVGShapeImpl *referencingElement); - // Compute the mask on a given tqshape, taking into account all masks defined - // on the tqshape's ancestors. This is a workaround for us not having a buffer + // Compute the mask on a given shape, taking into account all masks defined + // on the shape's ancestors. This is a workaround for us not having a buffer // for container elements, so we can't mask containers directly. - static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle); + static TQByteArray maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle); private: class CacheKey diff --git a/ksvg/impl/SVGPathSegArcImpl.h b/ksvg/impl/SVGPathSegArcImpl.h index d77f0497..d8a1f8f9 100644 --- a/ksvg/impl/SVGPathSegArcImpl.h +++ b/ksvg/impl/SVGPathSegArcImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_ARC_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "A"; } - virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); } void setX(double x); double x() const; @@ -94,7 +94,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_ARC_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "a"; } - virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); } void setX(double x); double x() const; diff --git a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h index 7ab3a87b..83f4de6b 100644 --- a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "C"; } - virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -88,7 +88,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "c"; } - virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h index ff52bfab..3bcc8c87 100644 --- a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "S"; } - virtual TQString toString() const { return TQString("S %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("S %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -88,7 +88,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "s"; } - virtual TQString toString() const { return TQString("s %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("s %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h index d8e876b5..1fa0aa17 100644 --- a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "Q"; } - virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -80,7 +80,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "q"; } - virtual TQString toString() const { return TQString("q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h index be0a4033..1d1bdf39 100644 --- a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h +++ b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "T"; } - virtual TQString toString() const { return TQString("T %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("T %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -80,7 +80,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "t"; } - virtual TQString toString() const { return TQString("t %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("t %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h index f170b303..52355c5d 100644 --- a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h +++ b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "H"; } - virtual TQString toString() const { return TQString("H %1").tqarg(m_x); } + virtual TQString toString() const { return TQString("H %1").arg(m_x); } void setX(const double &); double x() const; @@ -68,7 +68,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "h"; } - virtual TQString toString() const { return TQString("h %1").tqarg(m_x); } + virtual TQString toString() const { return TQString("h %1").arg(m_x); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegLinetoImpl.h b/ksvg/impl/SVGPathSegLinetoImpl.h index 69caeba4..78df51b9 100644 --- a/ksvg/impl/SVGPathSegLinetoImpl.h +++ b/ksvg/impl/SVGPathSegLinetoImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "L"; } - virtual TQString toString() const { return TQString("L %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("L %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -72,7 +72,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "l"; } - virtual TQString toString() const { return TQString("l %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("l %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h index 9e50405f..1bbf41f4 100644 --- a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h +++ b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "V"; } - virtual TQString toString() const { return TQString("V %1").tqarg(m_y); } + virtual TQString toString() const { return TQString("V %1").arg(m_y); } void setY(const double &); double y() const; @@ -68,7 +68,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "v"; } - virtual TQString toString() const { return TQString("v %1").tqarg(m_y); } + virtual TQString toString() const { return TQString("v %1").arg(m_y); } void setY(const double &); double y() const; diff --git a/ksvg/impl/SVGPathSegMovetoImpl.h b/ksvg/impl/SVGPathSegMovetoImpl.h index dfa25935..6db95702 100644 --- a/ksvg/impl/SVGPathSegMovetoImpl.h +++ b/ksvg/impl/SVGPathSegMovetoImpl.h @@ -36,7 +36,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "M"; } - virtual TQString toString() const { return TQString("M %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("M %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; @@ -72,7 +72,7 @@ public: virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; } virtual DOM::DOMString pathSegTypeAsLetter() const { return "m"; } - virtual TQString toString() const { return TQString("m %1 %2").tqarg(m_x).tqarg(m_y); } + virtual TQString toString() const { return TQString("m %1 %2").arg(m_x).arg(m_y); } void setX(const double &); double x() const; diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc index 672e62d3..1b088240 100644 --- a/ksvg/impl/SVGPatternElementImpl.cc +++ b/ksvg/impl/SVGPatternElementImpl.cc @@ -350,22 +350,22 @@ TQImage SVGPatternElementImpl::createTile(SVGShapeImpl *referencingElement, int for(DOM::Node node = m_location->firstChild(); !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && style && ok && style->getVisible() && style->getDisplay()) + if(element && shape && style && ok && style->getVisible() && style->getDisplay()) { SVGLocatableImpl *locatable = dynamic_cast(element); if(locatable) locatable->updateCachedScreenCTM(baseMatrix); element->createItem(m_canvas); - if(tqshape->item()) + if(shape->item()) { - tqshape->item()->setReferenced(true); - m_canvas->tqinvalidate(tqshape->item(), true); + shape->item()->setReferenced(true); + m_canvas->invalidate(shape->item(), true); } } } @@ -433,7 +433,7 @@ void SVGPatternElementImpl::reference(const TQString &href) SVGHelperImpl::copyAttributes(src, this); // Spec: Change location to referenced element so we - // can take the tqchildren elements to render from there + // can take the children elements to render from there if(m_location == this) m_location = src; } diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc index d72b488f..c9b82445 100644 --- a/ksvg/impl/SVGSVGElementImpl.cc +++ b/ksvg/impl/SVGSVGElementImpl.cc @@ -372,18 +372,18 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); - if(tqshape) + SVGShapeImpl *shape = dynamic_cast(element); + if(shape) { - if(tqshape->isContainer()) + if(shape->isContainer()) // TODO : pass it on to container::getEnclosureList() which should return a NodeList - kdDebug() << "!tqshape" << endl; + kdDebug() << "!shape" << endl; else { - // TODO : add the tqshape to list if the test succeeds - SVGRectImpl *current = tqshape->getBBox(); + // TODO : add the shape to list if the test succeeds + SVGRectImpl *current = shape->getBBox(); if(rect->qrect().contains(current->qrect(), true)) - kdDebug() << "tqshape : " << element->nodeName().string() << " is fully enclosed" << endl; + kdDebug() << "shape : " << element->nodeName().string() << " is fully enclosed" << endl; current->deref(); } @@ -395,11 +395,11 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl *rect) { - SVGShapeImpl *tqshape = dynamic_cast(element); - if(!tqshape) + SVGShapeImpl *shape = dynamic_cast(element); + if(!shape) return false; - SVGRectImpl *current = tqshape->getBBox(); + SVGRectImpl *current = shape->getBBox(); bool result = rect->qrect().intersects(current->qrect()); current->deref(); return result; @@ -407,11 +407,11 @@ bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl * bool SVGSVGElementImpl::checkEnclosure(SVGElementImpl *element, SVGRectImpl *rect) { - SVGShapeImpl *tqshape = dynamic_cast(element); - if(!tqshape) + SVGShapeImpl *shape = dynamic_cast(element); + if(!shape) return false; - SVGRectImpl *current = tqshape->getBBox(); + SVGRectImpl *current = shape->getBBox(); bool result = rect->qrect().contains(current->qrect()); current->deref(); return result; @@ -672,7 +672,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV elem = (*it)->element(); if(elem) { - // Check if mouse is over a certain tqshape... + // Check if mouse is over a certain shape... // mop: once an element has been found check eventlisteners and leave immediately ret = elem->prepareMouseEvent(p, userA, mev); if(ret) break; @@ -693,7 +693,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV dorerender = true; // mop: if it has the event then rerender } - // If a mouse "moves" over a tqshape, it's also "over" the tqshape + // If a mouse "moves" over a shape, it's also "over" the shape if(mev->id() == SVGEvent::MOUSEMOVE_EVENT) { mev->target()->setMouseOver(true); @@ -742,7 +742,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV } } - // The mouse is over a tqshape, so we have a target..we need to register that for a mouseout + // The mouse is over a shape, so we have a target..we need to register that for a mouseout ownerDoc()->setLastTarget(mev->target()); } diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cc index 755bbd13..d8ef45c5 100644 --- a/ksvg/impl/SVGShapeImpl.cc +++ b/ksvg/impl/SVGShapeImpl.cc @@ -125,10 +125,10 @@ void SVGShapeImpl::update(CanvasItemUpdate reason, int param1, int param2) m_item->update(reason, param1, param2); } -void SVGShapeImpl::tqinvalidate(KSVGCanvas *c, bool recalc) +void SVGShapeImpl::invalidate(KSVGCanvas *c, bool recalc) { if(m_item && c) - c->tqinvalidate(m_item, recalc); + c->invalidate(m_item, recalc); } void SVGShapeImpl::setReferenced(bool referenced) diff --git a/ksvg/impl/SVGShapeImpl.h b/ksvg/impl/SVGShapeImpl.h index c059d448..c61038d2 100644 --- a/ksvg/impl/SVGShapeImpl.h +++ b/ksvg/impl/SVGShapeImpl.h @@ -49,7 +49,7 @@ public: virtual bool isContainer() const { return false; } virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0); - virtual void tqinvalidate(KSVGCanvas *c, bool recalc); + virtual void invalidate(KSVGCanvas *c, bool recalc); virtual void setReferenced(bool referenced); virtual void draw(); virtual void blit(KSVGCanvas *); diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc index d1019ff8..9471c562 100644 --- a/ksvg/impl/SVGStylableImpl.cc +++ b/ksvg/impl/SVGStylableImpl.cc @@ -711,7 +711,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value) text-anchor SVGStylableImpl::TextAnchor DontDelete|ReadOnly direction SVGStylableImpl::Direction DontDelete|ReadOnly writing-mode SVGStylableImpl::WritingMode DontDelete|ReadOnly - tqunicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly + unicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly opacity SVGStylableImpl::Opacity DontDelete|ReadOnly fill-opacity SVGStylableImpl::FillOpacity DontDelete|ReadOnly stroke-opacity SVGStylableImpl::StrokeOpacity DontDelete|ReadOnly @@ -1006,7 +1006,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value & break; case Direction: m_flags |= SVG_STYLE_FLAG_TEXT_DIRECTION; - // Spec: direction is only processed when tqunicode-bidi + // Spec: direction is only processed when unicode-bidi // is set to bidi-override or embedded if(m_textUnicodeBidi == OVERRIDE || m_textUnicodeBidi == EMBED || @@ -1276,16 +1276,16 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value & if(redraw) { - SVGShapeImpl *tqshape = dynamic_cast(m_object); + SVGShapeImpl *shape = dynamic_cast(m_object); if(inherit) processStyle(); - if(tqshape && tqshape->item()) + if(shape && shape->item()) { if(update > -1) - tqshape->item()->update(static_cast(update)); + shape->item()->update(static_cast(update)); else if(m_object) - m_object->ownerDoc()->canvas()->tqinvalidate(tqshape->item(), false); + m_object->ownerDoc()->canvas()->invalidate(shape->item(), false); } } } diff --git a/ksvg/impl/SVGSwitchElementImpl.cc b/ksvg/impl/SVGSwitchElementImpl.cc index f6861521..613a1982 100644 --- a/ksvg/impl/SVGSwitchElementImpl.cc +++ b/ksvg/impl/SVGSwitchElementImpl.cc @@ -41,13 +41,13 @@ void SVGSwitchElementImpl::createItem(KSVGCanvas *c) for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); SVGStylableImpl *style = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && ok && style->getVisible() && style->getDisplay() && (tqshape->directRender() || !directRender())) + if(element && shape && ok && style->getVisible() && style->getDisplay() && (shape->directRender() || !directRender())) { element->createItem(c); break; diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cc index 29862959..caddf81f 100644 --- a/ksvg/impl/SVGTimeScheduler.cc +++ b/ksvg/impl/SVGTimeScheduler.cc @@ -101,9 +101,9 @@ void SVGTimer::notifyAll() TQValueList::iterator it2; for(it2 = elements.begin(); it2 != elements.end(); ++it2) { - SVGShapeImpl *tqshape = dynamic_cast(*it2); - if(tqshape && tqshape->item()) - tqshape->item()->update(UPDATE_TRANSFORM); + SVGShapeImpl *shape = dynamic_cast(*it2); + if(shape && shape->item()) + shape->item()->update(UPDATE_TRANSFORM); } } diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cc index 872bb0bc..db822a64 100644 --- a/ksvg/impl/SVGUseElementImpl.cc +++ b/ksvg/impl/SVGUseElementImpl.cc @@ -182,9 +182,9 @@ SVGRectImpl *SVGUseElementImpl::getBBox() { if(m_instanceRoot) { - SVGShapeImpl *tqshape = dynamic_cast(m_instanceRoot->correspondingElement()); - if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && tqshape) - return tqshape->getBBox(); + SVGShapeImpl *shape = dynamic_cast(m_instanceRoot->correspondingElement()); + if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && shape) + return shape->getBBox(); } SVGRectImpl *ret = new SVGRectImpl(); @@ -370,19 +370,19 @@ void SVGUseElementImpl::update(CanvasItemUpdate reason, int param1, int param2) { if(m_instanceRoot) { - SVGShapeImpl *tqshape = dynamic_cast(m_instanceRoot->correspondingElement()); - if(tqshape) - tqshape->update(reason, param1, param2); + SVGShapeImpl *shape = dynamic_cast(m_instanceRoot->correspondingElement()); + if(shape) + shape->update(reason, param1, param2); } } -void SVGUseElementImpl::tqinvalidate(KSVGCanvas *c, bool recalc) +void SVGUseElementImpl::invalidate(KSVGCanvas *c, bool recalc) { if(m_instanceRoot) { - SVGShapeImpl *tqshape = dynamic_cast(m_instanceRoot->correspondingElement()); - if(tqshape) - tqshape->tqinvalidate(c, recalc); + SVGShapeImpl *shape = dynamic_cast(m_instanceRoot->correspondingElement()); + if(shape) + shape->invalidate(c, recalc); } } @@ -390,9 +390,9 @@ void SVGUseElementImpl::setReferenced(bool referenced) { if(m_instanceRoot) { - SVGShapeImpl *tqshape = dynamic_cast(m_instanceRoot->correspondingElement()); - if(tqshape) - tqshape->setReferenced(referenced); + SVGShapeImpl *shape = dynamic_cast(m_instanceRoot->correspondingElement()); + if(shape) + shape->setReferenced(referenced); } } @@ -400,9 +400,9 @@ void SVGUseElementImpl::draw() { if(m_instanceRoot) { - SVGShapeImpl *tqshape = dynamic_cast(m_instanceRoot->correspondingElement()); - if(tqshape) - tqshape->draw(); + SVGShapeImpl *shape = dynamic_cast(m_instanceRoot->correspondingElement()); + if(shape) + shape->draw(); } } diff --git a/ksvg/impl/SVGUseElementImpl.h b/ksvg/impl/SVGUseElementImpl.h index 15c644f7..02eb8d88 100644 --- a/ksvg/impl/SVGUseElementImpl.h +++ b/ksvg/impl/SVGUseElementImpl.h @@ -59,7 +59,7 @@ public: virtual void createItem(KSVGCanvas *c); virtual void removeItem(KSVGCanvas *c); virtual void update(CanvasItemUpdate reason, int param1, int param2); - virtual void tqinvalidate(KSVGCanvas *c, bool recalc); + virtual void invalidate(KSVGCanvas *c, bool recalc); virtual void setReferenced(bool referenced); virtual void draw(); diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cc index f1506c14..3e70d4de 100644 --- a/ksvg/impl/SVGWindowImpl.cc +++ b/ksvg/impl/SVGWindowImpl.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -133,9 +133,9 @@ DOM::DOMString SVGWindowImpl::printNode(const DOM::Node &node, unsigned short le TQDictIterator it(elem->attributes()); for(;it.current(); ++it) ret += " " + it.currentKey() + "=\"" + it.current()->string() + '\"'; - if(elem->firstChild().isNull()) // no tqchildren + if(elem->firstChild().isNull()) // no children ret += " />\n"; - else // handle tqchildren + else // handle children { ret += ">\n"; for(DOM::Node child = node.firstChild();!child.isNull();child = child.nextSibling()) diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c index 04ea81fc..47c7d924 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.c +++ b/ksvg/impl/libs/art_support/art_rgba_svp.c @@ -415,7 +415,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the tqshape specified with @svp over the @buf RGB buffer. + * Renders the shape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify @@ -600,7 +600,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the tqshape specified with @svp over the @buf RGB buffer. + * Renders the shape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp index 11de3177..59ab8e5c 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.cpp +++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp @@ -125,7 +125,7 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params)); // If not available in cache, render new one and cache it :) - // If we're mixing ie. japanese and latin characters (TTB tqlayout), + // If we're mixing ie. japanese and latin characters (TTB layout), // then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko) if(!cached || !onlyLatin) cached = calcGlyph(params, affine, onlyLatin); @@ -164,11 +164,11 @@ void Converter::selectGlyph(GlyphRenderParams *params) // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering // a latin glyph because it needs to be rotated... - if(params->tqlayout()->tb()) + if(params->layout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) - if(script != Latin || params->tqlayout()->glyphOrientationVertical() == 0) + if(script != Latin || params->layout()->glyphOrientationVertical() == 0) flags |= FT_LOAD_VERTICAL_LAYOUT; } @@ -193,7 +193,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine affine.dx() += kx + affine.m21() * ky; // Only apply y kerning in TB mode - if(params->tqlayout()->tb()) + if(params->layout()->tb()) affine.dy() += kx + affine.m22() * ky; } @@ -206,7 +206,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine traceAffine.scale(1000.0 / params->font()->fontFace()->units_per_EM); // 3b. Enable character rotation, if needed - if(params->tqlayout()->tb()) + if(params->layout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) @@ -214,7 +214,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine { FT_Matrix matrix; - double angle = deg2rad * params->tqlayout()->glyphOrientationVertical(); + double angle = deg2rad * params->layout()->glyphOrientationVertical(); matrix.xx = (FT_Fixed)( cos(angle) * 0x10000L); matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L); matrix.yx = (FT_Fixed)( sin(angle) * 0x10000L); @@ -257,21 +257,21 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned if(params->useBidi()) { FriBidiCharType baseDir = FRIBIDI_TYPE_N; - FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1]; - FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1]; + FriBidiChar *unicodeIn = new FriBidiChar[length + 1]; + FriBidiChar *unicodeOut = new FriBidiChar[length + 1]; bidi = new unsigned short[length + 1]; for(unsigned int i = 0; i < length; i++) - tqunicodeIn[i] = text[i]; + unicodeIn[i] = text[i]; - fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0); + fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0); for(unsigned int i = 0; i < length; i++) - bidi[i] = tqunicodeOut[i]; + bidi[i] = unicodeOut[i]; bidi[length] = 0; - delete []tqunicodeIn; - delete []tqunicodeOut; + delete []unicodeIn; + delete []unicodeOut; } else bidi = const_cast(text); @@ -302,7 +302,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned int pixelUnderlineThickness = T2PMAX(1, (int) ((font->fontFace()->underline_thickness * fontSize / font->fontFace()->units_per_EM) * affine.m22())); // 3. Prepare needed variables for the rendering loop - // - rendering params (tqlayout, font...) + // - rendering params (layout, font...) // - bounding box (per glyph, overall) // - glyph matrix (overall) // - resulting glyph sets diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp index 2ced971d..1d6f7005 100644 --- a/ksvg/impl/libs/libtext2path/src/Font.cpp +++ b/ksvg/impl/libs/libtext2path/src/Font.cpp @@ -141,7 +141,7 @@ std::string Font::buildRequest(const FontVisualParams *fontParams, int &id) FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast(string.c_str())); } - // Always load vertical tqlayout + // Always load vertical layout FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true); // Disable hinting @@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams) return false; } - // Choose tqunicode charmap + // Choose unicode charmap for(int charmap = 0; charmap < m_fontFace->num_charmaps; charmap++) { if(m_fontFace->charmaps[charmap]->encoding == ft_encoding_unicode) @@ -217,7 +217,7 @@ bool Font::load(const FontVisualParams *fontParams) if(error) { - std::cout << "Font::load(), unable to select tqunicode charmap. Aborting!" << std::endl; + std::cout << "Font::load(), unable to select unicode charmap. Aborting!" << std::endl; FT_Done_Face(m_fontFace); m_fontFace = 0; diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.cpp b/ksvg/impl/libs/libtext2path/src/Glyph.cpp index 08ad55a8..d2e16189 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp +++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp @@ -309,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font) m_font = font; } -const GlyphLayoutParams *GlyphRenderParams::tqlayout() const +const GlyphLayoutParams *GlyphRenderParams::layout() const { return m_layout; } -void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout) +void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout) { - m_layout = tqlayout; + m_layout = layout; } unsigned int GlyphRenderParams::glyphIndex() const diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h index 8dcbe599..b3bd3fb5 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.h +++ b/ksvg/impl/libs/libtext2path/src/Glyph.h @@ -171,8 +171,8 @@ namespace T2P Font *font() const; void setFont(Font *font); - const GlyphLayoutParams *tqlayout() const; - void setLayout(const GlyphLayoutParams *tqlayout); + const GlyphLayoutParams *layout() const; + void setLayout(const GlyphLayoutParams *layout); unsigned int glyphIndex() const; void setGlyphIndex(unsigned int glyphIndex); diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c index 70c00262..01f60976 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window parent, root, *tqchildren; - int ntqchildren; + Window parent, root, *children; + int nchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); if (wa.map_state != IsViewable) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &parent, &tqchildren, &ntqchildren)) + &parent, &children, &nchildren)) return 0; - if (ntqchildren > 0) - XFree (tqchildren); + if (nchildren > 0) + XFree (children); if (parent == root) return 1; diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.cpp b/ksvg/plugin/backends/agg/AggCanvasItems.cpp index 36b84e86..1052edb8 100644 --- a/ksvg/plugin/backends/agg/AggCanvasItems.cpp +++ b/ksvg/plugin/backends/agg/AggCanvasItems.cpp @@ -239,13 +239,13 @@ void AggShape::update(CanvasItemUpdate reason, int param1, int param2) m_fillPainter->update(m_style); if(m_strokePainter) m_strokePainter->update(m_style); - m_canvas->tqinvalidate(this, false); + m_canvas->invalidate(this, false); } else if(reason == UPDATE_TRANSFORM) { freeSVPs(); init(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } else if(reason == UPDATE_ZOOM) init(); @@ -257,13 +257,13 @@ void AggShape::update(CanvasItemUpdate reason, int param1, int param2) else if(reason == UPDATE_LINEWIDTH) { init(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } } -void AggShape::draw(SVGShapeImpl *tqshape) +void AggShape::draw(SVGShapeImpl *shape) { - if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender())) + if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender())) return; //if(!m_strokeSVP && (!m_fillSVP || !m_style->isFilled())) @@ -292,14 +292,14 @@ void AggShape::draw(SVGShapeImpl *tqshape) m_curved.approximation_scale(pow(m_transform.scale(), 0.75)); if(m_fillPainter) - m_fillPainter->draw(m_canvas, m_curved_trans, m_style, tqshape); + m_fillPainter->draw(m_canvas, m_curved_trans, m_style, shape); if(m_strokePainter) - m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, tqshape); + m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, shape); } -bool AggShape::isVisible(SVGShapeImpl *tqshape) +bool AggShape::isVisible(SVGShapeImpl *shape) { - return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->directRender()); + return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender()); } void AggShape::calcSVPs(const SVGMatrixImpl *matrix) @@ -376,14 +376,14 @@ void AggStrokePaintServer::update(SVGStylableImpl *style) } template -void AggStrokePaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape) +void AggStrokePaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape) { canvas->m_ras.reset(); if(style->getStrokeColor()->paintType() == SVG_PAINTTYPE_URI) { - AggPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getStrokeColor()->uri().string())); + AggPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getStrokeColor()->uri().string())); if(!pserver) return; - pserver->setBBoxTarget(tqshape); + pserver->setBBoxTarget(shape); // TODO : Clipping if(!pserver->finalized()) @@ -425,14 +425,14 @@ void AggFillPaintServer::update(SVGStylableImpl *style) } template -void AggFillPaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape) +void AggFillPaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape) { canvas->m_ras.reset(); if(style->getFillColor()->paintType() == SVG_PAINTTYPE_URI) { - AggPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getFillColor()->uri().string())); + AggPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getFillColor()->uri().string())); if(!pserver) return; - pserver->setBBoxTarget(tqshape); + pserver->setBBoxTarget(shape); // TODO : Clipping if(!pserver->finalized()) @@ -1166,13 +1166,13 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2) svpelement = ++it; } - m_canvas->tqinvalidate(this, false); + m_canvas->invalidate(this, false); } else if(reason == UPDATE_TRANSFORM) { clearCurved(); init(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } else if(reason == UPDATE_ZOOM) { diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.h b/ksvg/plugin/backends/agg/AggCanvasItems.h index 7612b234..f6b1d44a 100644 --- a/ksvg/plugin/backends/agg/AggCanvasItems.h +++ b/ksvg/plugin/backends/agg/AggCanvasItems.h @@ -270,7 +270,7 @@ namespace KSVG AggFillPaintServer(SVGStylableImpl *style); void update(SVGStylableImpl *style); template - void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape); + void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape); private: agg::rgba8 m_color; @@ -282,7 +282,7 @@ namespace KSVG AggStrokePaintServer(SVGStylableImpl *style); void update(SVGStylableImpl *style); template - void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape); + void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *shape); private: agg::rgba8 m_color; @@ -311,11 +311,11 @@ namespace KSVG virtual bool fillContains(const TQPoint &p); virtual bool strokeContains(const TQPoint &p); virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0); - void draw(SVGShapeImpl *tqshape); + void draw(SVGShapeImpl *shape); void calcSVPs(const SVGMatrixImpl *matrix); virtual void init(); virtual void init(const SVGMatrixImpl *); - bool isVisible(SVGShapeImpl *tqshape); + bool isVisible(SVGShapeImpl *shape); void setRenderContext(RenderContext context) { m_context = context; } diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 1d2ee30c..55b371dd 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -187,15 +187,15 @@ CanvasPaintServer *LibartCanvas::createPaintServer(SVGElementImpl *pserver) void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMatrixImpl *matrix, const KSVGPolygon& clippingPolygon) { - SVGShapeImpl *tqshape = dynamic_cast(style); + SVGShapeImpl *shape = dynamic_cast(style); - if(tqshape) + if(shape) { if(image.depth() != 32) image = image.convertDepth(32); ArtSVP *imageBorder = svpFromPolygon(clippingPolygon); - ArtSVP *clipSvp = clipSingleSVP(imageBorder, tqshape); + ArtSVP *clipSvp = clipSingleSVP(imageBorder, shape); ArtDRect bbox; art_drect_svp(&bbox, clipSvp); @@ -214,7 +214,7 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox); double affine[6]; KSVGHelper::matrixToAffine(matrix, affine); @@ -266,10 +266,10 @@ ArtSVP *LibartCanvas::clippingRect(const TQRect &rect, const SVGMatrixImpl *ctm) return result; } -ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) +ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape) { ArtSVP *clippedSvp = copy_svp(svp); - SVGStylableImpl *style = dynamic_cast(tqshape); + SVGStylableImpl *style = dynamic_cast(shape); if(style) { @@ -282,7 +282,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) if(clipPath) { LibartClipPath *lclip = dynamic_cast(clipPath); - reinterpret_cast(clipPath->element())->setBBoxTarget(tqshape); + reinterpret_cast(clipPath->element())->setBBoxTarget(shape); lclip->init(); @@ -296,7 +296,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) } } - SVGSVGElementImpl *svg = dynamic_cast(tqshape); + SVGSVGElementImpl *svg = dynamic_cast(shape); // Clip outer svg, unless width and height not set if(svg && (!svg->isRootElement() || !svg->getAttribute("width").isEmpty() || !svg->getAttribute("height").isEmpty()) && !svg->getOverflow()) @@ -308,13 +308,13 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) clippedSvp = s; } - if(dynamic_cast(tqshape) != 0) + if(dynamic_cast(shape) != 0) { // TODO: inherit clipping paths into tile space } - else if(dynamic_cast(tqshape) != 0) + else if(dynamic_cast(shape) != 0) { - SVGMarkerElementImpl *marker = static_cast(tqshape); + SVGMarkerElementImpl *marker = static_cast(shape); if(!marker->clipShape().isEmpty()) { @@ -329,7 +329,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) } else { - SVGElementImpl *element = dynamic_cast(tqshape); + SVGElementImpl *element = dynamic_cast(shape); DOM::Node parentNode = element->parentNode(); if(!parentNode.isNull()) diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp index 1434931b..aca4c517 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp @@ -129,9 +129,9 @@ TQRect LibartShape::bbox() const return rect; } -bool LibartShape::isVisible(SVGShapeImpl *tqshape) +bool LibartShape::isVisible(SVGShapeImpl *shape) { - return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->directRender()); + return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender()); } bool LibartShape::fillContains(const TQPoint &p) @@ -160,12 +160,12 @@ void LibartShape::update(CanvasItemUpdate reason, int param1, int param2) m_fillPainter->update(m_style); if(m_strokePainter) m_strokePainter->update(m_style); - m_canvas->tqinvalidate(this, false); + m_canvas->invalidate(this, false); } else if(reason == UPDATE_TRANSFORM) { reset(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } else if(reason == UPDATE_ZOOM) reset(); @@ -184,13 +184,13 @@ void LibartShape::update(CanvasItemUpdate reason, int param1, int param2) m_strokeSVP = 0; } init(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } } -void LibartShape::draw(SVGShapeImpl *tqshape) +void LibartShape::draw(SVGShapeImpl *shape) { - if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender())) + if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender())) return; bool fillOk = m_fillSVP && m_style->isFilled(); @@ -199,10 +199,10 @@ void LibartShape::draw(SVGShapeImpl *tqshape) if(fillOk || strokeOk) { if(m_fillPainter && m_fillSVP) - m_fillPainter->draw(m_canvas, m_fillSVP, m_style, tqshape); + m_fillPainter->draw(m_canvas, m_fillSVP, m_style, shape); if(m_strokePainter && m_strokeSVP) - m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, tqshape); + m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, shape); } } @@ -230,9 +230,9 @@ void LibartPainter::update(SVGStylableImpl *style) } } -void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape) +void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape) { - ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, tqshape); + ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, shape); // Clipping ArtDRect bbox; @@ -252,15 +252,15 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox); if(paintType(style) == SVG_PAINTTYPE_URI) { - LibartPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), paintUri(style))); + LibartPaintServer *pserver = static_cast(SVGPaintServerImpl::paintServer(shape->ownerDoc(), paintUri(style))); if(pserver) { - pserver->setBBoxTarget(tqshape); + pserver->setBBoxTarget(shape); if(!pserver->finalized()) pserver->finalizePaintServer(); pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox); @@ -1285,28 +1285,28 @@ void LibartClipPath::init() for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *element = m_clipPath->ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *tqshape = dynamic_cast(element); + SVGShapeImpl *shape = dynamic_cast(element); SVGTestsImpl *tests = dynamic_cast(element); bool ok = tests ? tests->ok() : true; - if(element && tqshape && ok && !tqshape->isContainer()) + if(element && shape && ok && !shape->isContainer()) { - LibartClipItem *clipElement = dynamic_cast(tqshape->item()); + LibartClipItem *clipElement = dynamic_cast(shape->item()); - if(dynamic_cast(tqshape->item())) + if(dynamic_cast(shape->item())) { // The cast to a clipElement above is failing when it is valid. But only // in the plugin - svgdisplay works fine. What's going on? (Adrian) - clipElement = dynamic_cast(tqshape->item()); + clipElement = dynamic_cast(shape->item()); } if(clipElement) { clipElement->setRenderContext(CLIPPING); - // Push coordinate system down to tqchildren. - SVGLocatableImpl *locatable = dynamic_cast(tqshape); + // Push coordinate system down to children. + SVGLocatableImpl *locatable = dynamic_cast(shape); if(locatable) locatable->updateCachedScreenCTM(clipMatrix); @@ -1514,13 +1514,13 @@ void LibartText::update(CanvasItemUpdate reason, int param1, int param2) fill = ++it1; stroke = ++it2; } - m_canvas->tqinvalidate(this, false); + m_canvas->invalidate(this, false); } else if(reason == UPDATE_TRANSFORM) { clearSVPs(); init(); - m_canvas->tqinvalidate(this, true); + m_canvas->invalidate(this, true); } else if(reason == UPDATE_ZOOM) { @@ -2085,7 +2085,7 @@ void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB // Here we're undoing the unit-converter's work because putting the // bounding box transform into the matrix here lets the gradient transform // sit at the right point in the chain to work with bounding box coordinates. - // It also produces the elliptical tqshape due to the non-uniform scaling. + // It also produces the elliptical shape due to the non-uniform scaling. SVGRectImpl *userBBox = getBBoxTarget()->getBBox(); double width = userBBox->width(); diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h index b5b9984b..1e750144 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.h +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.h @@ -138,7 +138,7 @@ namespace KSVG virtual ~LibartPainter() {} void update(SVGStylableImpl *style); - void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape); + void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape); virtual float opacity(SVGStylableImpl *style) const = 0; virtual unsigned short paintType(SVGStylableImpl *style) const = 0; @@ -195,8 +195,8 @@ namespace KSVG virtual bool fillContains(const TQPoint &p); virtual bool strokeContains(const TQPoint &p); virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0); - void draw(SVGShapeImpl *tqshape); - bool isVisible(SVGShapeImpl *tqshape); + void draw(SVGShapeImpl *shape); + bool isVisible(SVGShapeImpl *shape); virtual void init(); virtual void init(const SVGMatrixImpl *); diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 1a2e3f8d..49a95760 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -398,7 +398,7 @@ void KSVGPlugin::update() void KSVGPlugin::slotSetDescription(const TQString &desc) { ksvgd->description = desc; - emit setStatusBarText(i18n("Description: %1").tqarg(desc)); + emit setStatusBarText(i18n("Description: %1").arg(desc)); } void KSVGPlugin::slotSetTitle(const TQString &title) @@ -409,7 +409,7 @@ void KSVGPlugin::slotSetTitle(const TQString &title) void KSVGPlugin::slotGotURL(const TQString &text) { if(text.isNull() && !ksvgd->description.isEmpty()) - emit setStatusBarText(i18n("Description: %1").tqarg(ksvgd->description)); + emit setStatusBarText(i18n("Description: %1").arg(ksvgd->description)); else emit setStatusBarText(text); } diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1 index 226c04c3..b0766355 100644 --- a/ksvg/test/W3C_TESTSUITE_1.1 +++ b/ksvg/test/W3C_TESTSUITE_1.1 @@ -169,12 +169,12 @@ script-handle-03-t x script-handle-04-t x [SHAPES] -tqshapes-circle-01-t x -tqshapes-ellipse-01-t x -tqshapes-line-01-t x -tqshapes-polygon-01-t x -tqshapes-polyline-01-t x -tqshapes-rect-01-t x +shapes-circle-01-t x +shapes-ellipse-01-t x +shapes-line-01-t x +shapes-polygon-01-t x +shapes-polyline-01-t x +shapes-rect-01-t x [STRUCT] struct-cond-01-t x diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED index c83c567e..81cb6d52 100644 --- a/ksvg/test/ZVON-TEST-PASSED +++ b/ksvg/test/ZVON-TEST-PASSED @@ -112,7 +112,7 @@ path-lines-BE-01.svg: x Group 16: [Rendering] - 21.09.2003 rendering-orderGr-BE-01.svg: x -rendering-tqshape-BE-03.svg: x +rendering-shape-BE-03.svg: x rendering-text-BE-02.svg: x Group 17: [Script] - 21.09.2003 @@ -120,12 +120,12 @@ script-eventDom-BE-01.svg: x script-uiEvents-BE-02.svg: x Group 18: [Shapes] - 21.09.2003 -tqshapes-circle-BE-03.svg: x -tqshapes-ellipse-BE-02.svg: x -tqshapes-line-BE-04.svg: x -tqshapes-polygon-BE-05.svg: x -tqshapes-polyline-BE-06.svg: x -tqshapes-rect-BE-01.svg: x +shapes-circle-BE-03.svg: x +shapes-ellipse-BE-02.svg: x +shapes-line-BE-04.svg: x +shapes-polygon-BE-05.svg: x +shapes-polyline-BE-06.svg: x +shapes-rect-BE-01.svg: x Group 19: [Structure] - 21.09.2003 structure-allElem-BE-09.svg: x @@ -146,8 +146,8 @@ style-selector-BE-02.svg: o style-selector-BE-03.svg: o Group 21: [Text] - 29.09.2003 -text-tqalignment-BE-10.svg: x -text-tqalignment-BE-11.svg: x +text-alignment-BE-10.svg: x +text-alignment-BE-11.svg: x text-altGlyph-BE-07.svg: o FONTS SUPPORT MISSING text-decoration-BE-12.svg: x text-extTref-BE-18.svg: x diff --git a/ksvg/test/ecma/bbox/bbox.js b/ksvg/test/ecma/bbox/bbox.js index 88eaa592..2d692694 100644 --- a/ksvg/test/ecma/bbox/bbox.js +++ b/ksvg/test/ecma/bbox/bbox.js @@ -13,12 +13,12 @@ function bbox_loop(drawit, number) for(var i = 0; i < number; i++) { - var tqshape = doc.getElementById("test-" + i); - var bbox = tqshape.getBBox(); + var shape = doc.getElementById("test-" + i); + var bbox = shape.getBBox(); if(drawit == "true") { - draw_it(doc, bbox, tqshape, i + 1); + draw_it(doc, bbox, shape, i + 1); } else { @@ -27,13 +27,13 @@ function bbox_loop(drawit, number) } } -function do_string(tqshape, number) +function do_string(shape, number) { - var string = "\nShape " + number + "\nX = " + tqshape.x + "\nY = " + tqshape.y + "\nW = " + tqshape.width + "\nH = " + shape.height; + var string = "\nShape " + number + "\nX = " + shape.x + "\nY = " + shape.y + "\nW = " + shape.width + "\nH = " + shape.height; alert(string); } -function draw_it(doc, bbox, tqshape, number) +function draw_it(doc, bbox, shape, number) { var element = doc.createElement("rect"); element.setAttribute("x", bbox.x); @@ -45,7 +45,7 @@ function draw_it(doc, bbox, tqshape, number) element.setAttribute("stroke-width", "3"); element.setAttribute("id", "bbox" + number); - tqshape.getParentNode().appendChild(element); + shape.getParentNode().appendChild(element); } function gen_buttons(evt, number) -- cgit v1.2.3