From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksvg/plugin/backends/agg/AggCanvasFactory.h | 2 +- ksvg/plugin/backends/libart/LibartCanvas.cpp | 18 +++++++++--------- ksvg/plugin/backends/libart/LibartCanvas.h | 2 +- ksvg/plugin/backends/libart/LibartCanvasFactory.h | 2 +- ksvg/plugin/backends/libart/LibartCanvasItems.cpp | 22 +++++++++++----------- ksvg/plugin/backends/libart/LibartCanvasItems.h | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'ksvg/plugin/backends') diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h index 92ba5b69..d075d688 100644 --- a/ksvg/plugin/backends/agg/AggCanvasFactory.h +++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h @@ -35,7 +35,7 @@ public: AggCanvasFactory(); virtual ~AggCanvasFactory(); - virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); }; }; diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 8688c28d..1d2ee30c 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -214,12 +214,12 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); double affine[6]; KSVGHelper::matrixToAffine(matrix, affine); - ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)tqmask.data()); + ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)mask.data()); } art_svp_free(imageBorder); @@ -334,11 +334,11 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) if(!parentNode.isNull()) { - SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNode.handle()); + SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNode.handle()); - if(tqparent) + if(parent) { - SVGShapeImpl *parentShape = dynamic_cast(tqparent); + SVGShapeImpl *parentShape = dynamic_cast(parent); if(parentShape) { @@ -354,7 +354,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) return clippedSvp; } -void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox) +void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox) { int x0 = screenBBox.left(); int y0 = screenBBox.top(); @@ -363,13 +363,13 @@ void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRec if(m_nrChannels == 3) { - if(tqmask.data()) - art_ksvg_rgb_svp_alpha_tqmask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)tqmask.data()); + if(mask.data()) + art_ksvg_rgb_svp_alpha_mask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)mask.data()); else art_rgb_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0); } else - art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)tqmask.data()); + art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)mask.data()); } ArtSVP *LibartCanvas::copy_svp(const ArtSVP *svp) diff --git a/ksvg/plugin/backends/libart/LibartCanvas.h b/ksvg/plugin/backends/libart/LibartCanvas.h index ff3829bd..9232789a 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.h +++ b/ksvg/plugin/backends/libart/LibartCanvas.h @@ -50,7 +50,7 @@ class LibartCanvas : public KSVGCanvas public: LibartCanvas(unsigned int width, unsigned int height); - void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox); + void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox); void drawImage(TQImage image, SVGStylableImpl *style, const SVGMatrixImpl *matrix, const KSVGPolygon& clippingPolygon); virtual T2P::BezierPath *toBezierPath(CanvasItem *item) const; diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h index 0e5e3bed..c26aa833 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h +++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h @@ -35,7 +35,7 @@ public: LibartCanvasFactory(); virtual ~LibartCanvasFactory(); - virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); }; } diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp index c9042b56..1434931b 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp @@ -252,7 +252,7 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); if(paintType(style) == SVG_PAINTTYPE_URI) { @@ -263,11 +263,11 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st pserver->setBBoxTarget(tqshape); if(!pserver->finalized()) pserver->finalizePaintServer(); - pserver->render(canvas, clippedSvp, opacity(style), tqmask, screenBBox); + pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox); } } else - canvas->drawSVP(clippedSvp, m_color, tqmask, screenBBox); + canvas->drawSVP(clippedSvp, m_color, mask, screenBBox); } art_svp_free(clippedSvp); @@ -1899,7 +1899,7 @@ void LibartGradient::reference(const TQString &) { } -void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { if(!m_stops.isEmpty()) { @@ -2022,9 +2022,9 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB art_render_svp(render, svp); art_ksvg_render_gradient_linear(render, linear, ART_FILTER_HYPER); - if(tqmask.data()) + if(mask.data()) art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, - (const art_u8 *)tqmask.data(), screenBBox.width()); + (const art_u8 *)mask.data(), screenBBox.width()); art_render_invoke(render); @@ -2032,7 +2032,7 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB } } -void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { if(!m_stops.isEmpty()) { @@ -2158,9 +2158,9 @@ void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB art_render_svp(render, svp); art_ksvg_render_gradient_radial(render, radial, ART_FILTER_HYPER); - if(tqmask.data()) + if(mask.data()) art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, - (const art_u8 *)tqmask.data(), screenBBox.width()); + (const art_u8 *)mask.data(), screenBBox.width()); art_render_invoke(render); @@ -2184,7 +2184,7 @@ void LibartPattern::reference(const TQString &href) m_pattern->reference(href); } -void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { SVGPatternElementImpl::Tile tile = m_pattern->createTile(getBBoxTarget()); @@ -2202,7 +2202,7 @@ void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArra int alpha = int(opacity * 255 + 0.5); - ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)tqmask.data()); + ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)mask.data()); } } diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h index bf18dbd0..b5b9984b 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.h +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.h @@ -73,7 +73,7 @@ namespace KSVG LibartPaintServer() : CanvasPaintServer() {} virtual ~LibartPaintServer() {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) = 0; + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) = 0; _ArtRender *createRenderer(TQRect rect, KSVGCanvas *c); }; @@ -99,7 +99,7 @@ namespace KSVG public: LibartLinearGradient(SVGLinearGradientElementImpl *linear) : LibartGradient(linear), m_linear(linear) {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGLinearGradientElementImpl *m_linear; @@ -110,7 +110,7 @@ namespace KSVG public: LibartRadialGradient(SVGRadialGradientElementImpl *radial) : LibartGradient(radial), m_radial(radial) {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGRadialGradientElementImpl *m_radial; @@ -125,7 +125,7 @@ namespace KSVG virtual void finalizePaintServer(); virtual void reference(const TQString &href); - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGPatternElementImpl *m_pattern; -- cgit v1.2.1