diff options
Diffstat (limited to 'ksvg/plugin')
-rw-r--r-- | ksvg/plugin/backends/libart/LibartCanvas.cpp | 16 | ||||
-rw-r--r-- | ksvg/plugin/backends/libart/LibartCanvasItems.cpp | 2 | ||||
-rw-r--r-- | ksvg/plugin/ksvg_factory.cpp | 4 | ||||
-rw-r--r-- | ksvg/plugin/ksvg_factory.h | 2 | ||||
-rw-r--r-- | ksvg/plugin/ksvg_plugin.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 05f37e82..8688c28d 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -214,7 +214,7 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray tqmask = SVGMaskElementImpl::tqmaskRectangle(tqshape, screenBBox); + TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); double affine[6]; KSVGHelper::matrixToAffine(matrix, affine); @@ -330,22 +330,22 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) else { SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(tqshape); - DOM::Node tqparentNode = element->parentNode(); + DOM::Node parentNode = element->parentNode(); - if(!tqparentNode.isNull()) + if(!parentNode.isNull()) { - SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNode.handle()); + SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNode.handle()); if(tqparent) { - SVGShapeImpl *tqparentShape = dynamic_cast<SVGShapeImpl *>(tqparent); + SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(tqparent); - if(tqparentShape) + if(parentShape) { // Clip against ancestor clipping paths - ArtSVP *tqparentClippedSvp = clipSingleSVP(clippedSvp, tqparentShape); + ArtSVP *parentClippedSvp = clipSingleSVP(clippedSvp, parentShape); art_svp_free(clippedSvp); - clippedSvp = tqparentClippedSvp; + clippedSvp = parentClippedSvp; } } } diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp index 32dad452..83b62fb4 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::tqmaskRectangle(tqshape, screenBBox); + TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); if(paintType(style) == SVG_PAINTTYPE_URI) { diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp index 41392c55..0f55be71 100644 --- a/ksvg/plugin/ksvg_factory.cpp +++ b/ksvg/plugin/ksvg_factory.cpp @@ -56,7 +56,7 @@ KSVGPluginFactory::~KSVGPluginFactory() s_about = 0; } -KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *tqparentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args) +KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args) { // Get the width and height of the <embed> // TODO : <object> @@ -72,7 +72,7 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *tqparentWidget, cons height = r2.cap(3).toUInt(&dummy); } - return new KSVGPlugin(tqparentWidget, wname, tqparent, name, width, height); + return new KSVGPlugin(parentWidget, wname, tqparent, name, width, height); } KInstance *KSVGPluginFactory::instance() diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index 04b351be..c94de0a1 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/ksvg/plugin/ksvg_factory.h @@ -35,7 +35,7 @@ public: KSVGPluginFactory(TQObject *tqparent = 0, const char *name = 0); virtual ~KSVGPluginFactory(); - virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); + virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h index 6bff6144..919b0290 100644 --- a/ksvg/plugin/ksvg_plugin.h +++ b/ksvg/plugin/ksvg_plugin.h @@ -37,7 +37,7 @@ class KSVGPlugin : public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KSVGPlugin(TQWidget *tqparentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0); + KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0); virtual ~KSVGPlugin(); virtual bool openFile() { return false; } |