summaryrefslogtreecommitdiffstats
path: root/ksvg/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/plugin')
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.cpp34
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.h8
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.cpp24
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.cpp48
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.h6
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp4
6 files changed, 62 insertions, 62 deletions
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<class VertexSource>
-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<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getStrokeColor()->uri().string()));
+ AggPaintServer *pserver = static_cast<AggPaintServer *>(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<class VertexSource>
-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<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getFillColor()->uri().string()));
+ AggPaintServer *pserver = static_cast<AggPaintServer *>(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<class VertexSource>
- 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<class VertexSource>
- 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<SVGShapeImpl *>(style);
+ SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(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<SVGStylableImpl *>(tqshape);
+ SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(shape);
if(style)
{
@@ -282,7 +282,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
if(clipPath)
{
LibartClipPath *lclip = dynamic_cast<LibartClipPath *>(clipPath);
- reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(tqshape);
+ reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(shape);
lclip->init();
@@ -296,7 +296,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
}
}
- SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(tqshape);
+ SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(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<SVGPatternElementImpl *>(tqshape) != 0)
+ if(dynamic_cast<SVGPatternElementImpl *>(shape) != 0)
{
// TODO: inherit clipping paths into tile space
}
- else if(dynamic_cast<SVGMarkerElementImpl *>(tqshape) != 0)
+ else if(dynamic_cast<SVGMarkerElementImpl *>(shape) != 0)
{
- SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(tqshape);
+ SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(shape);
if(!marker->clipShape().isEmpty())
{
@@ -329,7 +329,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
}
else
{
- SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(tqshape);
+ SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(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<LibartPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), paintUri(style)));
+ LibartPaintServer *pserver = static_cast<LibartPaintServer *>(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<SVGShapeImpl *>(element);
+ SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && tqshape && ok && !tqshape->isContainer())
+ if(element && shape && ok && !shape->isContainer())
{
- LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(tqshape->item());
+ LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(shape->item());
- if(dynamic_cast<LibartText *>(tqshape->item()))
+ if(dynamic_cast<LibartText *>(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<LibartText *>(tqshape->item());
+ clipElement = dynamic_cast<LibartText *>(shape->item());
}
if(clipElement)
{
clipElement->setRenderContext(CLIPPING);
- // Push coordinate system down to tqchildren.
- SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(tqshape);
+ // Push coordinate system down to children.
+ SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(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);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 16:03:52 +0000