From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- ksvg/impl/SVGContainerImpl.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'ksvg/impl/SVGContainerImpl.cc') diff --git a/ksvg/impl/SVGContainerImpl.cc b/ksvg/impl/SVGContainerImpl.cc index e4a7c0db..63487227 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 children bboxes + // just get the union of the tqchildren bboxes TQRect rect; DOM::Node node = firstChild(); for(; !node.isNull(); node = node.nextSibling()) { SVGElementImpl *elem = ownerDoc()->getElementFromHandle(node.handle()); - SVGShapeImpl *shape = dynamic_cast(elem); + SVGShapeImpl *tqshape = dynamic_cast(elem); SVGTestsImpl *tests = dynamic_cast(elem); SVGStylableImpl *style = dynamic_cast(elem); bool ok = tests ? tests->ok() : true; - if(shape && style && ok && style->getVisible() && style->getDisplay()) + if(tqshape && style && ok && style->getVisible() && style->getDisplay()) { - SVGRectImpl *current = shape->getBBox(); + SVGRectImpl *current = tqshape->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 *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(shape) - shape->update(reason, param1, param2); + SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(tqshape) + tqshape->update(reason, param1, param2); } } -void SVGContainerImpl::invalidate(KSVGCanvas *c, bool recalc) +void SVGContainerImpl::tqinvalidate(KSVGCanvas *c, bool recalc) { - SVGShapeImpl::invalidate(c, recalc); + SVGShapeImpl::tqinvalidate(c, recalc); for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(shape) - shape->invalidate(c, recalc); + SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(tqshape) + tqshape->tqinvalidate(c, recalc); } } @@ -114,9 +114,9 @@ void SVGContainerImpl::setReferenced(bool referenced) for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(shape) - shape->setReferenced(referenced); + SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(tqshape) + tqshape->setReferenced(referenced); } } @@ -126,9 +126,9 @@ void SVGContainerImpl::draw() for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling()) { - SVGShapeImpl *shape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); - if(shape) - shape->draw(); + SVGShapeImpl *tqshape = dynamic_cast(ownerDoc()->getElementFromHandle(node.handle())); + if(tqshape) + tqshape->draw(); } } -- cgit v1.2.1