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/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 +++--- 40 files changed, 189 insertions(+), 189 deletions(-) (limited to 'ksvg/impl') 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; -- cgit v1.2.3