summaryrefslogtreecommitdiffstats
path: root/ksvg/core
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/core')
-rw-r--r--ksvg/core/CanvasItems.cpp20
-rw-r--r--ksvg/core/CanvasItems.h8
-rw-r--r--ksvg/core/KSVGCanvas.cpp18
-rw-r--r--ksvg/core/KSVGCanvas.h4
-rw-r--r--ksvg/core/KSVGReader.cc18
5 files changed, 34 insertions, 34 deletions
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<SVGMarkerElementImpl *>(tqshape->ownerSVGElement()->getElementById(markerId));
+ SVGMarkerElementImpl *marker = dynamic_cast<SVGMarkerElementImpl *>(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<SVGShapeImpl *>(element);
+ SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
- if(tqshape)
+ if(shape)
{
- CanvasItem *item = tqshape->item();
+ CanvasItem *item = shape->item();
if(item)
{
- SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(tqshape);
+ SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(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<DOM::Element &>(tqshape).nodeName() == "svg")
+ if(reinterpret_cast<DOM::Element &>(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<SVGShapeImpl *>(element);
+ SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(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;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 01:42:09 +0000