summaryrefslogtreecommitdiffstats
path: root/ksvg
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /ksvg
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg')
-rw-r--r--ksvg/configure.in.in2
-rw-r--r--ksvg/core/CanvasFactory.cpp2
-rw-r--r--ksvg/core/CanvasItems.cpp32
-rw-r--r--ksvg/core/CanvasItems.h8
-rw-r--r--ksvg/core/KSVGCanvas.cpp86
-rw-r--r--ksvg/core/KSVGCanvas.h7
-rw-r--r--ksvg/core/KSVGHelper.h4
-rw-r--r--ksvg/core/KSVGLoader.cpp18
-rw-r--r--ksvg/core/KSVGLoader.h3
-rw-r--r--ksvg/core/KSVGReader.cc52
-rw-r--r--ksvg/core/KSVGReader.h3
-rw-r--r--ksvg/data/SVGEcma.lut.h4
-rw-r--r--ksvg/data/SVGGlyphElementImpl.lut.h2
-rw-r--r--ksvg/data/SVGMaskElementImpl.lut.h4
-rw-r--r--ksvg/data/SVGPathSegImpl.lut.h16
-rw-r--r--ksvg/data/SVGStylableImpl.lut.h4
-rw-r--r--ksvg/dom/SVGCircleElement.h2
-rw-r--r--ksvg/dom/SVGElementInstance.cc4
-rw-r--r--ksvg/dom/SVGElementInstance.h2
-rw-r--r--ksvg/dom/SVGEllipseElement.h2
-rw-r--r--ksvg/dom/SVGLength.cc2
-rw-r--r--ksvg/dom/SVGLineElement.h2
-rw-r--r--ksvg/dom/SVGLocatable.h4
-rw-r--r--ksvg/dom/SVGMaskElement.cc8
-rw-r--r--ksvg/dom/SVGMaskElement.h4
-rw-r--r--ksvg/dom/SVGPathSeg.h8
-rw-r--r--ksvg/dom/SVGPolygonElement.h6
-rw-r--r--ksvg/dom/SVGPolylineElement.h6
-rw-r--r--ksvg/dom/SVGRectElement.h6
-rw-r--r--ksvg/dom/SVGSVGElement.h10
-rw-r--r--ksvg/dom/SVGTextElement.h6
-rw-r--r--ksvg/ecma/ksvg_ecma.cpp18
-rw-r--r--ksvg/ecma/ksvg_helper.cpp4
-rw-r--r--ksvg/ecma/ksvg_lookup.h22
-rw-r--r--ksvg/ecma/ksvg_window.cpp40
-rw-r--r--ksvg/ecma/ksvg_window.h17
-rw-r--r--ksvg/impl/LRUCache.h12
-rw-r--r--ksvg/impl/SVGAnimateElementImpl.cc2
-rw-r--r--ksvg/impl/SVGAnimateMotionElementImpl.cc2
-rw-r--r--ksvg/impl/SVGAnimateTransformElementImpl.cc4
-rw-r--r--ksvg/impl/SVGAnimatedPointsImpl.cc8
-rw-r--r--ksvg/impl/SVGAnimationElementImpl.cc38
-rw-r--r--ksvg/impl/SVGColorImpl.cc4
-rw-r--r--ksvg/impl/SVGColorProfileElementImpl.cc12
-rw-r--r--ksvg/impl/SVGColorProfileElementImpl.h2
-rw-r--r--ksvg/impl/SVGContainerImpl.cc36
-rw-r--r--ksvg/impl/SVGContainerImpl.h2
-rw-r--r--ksvg/impl/SVGDocumentImpl.cc22
-rw-r--r--ksvg/impl/SVGDocumentImpl.h5
-rw-r--r--ksvg/impl/SVGEcma.cc30
-rw-r--r--ksvg/impl/SVGElementImpl.cc14
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.cc2
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.h2
-rw-r--r--ksvg/impl/SVGEventImpl.cc106
-rw-r--r--ksvg/impl/SVGFitToViewBoxImpl.cc2
-rw-r--r--ksvg/impl/SVGGlyphElementImpl.cc4
-rw-r--r--ksvg/impl/SVGHelperImpl.cc10
-rw-r--r--ksvg/impl/SVGImageElementImpl.cc18
-rw-r--r--ksvg/impl/SVGImageElementImpl.h3
-rw-r--r--ksvg/impl/SVGLangSpaceImpl.cc12
-rw-r--r--ksvg/impl/SVGLengthImpl.cc12
-rw-r--r--ksvg/impl/SVGLocatableImpl.cc26
-rw-r--r--ksvg/impl/SVGLocatableImpl.h6
-rw-r--r--ksvg/impl/SVGMarkerElementImpl.cc12
-rw-r--r--ksvg/impl/SVGMaskElementImpl.cc156
-rw-r--r--ksvg/impl/SVGMaskElementImpl.h26
-rw-r--r--ksvg/impl/SVGPathElementImpl.cc8
-rw-r--r--ksvg/impl/SVGPathSegArcImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoCubicImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h8
-rw-r--r--ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h8
-rw-r--r--ksvg/impl/SVGPathSegImpl.cc8
-rw-r--r--ksvg/impl/SVGPathSegLinetoHorizontalImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegLinetoImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegLinetoVerticalImpl.h4
-rw-r--r--ksvg/impl/SVGPathSegMovetoImpl.h4
-rw-r--r--ksvg/impl/SVGPatternElementImpl.cc16
-rw-r--r--ksvg/impl/SVGSVGElementImpl.cc42
-rw-r--r--ksvg/impl/SVGSVGElementImpl.h2
-rw-r--r--ksvg/impl/SVGScriptElementImpl.cc2
-rw-r--r--ksvg/impl/SVGScriptElementImpl.h1
-rw-r--r--ksvg/impl/SVGShapeImpl.cc10
-rw-r--r--ksvg/impl/SVGShapeImpl.h2
-rw-r--r--ksvg/impl/SVGStylableImpl.cc210
-rw-r--r--ksvg/impl/SVGStylableImpl.h6
-rw-r--r--ksvg/impl/SVGSwitchElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.h2
-rw-r--r--ksvg/impl/SVGTextElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.h2
-rw-r--r--ksvg/impl/SVGTimeScheduler.cc8
-rw-r--r--ksvg/impl/SVGTimeScheduler.h3
-rw-r--r--ksvg/impl/SVGTransformableImpl.cc16
-rw-r--r--ksvg/impl/SVGURIReferenceImpl.cc10
-rw-r--r--ksvg/impl/SVGUnitConverter.h4
-rw-r--r--ksvg/impl/SVGUseElementImpl.cc52
-rw-r--r--ksvg/impl/SVGUseElementImpl.h2
-rw-r--r--ksvg/impl/SVGWindowImpl.cc4
-rw-r--r--ksvg/impl/generateddata.cpp2
-rw-r--r--ksvg/impl/libs/art_support/art_misc.c110
-rw-r--r--ksvg/impl/libs/art_support/art_misc.h4
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.c58
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.h6
-rw-r--r--ksvg/impl/libs/libtext2path/libtext2path.spec4
-rw-r--r--ksvg/impl/libs/libtext2path/src/Cache.h2
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp36
-rw-r--r--ksvg/impl/libs/libtext2path/src/Font.cpp6
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.cpp9
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.h6
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.cpp12
-rw-r--r--ksvg/impl/libs/libtext2path/src/QtUnicode.h4
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp2
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c14
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h4
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c2
-rw-r--r--ksvg/impl/svgpathparser.cc2
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasFactory.h2
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.cpp36
-rw-r--r--ksvg/plugin/backends/agg/AggCanvasItems.h10
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.cpp50
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvas.h2
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasFactory.h2
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.cpp142
-rw-r--r--ksvg/plugin/backends/libart/LibartCanvasItems.h20
-rw-r--r--ksvg/plugin/ksvg_factory.cpp10
-rw-r--r--ksvg/plugin/ksvg_factory.h8
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp14
-rw-r--r--ksvg/plugin/ksvg_plugin.h3
-rw-r--r--ksvg/plugin/ksvg_widget.cpp28
-rw-r--r--ksvg/plugin/ksvg_widget.h5
-rw-r--r--ksvg/plugin/svgcreator.cpp4
-rw-r--r--ksvg/plugin/svgcreator.h1
-rwxr-xr-xksvg/scripts/check_hashtablesize.pl12
-rwxr-xr-xksvg/scripts/generate.pl2
-rw-r--r--ksvg/test/W3C_TESTSUITE_1.126
-rw-r--r--ksvg/test/ZVON-TEST-PASSED36
-rw-r--r--ksvg/test/ecma/bbox/bbox.js14
-rw-r--r--ksvg/test/external/SVGTestWidget.cc20
-rw-r--r--ksvg/test/external/SVGTestWidget.h3
-rw-r--r--ksvg/test/external/printnodetest.h3
142 files changed, 1113 insertions, 1099 deletions
diff --git a/ksvg/configure.in.in b/ksvg/configure.in.in
index 83109d48..5643818e 100644
--- a/ksvg/configure.in.in
+++ b/ksvg/configure.in.in
@@ -202,5 +202,5 @@ fi
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-AC_CHECK_HEADERS(sstream)
+KDE_CHECK_HEADERS(sstream)
AC_LANG_RESTORE
diff --git a/ksvg/core/CanvasFactory.cpp b/ksvg/core/CanvasFactory.cpp
index e03bf9ea..d1278334 100644
--- a/ksvg/core/CanvasFactory.cpp
+++ b/ksvg/core/CanvasFactory.cpp
@@ -149,7 +149,7 @@ TQString CanvasFactory::internalNameFor(const TQString &name)
++it;
}
- return TQString::null;
+ return TQString();
}
void CanvasFactory::deleteCanvas(KSVGCanvas *canvas)
diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp
index 333f4608..b5b5681f 100644
--- a/ksvg/core/CanvasItems.cpp
+++ b/ksvg/core/CanvasItems.cpp
@@ -107,7 +107,7 @@ void CanvasText::handleTSpan(KSVGCanvas *canvas, const SVGMatrixImpl *screenCTM,
TQString text = tspan->text();
if(!text.isEmpty())
{
- T2P::GlyphLayoutParams *params = tspan->layoutParams();
+ T2P::GlyphLayoutParams *params = tspan->tqlayoutParams();
if(bMultipleX || bMultipleY)
{
@@ -265,7 +265,7 @@ KSVGTextChunk *CanvasText::createTextChunk(KSVGCanvas *canvas, const SVGMatrixIm
curx = usex;
cury = usey;
- T2P::GlyphLayoutParams *params = tpath->layoutParams();
+ T2P::GlyphLayoutParams *params = tpath->tqlayoutParams();
if(!params->tb())
curx += endx;
@@ -290,7 +290,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
TQMemArray<double> _cury(1);
_cury[0] = double(cury);
- T2P::GlyphLayoutParams *params = m_text->layoutParams();
+ T2P::GlyphLayoutParams *params = m_text->tqlayoutParams();
SVGTextPositioningElementImpl *tp = textChunk->getTextElement(0);
SVGTextContentElementImpl *tc = textChunk->getTextContentElement(0);
SVGTextContentElementImpl *tc0 = tc;
@@ -373,14 +373,14 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
}
{
- T2P::GlyphLayoutParams *params = tc->layoutParams();
+ T2P::GlyphLayoutParams *params = tc->tqlayoutParams();
params->setLetterSpacing(params->letterSpacing() + addLetterSpacing);
if(bpath)
{
params->setTextPathStartOffset(pathAdvance);
if(tp && tp->dy()->baseVal()->numberOfItems() > 0)
pathDy += tp->dy()->baseVal()->getItem(0)->value();
- TQString shift = TQString("%1%%").arg((pathDy / font->fontParams()->size()) * -100.0);
+ TQString shift = TQString("%1%%").tqarg((pathDy / font->fontParams()->size()) * -100.0);
params->setBaselineShift(shift.latin1());
}
@@ -429,7 +429,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
return;
// Draw 'text-decoration'
- // TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
+ // TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
// Underline and overline have to be drawn before the glyphs are rendered
if(tc0->getTextDecoration() & UNDERLINE && !params->tb())
addTextDecoration(tc0, (curx - anchor), (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
@@ -444,7 +444,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
SVGTextContentElementImpl *style = textChunk->getTextContentElement(j);
// Draw 'text-decoration'
- // TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
+ // TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
// Underline and overline have to be drawn before the glyphs are rendered
if(style->getAttribute("text-decoration") == "underline" && !params->tb())
addTextDecoration(style, glyph->bboxX() - anchor, (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
@@ -484,26 +484,26 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
// #####
-void MarkerHelper::doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId)
+void MarkerHelper::doMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle, const TQString &markerId)
{
- SVGMarkerElementImpl *marker = dynamic_cast<SVGMarkerElementImpl *>(shape->ownerSVGElement()->getElementById(markerId));
+ SVGMarkerElementImpl *marker = dynamic_cast<SVGMarkerElementImpl *>(tqshape->ownerSVGElement()->getElementById(markerId));
if(marker)
- marker->draw(shape, x, y, style->getStrokeWidth()->baseVal()->value(), angle);
+ marker->draw(tqshape, x, y, style->getStrokeWidth()->baseVal()->value(), angle);
}
-void MarkerHelper::doStartMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doStartMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
{
- doMarker(shape, style, x, y, angle, style->getStartMarker());
+ doMarker(tqshape, style, x, y, angle, style->getStartMarker());
}
-void MarkerHelper::doMidMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doMidMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
{
- doMarker(shape, style, x, y, angle, style->getMidMarker());
+ doMarker(tqshape, style, x, y, angle, style->getMidMarker());
}
-void MarkerHelper::doEndMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle)
+void MarkerHelper::doEndMarker(SVGShapeImpl *tqshape, SVGStylableImpl *style, double x, double y, double angle)
{
- doMarker(shape, style, x, y, angle, style->getEndMarker());
+ doMarker(tqshape, style, x, y, angle, style->getEndMarker());
}
// vim:ts=4:noet
diff --git a/ksvg/core/CanvasItems.h b/ksvg/core/CanvasItems.h
index 9f5eed43..45818712 100644
--- a/ksvg/core/CanvasItems.h
+++ b/ksvg/core/CanvasItems.h
@@ -80,12 +80,12 @@ protected:
class MarkerHelper
{
protected:
- 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);
+ 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);
private:
- void doMarker(SVGShapeImpl *shape, SVGStylableImpl *style, double x, double y, double angle, const TQString &marker);
+ void doMarker(SVGShapeImpl *tqshape, 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 1f504c02..d20264bf 100644
--- a/ksvg/core/KSVGCanvas.cpp
+++ b/ksvg/core/KSVGCanvas.cpp
@@ -181,7 +181,7 @@ void KSVGCanvas::resize(unsigned int w, unsigned int h)
{
for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
{
- if(!drawables.contains(*it))
+ if(!drawables.tqcontains(*it))
drawables.append(*it);
}
}
@@ -203,7 +203,7 @@ void KSVGCanvas::resize(unsigned int w, unsigned int h)
{
for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
{
- if(!drawables.contains(*it))
+ if(!drawables.tqcontains(*it))
drawables.append(*it);
}
}
@@ -254,7 +254,7 @@ void KSVGCanvas::clear(const TQRect &r)
if(!r2.isEmpty() && m_buffer)
{
for(int i = 0; i < r2.height(); i++)
- memset(m_buffer + int(r2.x() * m_nrChannels) + int((r2.y() + i) * (m_width * m_nrChannels)), qRgba(250, 250, 250, 250), r2.width() * m_nrChannels);
+ memset(m_buffer + int(r2.x() * m_nrChannels) + int((r2.y() + i) * (m_width * m_nrChannels)), tqRgba(250, 250, 250, 250), r2.width() * m_nrChannels);
}
}
@@ -284,13 +284,13 @@ void KSVGCanvas::fill()
}
else
{
- Q_UINT32 *p = reinterpret_cast<Q_UINT32 *>(m_buffer);
- unsigned char a = qAlpha(m_backgroundColor.rgb());
+ TQ_UINT32 *p = reinterpret_cast<TQ_UINT32 *>(m_buffer);
+ unsigned char a = tqAlpha(m_backgroundColor.rgb());
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- Q_UINT32 rgba = (a << 24) | (b << 16) | (g << 8) | r;
+ TQ_UINT32 rgba = (a << 24) | (b << 16) | (g << 8) | r;
#else
- Q_UINT32 rgba = (r << 24) | (g << 16) | (b << 8) | a;
+ TQ_UINT32 rgba = (r << 24) | (g << 16) | (b << 8) | a;
#endif
for(int i = 0; i < m_width * m_height; i++)
*p++ = rgba;
@@ -302,17 +302,17 @@ void KSVGCanvas::fill()
void KSVGCanvas::clipToBuffer(int &x0, int &y0, int &x1, int &y1) const
{
// clamp to viewport
- x0 = QMAX(x0, 0);
- x0 = QMIN(x0, int(m_width - 1));
+ x0 = TQMAX(x0, 0);
+ x0 = TQMIN(x0, int(m_width - 1));
- y0 = QMAX(y0, 0);
- y0 = QMIN(y0, int(m_height - 1));
+ y0 = TQMAX(y0, 0);
+ y0 = TQMIN(y0, int(m_height - 1));
- x1 = QMAX(x1, 0);
- x1 = QMIN(x1, int(m_width - 1));
+ x1 = TQMAX(x1, 0);
+ x1 = TQMIN(x1, int(m_width - 1));
- y1 = QMAX(y1, 0);
- y1 = QMIN(y1, int(m_height - 1));
+ y1 = TQMAX(y1, 0);
+ y1 = TQMIN(y1, int(m_height - 1));
}
T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) const
@@ -324,11 +324,11 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
EFontStyle fontStyle = style->getFontStyle();
TQString fontWeight = style->getFontWeight();
- if(fontWeight.contains("bold"))
+ if(fontWeight.tqcontains("bold"))
weight |= FC_WEIGHT_DEMIBOLD;
- if(fontWeight.contains("bolder"))
+ if(fontWeight.tqcontains("bolder"))
weight |= FC_WEIGHT_BOLD;
- if(fontWeight.contains("lighter"))
+ if(fontWeight.tqcontains("lighter"))
weight |= FC_WEIGHT_LIGHT;
bool ok = true;
@@ -341,7 +341,7 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
slant |= FC_SLANT_ROMAN;
else if(fontStyle == ITALIC)
slant |= FC_SLANT_ITALIC;
- else if(fontStyle == OBLIQUE)
+ else if(fontStyle == OBLITQUE)
slant |= FC_SLANT_OBLIQUE;
// Calc font names
@@ -362,9 +362,9 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
return fontVisualParams;
}
-void KSVGCanvas::invalidate(CanvasItem *item, bool recalc)
+void KSVGCanvas::tqinvalidate(CanvasItem *item, bool recalc)
{
- if(m_chunksByItem.find(item) != m_chunksByItem.end())
+ if(m_chunksByItem.tqfind(item) != m_chunksByItem.end())
{
if(recalc)
{
@@ -376,7 +376,7 @@ void KSVGCanvas::invalidate(CanvasItem *item, bool recalc)
for(it.toFirst(); it.current(); ++it)
{
(*it)->setDirty();
- if(!m_dirtyChunks.contains(*it))
+ if(!m_dirtyChunks.tqcontains(*it))
m_dirtyChunks.append(*it);
}
}
@@ -395,7 +395,7 @@ void KSVGCanvas::insert(CanvasItem *item, int z)
bool visible = item->isVisible();
if(visible)
- invalidate(item, false);
+ tqinvalidate(item, false);
if(m_immediateUpdate)
{
@@ -429,7 +429,7 @@ void KSVGCanvas::removeFromChunks(CanvasItem *item)
for(it.toFirst(); it.current(); ++it)
{
(*it)->remove(item);
- if(!m_dirtyChunks.contains(*it))
+ if(!m_dirtyChunks.tqcontains(*it))
m_dirtyChunks.append(*it);
}
m_chunksByItem.remove(item);
@@ -462,15 +462,15 @@ void KSVGCanvas::addToChunks(CanvasItem *item)
unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element, unsigned int z)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
- if(shape)
+ if(tqshape)
{
- CanvasItem *item = shape->item();
+ CanvasItem *item = tqshape->item();
if(item)
{
- SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(shape);
+ SVGImageElementImpl *image = dynamic_cast<SVGImageElementImpl *>(tqshape);
if(image && image->svgImageRootElement())
{
@@ -481,7 +481,7 @@ unsigned int KSVGCanvas::setElementItemZIndexRecursive(SVGElementImpl *element,
else
{
item->setZIndex(z);
- invalidate(item, false);
+ tqinvalidate(item, false);
z++;
}
}
@@ -540,7 +540,7 @@ void KSVGCanvas::update(const TQPoint &panPoint, bool erase)
{
for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
{
- if(!drawables.contains(*it))
+ if(!drawables.tqcontains(*it))
drawables.append(*it);
}
}
@@ -607,7 +607,7 @@ void KSVGCanvas::update(float zoomFactor)
{
for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
{
- if(!drawables.contains(*it))
+ if(!drawables.tqcontains(*it))
drawables.append(*it);
}
}
@@ -666,7 +666,7 @@ void KSVGCanvas::update()
for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
{
// kdDebug(26005) << k_funcinfo << " Checking: " << *it << endl;
- if(!drawables.contains(*it))
+ if(!drawables.tqcontains(*it))
{
// kdDebug(26005) << k_funcinfo << " Yes, appending to update list!" << endl;
drawables.append(*it);
@@ -724,7 +724,7 @@ CanvasItemList KSVGCanvas::collisions(const TQPoint &p, bool exact) const
{
for(CanvasItemList::Iterator it = list.begin(); it != list.end(); ++it)
{
- if((*it)->fillContains(p) || (*it)->strokeContains(p) || (*it)->bbox().contains(p))
+ if((*it)->fillContains(p) || (*it)->strokeContains(p) || (*it)->bbox().tqcontains(p))
result.append(*it);
}
@@ -740,20 +740,20 @@ void KSVGCanvas::blit(const TQRect &rect, bool direct)
{
// clamp to viewport
int x0 = rect.x();
- x0 = QMAX(x0, 0);
- x0 = QMIN(x0, int(m_width - 1));
+ x0 = TQMAX(x0, 0);
+ x0 = TQMIN(x0, int(m_width - 1));
int y0 = rect.y();
- y0 = QMAX(y0, 0);
- y0 = QMIN(y0, int(m_height - 1));
+ y0 = TQMAX(y0, 0);
+ y0 = TQMIN(y0, int(m_height - 1));
int x1 = rect.x() + rect.width() + 1;
- x1 = QMAX(x1, 0);
- x1 = QMIN(x1, int(m_width));
+ x1 = TQMAX(x1, 0);
+ x1 = TQMIN(x1, int(m_width));
int y1 = rect.y() + rect.height() + 1;
- y1 = QMAX(y1, 0);
- y1 = QMIN(y1, int(m_height));
+ y1 = TQMAX(y1, 0);
+ y1 = TQMIN(y1, int(m_height));
xlib_draw_rgb_image(direct ? m_directWindow->handle() : m_drawWindow->handle(), m_gc, x0, y0, x1 - x0, y1 - y0, XLIB_RGB_DITHER_NONE, m_buffer + (m_width * y0 + x0) * m_nrChannels, m_width * m_nrChannels);
}
@@ -766,7 +766,7 @@ void KSVGCanvas::blit()
void KSVGCanvas::ChunkManager::addChunk(CanvasChunk *chunk)
{
- TQString key = TQString("%1 %2").arg(chunk->x()).arg(chunk->y());
+ TQString key = TQString("%1 %2").tqarg(chunk->x()).tqarg(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").arg(x).arg(y);
+ TQString key = TQString("%1 %2").tqarg(x).tqarg(y);
return m_chunks[key];
}
diff --git a/ksvg/core/KSVGCanvas.h b/ksvg/core/KSVGCanvas.h
index aa41e6c2..367d17d4 100644
--- a/ksvg/core/KSVGCanvas.h
+++ b/ksvg/core/KSVGCanvas.h
@@ -56,9 +56,10 @@ class CanvasClipPath;
class CanvasPaintServer;
// Must be a TQObject to be able to be loaded by KLibLoader...
-class KSVGCanvas : public QObject
+class KSVGCanvas : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KSVGCanvas(unsigned int width, unsigned int height);
virtual ~KSVGCanvas();
@@ -74,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 invalidate(CanvasItem *item, bool recalc = true);
+ void tqinvalidate(CanvasItem *item, bool recalc = true);
CanvasItemList collisions(const TQPoint &p, bool exact = false) const;
void setBackgroundColor(const TQColor &c) { m_backgroundColor = c; }
@@ -125,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 children, starting with z, and
+ // Assign z indices to the element and its tqchildren, 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/KSVGHelper.h b/ksvg/core/KSVGHelper.h
index 27c8b88f..fe68b77e 100644
--- a/ksvg/core/KSVGHelper.h
+++ b/ksvg/core/KSVGHelper.h
@@ -73,12 +73,12 @@ public:
static unsigned int toArtColor(const TQColor &color)
{
- return (qRed(color.rgb()) << 24) | (qGreen(color.rgb()) << 16) | ( qBlue(color.rgb()) << 8) | (qAlpha(color.rgb()));
+ return (tqRed(color.rgb()) << 24) | (tqGreen(color.rgb()) << 16) | ( tqBlue(color.rgb()) << 8) | (tqAlpha(color.rgb()));
}
static unsigned int toArtColor(const TQColor &color, short opacity)
{
- return (qRed(color.rgb()) << 24) | (qGreen(color.rgb()) << 16) | ( qBlue(color.rgb()) << 8) | (opacity);
+ return (tqRed(color.rgb()) << 24) | (tqGreen(color.rgb()) << 16) | ( tqBlue(color.rgb()) << 8) | (opacity);
}
static int linearRGBFromsRGB(int sRGB8bit) { return m_linearRGBFromsRGB[sRGB8bit]; }
diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index 63c3efc8..9e8c5c54 100644
--- a/ksvg/core/KSVGLoader.cpp
+++ b/ksvg/core/KSVGLoader.cpp
@@ -60,7 +60,7 @@ TQString KSVGLoader::loadXML(::KURL url)
return TQString(contents);
}
- return TQString::null;
+ return TQString();
}
void KSVGLoader::getSVGContent(::KURL url)
@@ -125,17 +125,17 @@ void KSVGLoader::slotResult(KIO::Job *job)
if(m_job->error() == 0)
{
TQString check = static_cast<KIO::TransferJob *>(job)->url().prettyURL();
- if(check.contains(".svgz") || check.contains(".svg.gz"))
+ if(check.tqcontains(".svgz") || check.tqcontains(".svg.gz"))
{
// decode the gzipped svg and emit it
- TQIODevice *dev = KFilterDev::device(new TQBuffer(m_data), "application/x-gzip");
+ TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip");
dev->open(IO_ReadOnly);
emit gotResult(dev);
}
else
{
m_job = 0;
- emit gotResult(new TQBuffer(m_data));
+ emit gotResult(TQT_TQIODEVICE(new TQBuffer(m_data)));
m_data.resize(0);
}
}
@@ -162,7 +162,7 @@ void KSVGLoader::slotResult(KIO::Job *job)
if(buffer.open(IO_ReadOnly))
{
- const char *imageFormat = TQImageIO::imageFormat(&buffer);
+ const char *imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer));
if(imageFormat != 0)
{
@@ -199,7 +199,7 @@ TQString KSVGLoader::getUrl(::KURL url, bool local)
if(local || (!url.prettyURL().isEmpty()) && ((url.protocol() == "http") || (url.protocol() == "https")))
return loadXML(url);
- return TQString::null;
+ return TQString();
}
void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mimeType, KJS::ExecState *exec, KJS::Object &callBackFunction, KJS::Object &status)
@@ -215,7 +215,7 @@ void KSVGLoader::postUrl(::KURL url, const TQByteArray &data, const TQString &mi
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
}
-class CharacterDataSearcher : public QXmlDefaultHandler
+class CharacterDataSearcher : public TQXmlDefaultHandler
{
public:
CharacterDataSearcher(const TQString &id) : m_id(id) { }
@@ -289,7 +289,7 @@ TQString KSVGLoader::getCharacterData(::KURL url, const TQString &id)
-class SVGFragmentSearcher : public QXmlDefaultHandler
+class SVGFragmentSearcher : public TQXmlDefaultHandler
{
public:
SVGFragmentSearcher(SVGDocumentImpl *doc, const TQString &id, ::KURL url) : m_id(id), m_url(url), m_doc(doc) { }
@@ -348,7 +348,7 @@ public:
// Convert the id to its mangled version.
TQString id = "@fragment@" + m_url.prettyURL() + "@" + value;
- if(m_idMap.contains(id))
+ if(m_idMap.tqcontains(id))
{
// This is a local reference to an element within the fragment.
// Just convert the href.
diff --git a/ksvg/core/KSVGLoader.h b/ksvg/core/KSVGLoader.h
index 443d0fb7..28ebda01 100644
--- a/ksvg/core/KSVGLoader.h
+++ b/ksvg/core/KSVGLoader.h
@@ -52,9 +52,10 @@ typedef struct
class SVGImageElementImpl;
class SVGElementImpl;
class SVGDocumentImpl;
-class KSVGLoader : public QObject
+class KSVGLoader : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
KSVGLoader();
~KSVGLoader();
diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc
index e479b9a1..690069ba 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cc
@@ -84,7 +84,7 @@ private:
TQString m_SVGFragmentId;
};
-class InputHandler : public QXmlDefaultHandler
+class InputHandler : public TQXmlDefaultHandler
{
public:
virtual bool startDocument();
@@ -146,13 +146,13 @@ SVGSVGElementImpl *Helper::nextSVGElement(SVGElementImpl *elem)
SVGSVGElementImpl *Helper::nextSVGElement(DOM::Node elem)
{
DOM::Node foundSVG;
- DOM::Node shape = elem.parentNode();
+ DOM::Node tqshape = elem.parentNode();
- for(; !shape.isNull(); shape = shape.parentNode())
+ for(; !tqshape.isNull(); tqshape = tqshape.parentNode())
{
- if(reinterpret_cast<DOM::Element &>(shape).nodeName() == "svg")
+ if(reinterpret_cast<DOM::Element &>(tqshape).nodeName() == "svg")
{
- foundSVG = shape;
+ foundSVG = tqshape;
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").arg(width->value()).arg(height->value());
+ TQString viewbox = TQString("0 0 %1 %2").tqarg(width->value()).tqarg(height->value());
//kdDebug(26001) << "VIEWBOX : " << viewbox.latin1() << endl;
svg->setAttribute("viewBox", viewbox);
width->deref();
@@ -289,7 +289,7 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
Helper::self()->doc()->appendChild(*newElement);
// Special logics:
- if(qName == "switch" || qName == "pattern" || qName == "mask")
+ if(qName == "switch" || qName == "pattern" || qName == "tqmask")
m_noRendering = true;
}
@@ -300,13 +300,13 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
if(svg && svg->ownerSVGElement() == 0)
{
- SVGImageElementImpl *parentImage = Helper::self()->doc()->parentImage();
+ SVGImageElementImpl *tqparentImage = Helper::self()->doc()->tqparentImage();
- if(parentImage)
+ if(tqparentImage)
{
// We're being displayed in a document via an 'image' element. Set
// us up to fit into it's rectangle.
- parentImage->setupSVGElement(svg);
+ tqparentImage->setupSVGElement(svg);
}
}
@@ -316,25 +316,25 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
{
// Set up the cached screenCTM
SVGLocatableImpl *locatableParent = 0;
- DOM::Node parentNode = newElement->parentNode();
+ DOM::Node tqparentNode = newElement->parentNode();
- if(!parentNode.isNull())
+ if(!tqparentNode.isNull())
{
- SVGElementImpl *parent = Helper::self()->doc()->getElementFromHandle(parentNode.handle());
+ SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(tqparentNode.handle());
- if(parent)
- locatableParent = dynamic_cast<SVGLocatableImpl *>(parent);
+ if(tqparent)
+ locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
}
- SVGMatrixImpl *parentMatrix = 0;
+ SVGMatrixImpl *tqparentMatrix = 0;
if(locatableParent)
- parentMatrix = locatableParent->getScreenCTM();
+ tqparentMatrix = locatableParent->getScreenCTM();
else
- parentMatrix = SVGSVGElementImpl::createSVGMatrix();
+ tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
- locatable->updateCachedScreenCTM(parentMatrix);
- parentMatrix->deref();
+ locatable->updateCachedScreenCTM(tqparentMatrix);
+ tqparentMatrix->deref();
}
m_currentNode = newElement;
@@ -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 *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
@@ -386,18 +386,18 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString
if(haveCanvas && (tests ? tests->ok() : true))
{
- if((shape && !shape->isContainer()) || (!shape && element))
+ if((tqshape && !tqshape->isContainer()) || (!tqshape && element))
element->createItem();
}
}
// Special logics:
- if(qName == "switch" || qName == "pattern" || qName == "mask")
+ if(qName == "switch" || qName == "pattern" || qName == "tqmask")
{
m_noRendering = false;
bool ok = tests ? tests->ok() : true;
- if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (shape && shape->directRender()))
+ if(haveCanvas && element && style && ok && style->getDisplay() && style->getVisible() && qName == "pattern" || (tqshape && tqshape->directRender()))
element->createItem();
}
@@ -426,10 +426,10 @@ bool InputHandler::fatalError(const TQXmlParseException &e)
if(Helper::self()->hasError())
{
error = Helper::self()->errorDescription();
- Helper::self()->setErrorDescription(TQString::null);
+ Helper::self()->setErrorDescription(TQString());
}
else
- error = TQString("[%1:%2]: FATAL ERROR: %3").arg(e.lineNumber()).arg(e.columnNumber()).arg(e.message());
+ error = TQString("[%1:%2]: FATAL ERROR: %3").tqarg(e.lineNumber()).tqarg(e.columnNumber()).tqarg(e.message());
kdDebug(26001) << "InputHandler::fatalError, " << error << endl;
diff --git a/ksvg/core/KSVGReader.h b/ksvg/core/KSVGReader.h
index 49259d7d..136b145f 100644
--- a/ksvg/core/KSVGReader.h
+++ b/ksvg/core/KSVGReader.h
@@ -28,9 +28,10 @@ namespace KSVG
{
class SVGDocumentImpl;
-class KSVGReader : public QObject
+class KSVGReader : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
struct ParsingArgs
{
diff --git a/ksvg/data/SVGEcma.lut.h b/ksvg/data/SVGEcma.lut.h
index 54909bab..be6a221c 100644
--- a/ksvg/data/SVGEcma.lut.h
+++ b/ksvg/data/SVGEcma.lut.h
@@ -13,7 +13,7 @@ static const char SVGDOMNodeBridge__s_hashTableStrings[] = {
"attributes\0"
"childNodes\0"
"firstChild\0"
- "parentNode\0"
+ "tqparentNode\0"
"lastChild\0"
"localName\0"
"nodeValue\0"
@@ -84,7 +84,7 @@ static const char SVGDOMNodeBridgeProto__s_hashTableStrings[] = {
"cloneNode\0"
"getPrefix\0"
"normalize\0"
- "contains\0"
+ "tqcontains\0"
};
diff --git a/ksvg/data/SVGGlyphElementImpl.lut.h b/ksvg/data/SVGGlyphElementImpl.lut.h
index b4f54c4e..621bb98d 100644
--- a/ksvg/data/SVGGlyphElementImpl.lut.h
+++ b/ksvg/data/SVGGlyphElementImpl.lut.h
@@ -13,7 +13,7 @@ static const char SVGGlyphElementImpl__s_hashTableStrings[] = {
"orientation\0"
"glyph-name\0"
"vert-adv-y\0"
- "unicode\0"
+ "tqunicode\0"
"lang\0"
"d\0"
};
diff --git a/ksvg/data/SVGMaskElementImpl.lut.h b/ksvg/data/SVGMaskElementImpl.lut.h
index bcc32c39..6d325e81 100644
--- a/ksvg/data/SVGMaskElementImpl.lut.h
+++ b/ksvg/data/SVGMaskElementImpl.lut.h
@@ -6,8 +6,8 @@ namespace KSVG {
static const char SVGMaskElementImpl__s_hashTableStrings[] = {
"\0"
- "maskContentUnits\0"
- "maskUnits\0"
+ "tqmaskContentUnits\0"
+ "tqmaskUnits\0"
"height\0"
"width\0"
"x\0"
diff --git a/ksvg/data/SVGPathSegImpl.lut.h b/ksvg/data/SVGPathSegImpl.lut.h
index 94436a77..1ef4cf85 100644
--- a/ksvg/data/SVGPathSegImpl.lut.h
+++ b/ksvg/data/SVGPathSegImpl.lut.h
@@ -28,12 +28,12 @@ namespace KSVG {
static const char SVGPathSegImplConstructor__s_hashTableStrings[] = {
"\0"
- "PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS\0"
- "PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL\0"
+ "PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS\0"
+ "PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL\0"
"PATHSEG_CURVETO_CUBIC_SMOOTH_ABS\0"
"PATHSEG_CURVETO_CUBIC_SMOOTH_REL\0"
- "PATHSEG_CURVETO_QUADRATIC_ABS\0"
- "PATHSEG_CURVETO_QUADRATIC_REL\0"
+ "PATHSEG_CURVETO_TQUADRATIC_ABS\0"
+ "PATHSEG_CURVETO_TQUADRATIC_REL\0"
"PATHSEG_LINETO_HORIZONTAL_ABS\0"
"PATHSEG_LINETO_HORIZONTAL_REL\0"
"PATHSEG_LINETO_VERTICAL_ABS\0"
@@ -56,7 +56,7 @@ static const struct HashEntry SVGPathSegImplConstructor__s_hashTableEntries[] =
{ 317, KSVG::PATHSEG_CURVETO_CUBIC_ABS, DontDelete|ReadOnly, 0, -1 },
{ 0, 0, 0, 0, -1 },
{ 0, 0, 0, 0, -1 },
- { 171, KSVG::PATHSEG_CURVETO_QUADRATIC_REL, DontDelete|ReadOnly, 0, 27 },
+ { 171, KSVG::PATHSEG_CURVETO_TQUADRATIC_REL, DontDelete|ReadOnly, 0, 27 },
{ 479, KSVG::PATHSEG_ARC_REL, DontDelete|ReadOnly, 0, -1 },
{ 495, KSVG::PATHSEG_UNKNOWN, DontDelete|ReadOnly, 0, 23 },
{ 369, KSVG::PATHSEG_LINETO_ABS, DontDelete|ReadOnly, 0, -1 },
@@ -73,14 +73,14 @@ static const struct HashEntry SVGPathSegImplConstructor__s_hashTableEntries[] =
{ 75, KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 },
{ 231, KSVG::PATHSEG_LINETO_HORIZONTAL_REL, DontDelete|ReadOnly, 0, -1 },
{ 388, KSVG::PATHSEG_LINETO_REL, DontDelete|ReadOnly, 0, -1 },
- { 38, KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, DontDelete|ReadOnly, 0, -1 },
+ { 38, KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL, DontDelete|ReadOnly, 0, -1 },
{ 407, KSVG::PATHSEG_MOVETO_ABS, DontDelete|ReadOnly, 0, -1 },
{ 445, KSVG::PATHSEG_CLOSEPATH, DontDelete|ReadOnly, 0, 25 },
- { 141, KSVG::PATHSEG_CURVETO_QUADRATIC_ABS, DontDelete|ReadOnly, 0, 26 },
+ { 141, KSVG::PATHSEG_CURVETO_TQUADRATIC_ABS, DontDelete|ReadOnly, 0, 26 },
{ 201, KSVG::PATHSEG_LINETO_HORIZONTAL_ABS, DontDelete|ReadOnly, 0, -1 },
{ 261, KSVG::PATHSEG_LINETO_VERTICAL_ABS, DontDelete|ReadOnly, 0, -1 },
{ 289, KSVG::PATHSEG_LINETO_VERTICAL_REL, DontDelete|ReadOnly, 0, -1 },
- { 1, KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 }
+ { 1, KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS, DontDelete|ReadOnly, 0, -1 }
};
const struct HashTable SVGPathSegImplConstructor::s_hashTable = { 2, 29, SVGPathSegImplConstructor__s_hashTableEntries, 23, SVGPathSegImplConstructor__s_hashTableStrings};
diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h
index f6e0570f..5e4f6520 100644
--- a/ksvg/data/SVGStylableImpl.lut.h
+++ b/ksvg/data/SVGStylableImpl.lut.h
@@ -23,7 +23,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = {
"fill-opacity\0"
"marker-start\0"
"stroke-width\0"
- "unicode-bidi\0"
+ "tqunicode-bidi\0"
"word-spacing\0"
"writing-mode\0"
"font-family\0"
@@ -47,7 +47,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = {
"stroke\0"
"clip\0"
"fill\0"
- "mask\0"
+ "tqmask\0"
};
diff --git a/ksvg/dom/SVGCircleElement.h b/ksvg/dom/SVGCircleElement.h
index 65406a1c..d621ce8b 100644
--- a/ksvg/dom/SVGCircleElement.h
+++ b/ksvg/dom/SVGCircleElement.h
@@ -51,7 +51,7 @@ class SVGAnimatedLength;
* point and radius.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#CircleElement">9.3 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.3 The
* 'circle' element</a>.
*/
class SVGCircleElement : public SVGElement,
diff --git a/ksvg/dom/SVGElementInstance.cc b/ksvg/dom/SVGElementInstance.cc
index 9bc027c0..95b24964 100644
--- a/ksvg/dom/SVGElementInstance.cc
+++ b/ksvg/dom/SVGElementInstance.cc
@@ -78,10 +78,10 @@ SVGUseElement SVGElementInstance::correspondingUseElement() const
return SVGUseElement(impl->correspondingUseElement());
}
-SVGElementInstance SVGElementInstance::parentNode() const
+SVGElementInstance SVGElementInstance::tqparentNode() const
{
if(!impl) return SVGElementInstance(0);
- return SVGElementInstance(impl->parentNode());
+ return SVGElementInstance(impl->tqparentNode());
}
SVGElementInstanceList SVGElementInstance::childNodes() const
diff --git a/ksvg/dom/SVGElementInstance.h b/ksvg/dom/SVGElementInstance.h
index 51d81831..97335b32 100644
--- a/ksvg/dom/SVGElementInstance.h
+++ b/ksvg/dom/SVGElementInstance.h
@@ -39,7 +39,7 @@ public:
SVGElement correspondingElement() const;
SVGUseElement correspondingUseElement() const;
- SVGElementInstance parentNode() const;
+ SVGElementInstance tqparentNode() const;
SVGElementInstanceList childNodes() const;
SVGElementInstance firstChild() const;
SVGElementInstance lastChild() const;
diff --git a/ksvg/dom/SVGEllipseElement.h b/ksvg/dom/SVGEllipseElement.h
index 78399779..07d86504 100644
--- a/ksvg/dom/SVGEllipseElement.h
+++ b/ksvg/dom/SVGEllipseElement.h
@@ -52,7 +52,7 @@ class SVGEllipseElementImpl;
* center point and two radii.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#EllipseElement">9.4 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#EllipseElement">9.4 The
* 'ellipse' element</a>.
*/
class SVGEllipseElement : public SVGElement,
diff --git a/ksvg/dom/SVGLength.cc b/ksvg/dom/SVGLength.cc
index bb2db73f..6ae3f55f 100644
--- a/ksvg/dom/SVGLength.cc
+++ b/ksvg/dom/SVGLength.cc
@@ -77,7 +77,7 @@ void SVGLength::setValue(float value)
{
impl->setValue(value);
- // Automatic updating of the shape if any value is changed, imagine:
+ // Automatic updating of the tqshape if any value is changed, imagine:
// SVGCircleElement c; [...] c.r().baseVal().setValue(150);
if(impl->context() && dynamic_cast<SVGShapeImpl *>(impl->context()))
dynamic_cast<SVGShapeImpl *>(impl->context())->update(UPDATE_TRANSFORM, 0, 0);
diff --git a/ksvg/dom/SVGLineElement.h b/ksvg/dom/SVGLineElement.h
index b08a78ba..0bd2e58f 100644
--- a/ksvg/dom/SVGLineElement.h
+++ b/ksvg/dom/SVGLineElement.h
@@ -51,7 +51,7 @@ class SVGLineElementImpl;
* one point and ends at another.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#CircleElement">9.5 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#CircleElement">9.5 The
* 'line' element</a>.
*/
class SVGLineElement : public SVGElement,
diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h
index ecb93adc..fafe5204 100644
--- a/ksvg/dom/SVGLocatable.h
+++ b/ksvg/dom/SVGLocatable.h
@@ -66,7 +66,7 @@ public:
/**
* Returns the tight bounding box in current user space (i.e., after application of
- * the <code>transform</code> attribute, if any) on the geometry of all contained graphics
+ * the <code>transform</code> attribute, if any) on the tqgeometry of all contained graphics
* elements, exclusive of stroke-width and filter effects).
*
* @return An SVGRect object that defines the bounding box.
@@ -84,7 +84,7 @@ public:
/**
* Returns the transformation matrix from current user units (i.e., after application of
- * the <code>transform</code> attribute, if any) to the parent user agent's notice of a "pixel".
+ * the <code>transform</code> attribute, if any) to the tqparent user agent's notice of a "pixel".
* For display devices, ideally this represents a physical screen pixel. For other devices or
* environments where physical pixel sizes are not known, then an algorithm similar to the
* CSS2 definition of a "pixel" can be used instead.
diff --git a/ksvg/dom/SVGMaskElement.cc b/ksvg/dom/SVGMaskElement.cc
index c4513adc..0ec23f0a 100644
--- a/ksvg/dom/SVGMaskElement.cc
+++ b/ksvg/dom/SVGMaskElement.cc
@@ -70,16 +70,16 @@ SVGMaskElement::~SVGMaskElement()
impl->deref();
}
-SVGAnimatedEnumeration SVGMaskElement::maskUnits() const
+SVGAnimatedEnumeration SVGMaskElement::tqmaskUnits() const
{
if(!impl) return SVGAnimatedEnumeration(0);
- return SVGAnimatedEnumeration(impl->maskUnits());
+ return SVGAnimatedEnumeration(impl->tqmaskUnits());
}
-SVGAnimatedEnumeration SVGMaskElement::maskContentUnits() const
+SVGAnimatedEnumeration SVGMaskElement::tqmaskContentUnits() const
{
if(!impl) return SVGAnimatedEnumeration(0);
- return SVGAnimatedEnumeration(impl->maskContentUnits());
+ return SVGAnimatedEnumeration(impl->tqmaskContentUnits());
}
SVGAnimatedLength SVGMaskElement::x() const
diff --git a/ksvg/dom/SVGMaskElement.h b/ksvg/dom/SVGMaskElement.h
index 6a8e26a4..a93958a7 100644
--- a/ksvg/dom/SVGMaskElement.h
+++ b/ksvg/dom/SVGMaskElement.h
@@ -48,8 +48,8 @@ public:
SVGMaskElement(SVGMaskElementImpl *other);
virtual ~SVGMaskElement();
- SVGAnimatedEnumeration maskUnits() const;
- SVGAnimatedEnumeration maskContentUnits() const;
+ SVGAnimatedEnumeration tqmaskUnits() const;
+ SVGAnimatedEnumeration tqmaskContentUnits() const;
SVGAnimatedLength x() const;
SVGAnimatedLength y() const;
SVGAnimatedLength width() const;
diff --git a/ksvg/dom/SVGPathSeg.h b/ksvg/dom/SVGPathSeg.h
index f82e3c80..0120276b 100644
--- a/ksvg/dom/SVGPathSeg.h
+++ b/ksvg/dom/SVGPathSeg.h
@@ -35,8 +35,8 @@ enum
PATHSEG_LINETO_REL = 5,
PATHSEG_CURVETO_CUBIC_ABS = 6,
PATHSEG_CURVETO_CUBIC_REL = 7,
- PATHSEG_CURVETO_QUADRATIC_ABS = 8,
- PATHSEG_CURVETO_QUADRATIC_REL = 9,
+ PATHSEG_CURVETO_TQUADRATIC_ABS = 8,
+ PATHSEG_CURVETO_TQUADRATIC_REL = 9,
PATHSEG_ARC_ABS = 10,
PATHSEG_ARC_REL = 11,
PATHSEG_LINETO_HORIZONTAL_ABS = 12,
@@ -45,8 +45,8 @@ enum
PATHSEG_LINETO_VERTICAL_REL = 15,
PATHSEG_CURVETO_CUBIC_SMOOTH_ABS = 16,
PATHSEG_CURVETO_CUBIC_SMOOTH_REL = 17,
- PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS = 18,
- PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL = 19
+ PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS = 18,
+ PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL = 19
};
class SVGPathSegImpl;
diff --git a/ksvg/dom/SVGPolygonElement.h b/ksvg/dom/SVGPolygonElement.h
index 526e9815..4ad16863 100644
--- a/ksvg/dom/SVGPolygonElement.h
+++ b/ksvg/dom/SVGPolygonElement.h
@@ -48,11 +48,11 @@ class SVGPointList;
class SVGPolygonElementImpl;
/**
- * The <code>polygon</code> element defines a closed shape consisting
+ * The <code>polygon</code> element defines a closed tqshape consisting
* of connected straight line segments.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.7 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.7 The
* 'polygon' element</a>.
*/
class SVGPolygonElement : public SVGElement,
@@ -81,7 +81,7 @@ public:
/**
* Provides access to the current animated contents of the points
* attribute.
- * If the given attribute or property is being animated, contains
+ * If the given attribute or property is being animated, tqcontains
* the current animated value of the attribute or property.
* If the given attribute or property is not currently being
* animated, contains the same value as <code>points</code>'.
diff --git a/ksvg/dom/SVGPolylineElement.h b/ksvg/dom/SVGPolylineElement.h
index 35e948f7..2ab617fc 100644
--- a/ksvg/dom/SVGPolylineElement.h
+++ b/ksvg/dom/SVGPolylineElement.h
@@ -47,10 +47,10 @@ namespace KSVG
/**
* The <code>polyline</code> element defines a set of connected
* straight line segments. Typically, <code>polyline</code> elements
- * define open shapes.
+ * define open tqshapes.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#PolylineElement">9.6 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#PolylineElement">9.6 The
* 'polyline' element</a>.
*/
class SVGPointList;
@@ -81,7 +81,7 @@ public:
/**
* Provides access to the current animated contents of the points
* attribute.
- * If the given attribute or property is being animated, contains
+ * If the given attribute or property is being animated, tqcontains
* the current animated value of the attribute or property.
* If the given attribute or property is not currently being
* animated, contains the same value as <code>points</code>'.
diff --git a/ksvg/dom/SVGRectElement.h b/ksvg/dom/SVGRectElement.h
index 2a77420d..2c33b045 100644
--- a/ksvg/dom/SVGRectElement.h
+++ b/ksvg/dom/SVGRectElement.h
@@ -55,7 +55,7 @@ class SVGRectElementImpl;
* for attributes <code> x </code> and <code> y</code>.
*
* For more info look here : <a href =
- * "http://www.w3.org/TR/SVG/shapes.html#RectElement"> 9.2 The
+ * "http://www.w3.org/TR/SVG/tqshapes.html#RectElement"> 9.2 The
* 'rect' element</a>.
*/
class SVGRectElement : public SVGElement,
@@ -130,7 +130,7 @@ public:
* "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing"> Error
* processing</a>).
*
- * See <a href="http://www.w3.org/TR/SVG/shapes.html#RectElement">
+ * See <a href="http://www.w3.org/TR/SVG/tqshapes.html#RectElement">
* 9.2 The 'rect' element </a> for info about what happens if the
* attribute is not specified.
*
@@ -148,7 +148,7 @@ public:
* "http://www.w3.org/TR/SVG/implnote.html#ErrorProcessing">Error
* processing</a>).
*
- * See <a href="http://www.w3.org/TR/SVG/shapes.html#RectElement">
+ * See <a href="http://www.w3.org/TR/SVG/tqshapes.html#RectElement">
* 9.2 The 'rect' element </a> for info about what happens if the
* attribute is not specified.
*
diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h
index 59621e2e..9380f992 100644
--- a/ksvg/dom/SVGSVGElement.h
+++ b/ksvg/dom/SVGSVGElement.h
@@ -56,7 +56,7 @@ class SVGSVGElementImpl;
/**
* A key interface definition is the SVGSVGElement interface, which is the
- * interface that corresponds to the 'svg' element. This interface contains
+ * interface that corresponds to the 'svg' element. This interface tqcontains
* various miscellaneous commonly-used utility methods, such as matrix
* operations and the ability to control the time of redraw on visual
* rendering devices. SVGSVGElement extends ViewCSS and DocumentCSS to provide
@@ -185,13 +185,13 @@ public:
* corresponds to this 'svg' element. When the user agent is actually
* rendering the content, then the position and size values represent the
* actual values when rendering. The position and size values are unitless
- * values in the coordinate system of the parent element. If no parent element
+ * values in the coordinate system of the tqparent element. If no tqparent element
* exists (i.e., 'svg' element represents the root of the document tree), if
* this SVG document is embedded as part of another document (e.g., via the
* HTML 'object' element), then the position and size are unitless values in
- * the coordinate system of the parent document. (If the parent uses CSS or
- * XSL layout, then unitless values represent pixel units for the current CSS
- * or XSL viewport, as described in the CSS2 specification.) If the parent
+ * the coordinate system of the tqparent document. (If the tqparent uses CSS or
+ * XSL tqlayout, then unitless values represent pixel units for the current CSS
+ * or XSL viewport, as described in the CSS2 specification.) If the tqparent
* element does not have a coordinate system, then the user agent should
* provide reasonable default values for this attribute.
*
diff --git a/ksvg/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h
index 0bf459fe..111d2929 100644
--- a/ksvg/dom/SVGTextElement.h
+++ b/ksvg/dom/SVGTextElement.h
@@ -57,11 +57,11 @@ class SVGTextElementImpl;
* specification and painting attributes which describe how exactly to render
* the characters. Since <code>text</code> elements are rendered using the
* same rendering methods as other graphics elements, all of the same
- * coordinate system transformations, painting, clipping and masking
- * features that apply to shapes such as paths and rectangles also
+ * coordinate system transformations, painting, clipping and tqmasking
+ * features that apply to tqshapes such as paths and rectangles also
* apply to <code>text</code> elements.
*
- * It is possible to apply a gradient, pattern, clipping path, mask or
+ * It is possible to apply a gradient, pattern, clipping path, tqmask or
* filter to text.When one of these facilities is applied to text and
* keyword objectBoundingBox is used to specify a graphical effect
* relative to the "object bounding box", then the object bounding box
diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp
index a42d69ad..2cb17dcd 100644
--- a/ksvg/ecma/ksvg_ecma.cpp
+++ b/ksvg/ecma/ksvg_ecma.cpp
@@ -38,18 +38,18 @@
using namespace KSVG;
using namespace KJS;
-class AsyncStatus : public ObjectImp
+class AsynctqStatus : public ObjectImp
{
public:
- AsyncStatus() : ObjectImp() { }
+ AsynctqStatus() : ObjectImp() { }
virtual bool implementsCall() const { return true; }
virtual Value call(ExecState *exec, Object &thisObj, const List &args);
};
-Value AsyncStatus::call(ExecState *exec, Object &, const List &args)
+Value AsynctqStatus::call(ExecState *exec, Object &, const List &args)
{
- kdDebug(26004) << "[AsyncStatus] " << args[0].toString(exec).ascii() << endl;
+ kdDebug(26004) << "[AsynctqStatus] " << args[0].toString(exec).ascii() << endl;
if(args[0].toString(exec) == "success")
return Number(1);
@@ -163,7 +163,7 @@ TQString KSVGEcma::valueOfEventListener(SVGEventListener *listener) const
{
KSVGEcmaEventListener *event = static_cast<KSVGEcmaEventListener *>(listener);
if(!event)
- return TQString::null;
+ return TQString();
return event->type();
}
@@ -175,7 +175,7 @@ void KSVGEcma::addEventListener(KSVGEcmaEventListener *listener)
void KSVGEcma::removeEventListener(KSVGEcmaEventListener *listener)
{
- m_ecmaEventListeners.take(m_ecmaEventListeners.find(listener));
+ m_ecmaEventListeners.take(m_ecmaEventListeners.tqfind(listener));
if(m_ecmaEventListeners.count() == 0)
m_hasListeners = false;
@@ -194,7 +194,7 @@ void KSVGEcma::finishedWithEvent(SVGEventImpl *event)
Value KSVGEcma::getUrl(ExecState *exec, ::KURL url)
{
- Object *status = new Object(new AsyncStatus());
+ Object *status = new Object(new AsynctqStatus());
// FIXME: Security issue, allows local testing of getURL(), REMOVE BEFORE RELEASE! (Niko)
TQString svgDocument = KSVGLoader::getUrl(url, true);
@@ -214,7 +214,7 @@ Value KSVGEcma::getUrl(ExecState *exec, ::KURL url)
void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const TQString &mimeType, const TQString &contentEncoding, Object &callBackFunction)
{
- Object *status = new Object(new AsyncStatus());
+ Object *status = new Object(new AsynctqStatus());
status->put(exec, Identifier("content"), String(""));
status->put(exec, Identifier("success"), Boolean(false));
@@ -224,7 +224,7 @@ void KSVGEcma::postUrl(ExecState *exec, ::KURL url, const TQString &data, const
// Support gzip compression
if(contentEncoding == "gzip" || contentEncoding == "deflate")
- byteArray = qCompress(byteArray);
+ byteArray = tqCompress(byteArray);
KSVGLoader *loader = new KSVGLoader();
loader->postUrl(url, byteArray, mimeType, exec, callBackFunction, *status);
diff --git a/ksvg/ecma/ksvg_helper.cpp b/ksvg/ecma/ksvg_helper.cpp
index 24f05101..1d41733e 100644
--- a/ksvg/ecma/ksvg_helper.cpp
+++ b/ksvg/ecma/ksvg_helper.cpp
@@ -33,7 +33,7 @@ KJS::UString::UString(const DOM::DOMString &d)
unsigned int len = d.length();
KJS::UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = KJS::UString::Rep::create(dat, len);
}
@@ -41,7 +41,7 @@ KJS::UString::UString(const TQString &d)
{
unsigned int len = d.length();
KJS::UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = KJS::UString::Rep::create(dat, len);
}
diff --git a/ksvg/ecma/ksvg_lookup.h b/ksvg/ecma/ksvg_lookup.h
index 11c41462..659ce8c7 100644
--- a/ksvg/ecma/ksvg_lookup.h
+++ b/ksvg/ecma/ksvg_lookup.h
@@ -31,13 +31,13 @@
#define KSVG_GET_COMMON \
public: \
\
- /* The standard hasProperty call, auto-generated. Looks in hashtable, forwards to parents. */ \
+ /* The standard hasProperty call, auto-generated. Looks in hashtable, forwards to tqparents. */ \
bool hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const; \
\
/* get() method, called by KSVGBridge::get */ \
KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
\
- /* Called by lookupGet(). Auto-generated. Forwards to the parent which has the given property. */ \
+ /* Called by lookupGet(). Auto-generated. Forwards to the tqparent which has the given property. */ \
KJS::Value getInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \
\
KJS::Object prototype(KJS::ExecState *exec) const;\
@@ -59,7 +59,7 @@ public: \
KSVG_GET_COMMON \
virtual KJS::Value cache(KJS::ExecState *exec) const;
-// For classes without properties, but with a parent class to forward to
+// For classes without properties, but with a tqparent class to forward to
#define KSVG_FORWARDGET \
public: \
\
@@ -80,7 +80,7 @@ public: \
/* put() method, called by KSVGBridge::put */ \
bool put(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::Value &value, int attr); \
\
- /* Called by lookupPut. Auto-generated. Looks in hashtable, forwards to parents. */ \
+ /* Called by lookupPut. Auto-generated. Looks in hashtable, forwards to tqparents. */ \
bool putInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::Value &value, int attr);
// For classes which inherit a read-write class, but have no readwrite property themselves
@@ -127,7 +127,7 @@ namespace KSVG
*
* This method does it all (looking in the hashtable, checking for function
* overrides, creating the function or retrieving from cache, calling
- * getValueProperty in case of a non-function property, forwarding to parent[s] if
+ * getValueProperty in case of a non-function property, forwarding to tqparent[s] if
* unknown property).
*
* Template arguments:
@@ -150,7 +150,7 @@ namespace KSVG
{
const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
- if(!entry) // not found, forward to parents
+ if(!entry) // not found, forward to tqparents
return thisObj->getInParents(exec, propertyName, bridge);
if(entry->attr & KJS::Function)
@@ -174,7 +174,7 @@ namespace KSVG
{
const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
- if(!entry) // not found, forward to parents
+ if(!entry) // not found, forward to tqparents
return thisObj->getInParents(exec, propertyName, bridge);
if(entry->attr & KJS::Function)
@@ -199,7 +199,7 @@ namespace KSVG
{
const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
- if(!entry) // not found, forward to parents
+ if(!entry) // not found, forward to tqparents
return thisObj->putInParents(exec, propertyName, value, attr);
else if(entry->attr & KJS::Function) // Function: put as override property
return false;
@@ -256,14 +256,14 @@ namespace KSVG
} \
const KJS::ClassInfo ClassProto::info = { ClassName, 0, &s_hashTable, 0 }; \
-// same as KSVG_IMPLEMENT_PROTOTYPE but with a parent class to forward calls to
+// same as KSVG_IMPLEMENT_PROTOTYPE but with a tqparent class to forward calls to
// Not used within KSVG up to now - each class does a self proto lookup in generateddata.cpp
#define KSVG_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName,ClassProto,ClassFunc,ParentProto) \
KJS::Value KSVG::ClassProto::get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
{ \
KJS::Value val = lookupGetFunction<ClassFunc,KJS::ObjectImp>(exec, propertyName, &s_hashTable, this ); \
if ( val.type() != UndefinedType ) return val; \
- /* Not found -> forward request to "parent" prototype */ \
+ /* Not found -> forward request to "tqparent" prototype */ \
return ParentProto::self(exec).get( exec, propertyName ); \
} \
bool KSVG::ClassProto::hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \
@@ -310,7 +310,7 @@ namespace KSVG
// To be used in all call() implementations!
// Can't use if (!thisObj.inherits(&ClassName::s_classInfo) since we don't
-// use the (single-parent) inheritance of ClassInfo...
+// use the (single-tqparent) inheritance of ClassInfo...
#define KSVG_CHECK_THIS(ClassName) KSVG_CHECK(ClassName, thisObj)
#endif
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 80a4ee14..7137bfbd 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -108,7 +108,7 @@ const ClassInfo KSVG::Window::s_classInfo = { "Window", 0, &s_hashTable, 0 };
KSVG::Window::Window(KSVG::SVGDocumentImpl *p) : ObjectImp(), m_doc(p)
{
- winq = new WindowQObject(this);
+ winq = new WindowTQObject(this);
}
KSVG::Window::~Window()
@@ -278,7 +278,7 @@ void KSVG::Window::clear(ExecState *exec)
{
kdDebug(26004) << "KSVG::Window::clear " << this << endl;
delete winq;
- winq = new WindowQObject(this);;
+ winq = new WindowTQObject(this);;
// Get rid of everything, those user vars could hold references to DOM nodes
deleteAllProperties(exec);
@@ -330,11 +330,11 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
case KSVG::Window::_GetURL:
{
KURL url((const_cast<Window *>(window))->doc()->baseUrl(), args[0].toString(exec).qstring());
- Value asyncStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url);
+ Value asynctqStatus = (const_cast<Window *>(window))->doc()->ecmaEngine()->getUrl(exec, url);
Object callBackFunction = Object::dynamicCast(args[1]);
List callBackArgs;
- callBackArgs.append(asyncStatus);
+ callBackArgs.append(asynctqStatus);
callBackFunction.call(exec, callBackFunction, callBackArgs);
return Undefined();
@@ -392,7 +392,7 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
else
str2 = KInputDialog::getText(i18n("Prompt"),
TQStyleSheet::convertFromPlainText(str),
- TQString::null, &ok);
+ TQString(), &ok);
if ( ok )
return String(str2);
else
@@ -488,18 +488,18 @@ void ScheduledAction::execute(Window *window)
}
}
-////////////////////// WindowQObject ////////////////////////
+////////////////////// WindowTQObject ////////////////////////
-WindowQObject::WindowQObject(Window *w) : parent(w)
+WindowTQObject::WindowTQObject(Window *w) : tqparent(w)
{
}
-WindowQObject::~WindowQObject()
+WindowTQObject::~WindowTQObject()
{
- parentDestroyed(); // reuse same code
+ tqparentDestroyed(); // reuse same code
}
-void WindowQObject::parentDestroyed()
+void WindowTQObject::tqparentDestroyed()
{
killTimers();
@@ -513,7 +513,7 @@ void WindowQObject::parentDestroyed()
scheduledActions.clear();
}
-int WindowQObject::installTimeout(const UString &handler, int t, bool singleShot)
+int WindowTQObject::installTimeout(const UString &handler, int t, bool singleShot)
{
int id = startTimer(t);
ScheduledAction *action = new ScheduledAction(handler.qstring(), singleShot);
@@ -521,7 +521,7 @@ int WindowQObject::installTimeout(const UString &handler, int t, bool singleShot
return id;
}
-int WindowQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
+int WindowTQObject::installTimeout(const Value &func, List args, int t, bool singleShot)
{
Object objFunc = Object::dynamicCast(func);
int id = startTimer(t);
@@ -529,13 +529,13 @@ int WindowQObject::installTimeout(const Value &func, List args, int t, bool sing
return id;
}
-void WindowQObject::clearTimeout(int timerId, bool delAction)
+void WindowTQObject::clearTimeout(int timerId, bool delAction)
{
killTimer(timerId);
if(delAction)
{
- TQMapIterator<int, ScheduledAction *> it = scheduledActions.find(timerId);
+ TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(timerId);
if(it != scheduledActions.end())
{
ScheduledAction *action = *it;
@@ -545,9 +545,9 @@ void WindowQObject::clearTimeout(int timerId, bool delAction)
}
}
-void WindowQObject::timerEvent(TQTimerEvent *e)
+void WindowTQObject::timerEvent(TQTimerEvent *e)
{
- TQMapIterator<int, ScheduledAction *> it = scheduledActions.find(e->timerId());
+ TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(e->timerId());
if(it != scheduledActions.end())
{
ScheduledAction *action = *it;
@@ -560,8 +560,8 @@ void WindowQObject::timerEvent(TQTimerEvent *e)
scheduledActions.remove(it);
}
- if(parent->doc())
- action->execute(parent);
+ if(tqparent->doc())
+ action->execute(tqparent);
// It is important to test singleShot and not action->singleShot here - the
// action could have been deleted already if not single shot and if the
@@ -570,9 +570,9 @@ void WindowQObject::timerEvent(TQTimerEvent *e)
delete action;
}
else
- kdWarning(6070) << "WindowQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
+ kdWarning(6070) << "WindowTQObject::timerEvent this=" << this << " timer " << e->timerId() << " not found (" << scheduledActions.count() << " actions in map)" << endl;
}
-void WindowQObject::timeoutClose()
+void WindowTQObject::timeoutClose()
{
}
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index db6ac9a3..6f1e511a 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -25,14 +25,14 @@
namespace KSVG {
class SVGDocumentImpl;
-class WindowQObject;
+class WindowTQObject;
// This is currently a fork of khtml's Window object, simplified.
// However in the long run it could become a base class for it.
// Author: David Faure <faure@kde.org>
class Window : public KJS::ObjectImp {
friend class WindowFunc;
- friend class WindowQObject;
+ friend class WindowTQObject;
friend class ScheduledAction;
public:
Window(KSVG::SVGDocumentImpl *p);
@@ -81,7 +81,7 @@ public:
static const struct KJS::HashTable s_hashTable;
private:
- WindowQObject *winq;
+ WindowTQObject *winq;
TQGuardedPtr<KSVG::SVGDocumentImpl> m_doc;
};
@@ -98,22 +98,23 @@ public:
bool singleShot;
};
-class WindowQObject : public TQObject {
+class WindowTQObject : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- WindowQObject(Window *w);
- ~WindowQObject();
+ WindowTQObject(Window *w);
+ ~WindowTQObject();
int installTimeout(const KJS::UString &handler, int t, bool singleShot);
int installTimeout(const KJS::Value &func, KJS::List args, int t, bool singleShot);
void clearTimeout(int timerId, bool delAction = true);
public slots:
void timeoutClose();
protected slots:
- void parentDestroyed();
+ void tqparentDestroyed();
protected:
void timerEvent(TQTimerEvent *e);
private:
- Window *parent;
+ Window *tqparent;
//KHTMLPart *part; // not guarded, may be dangling
TQMap<int, ScheduledAction*> scheduledActions;
};
diff --git a/ksvg/impl/LRUCache.h b/ksvg/impl/LRUCache.h
index f9045262..ef51e1d8 100644
--- a/ksvg/impl/LRUCache.h
+++ b/ksvg/impl/LRUCache.h
@@ -36,7 +36,7 @@ public:
virtual ~MinOneLRUCache() {}
void insert(const keyType& key, const valueType& value, int cost);
- bool find(const keyType& key, valueType& result);
+ bool tqfind(const keyType& key, valueType& result);
void setMaxTotalCost(int maxTotalCost);
int maxTotalCost() const { return m_maxTotalCost; }
@@ -63,7 +63,7 @@ protected:
typedef TQValueList<CacheItem> CacheItemList;
- typename CacheItemList::iterator find(const keyType& key);
+ typename CacheItemList::iterator tqfind(const keyType& key);
void enforceCostConstraint();
CacheItemList m_items;
@@ -74,7 +74,7 @@ protected:
template<class keyType, class valueType>
void MinOneLRUCache<keyType, valueType>::insert(const keyType& key, const valueType& value, int cost)
{
- typename CacheItemList::iterator it = find(key);
+ typename CacheItemList::iterator it = tqfind(key);
if(it != m_items.end())
{
@@ -91,10 +91,10 @@ void MinOneLRUCache<keyType, valueType>::insert(const keyType& key, const valueT
}
template<class keyType, class valueType>
-bool MinOneLRUCache<keyType, valueType>::find(const keyType& key, valueType& result)
+bool MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key, valueType& result)
{
bool foundKey = false;
- typename CacheItemList::iterator it = find(key);
+ typename CacheItemList::iterator it = tqfind(key);
if(it != m_items.end())
{
@@ -115,7 +115,7 @@ bool MinOneLRUCache<keyType, valueType>::find(const keyType& key, valueType& res
}
template<class keyType, class valueType>
-typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::find(const keyType& key)
+typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key)
{
typename CacheItemList::iterator it;
diff --git a/ksvg/impl/SVGAnimateElementImpl.cc b/ksvg/impl/SVGAnimateElementImpl.cc
index ccf8565d..471d27bb 100644
--- a/ksvg/impl/SVGAnimateElementImpl.cc
+++ b/ksvg/impl/SVGAnimateElementImpl.cc
@@ -127,7 +127,7 @@ void SVGAnimateElementImpl::handleTimerEvent()
{
/* m_from += m_addStep;
- if(m_additive == "replace" && needCombine)
+ if(m_additive == "tqreplace" && needCombine)
needCombine = false;
applyAttribute(m_attributeName, TQString::number(m_from), needCombine);
diff --git a/ksvg/impl/SVGAnimateMotionElementImpl.cc b/ksvg/impl/SVGAnimateMotionElementImpl.cc
index fe816769..9be742c0 100644
--- a/ksvg/impl/SVGAnimateMotionElementImpl.cc
+++ b/ksvg/impl/SVGAnimateMotionElementImpl.cc
@@ -64,7 +64,7 @@ void SVGAnimateMotionElementImpl::setAttributes()
/* if(!m_pathArray)
{
bool temp;
- m_pathArray = m_path->preparePath(&temp, p->worldMatrix());
+ m_pathArray = m_path->preparePath(&temp, p->tqworldMatrix());
}*/
//}
diff --git a/ksvg/impl/SVGAnimateTransformElementImpl.cc b/ksvg/impl/SVGAnimateTransformElementImpl.cc
index cf3922f8..a3384c9d 100644
--- a/ksvg/impl/SVGAnimateTransformElementImpl.cc
+++ b/ksvg/impl/SVGAnimateTransformElementImpl.cc
@@ -129,7 +129,7 @@ void SVGAnimateTransformElementImpl::setAttributes()
{
TQString test = _values.string();
- if(test.contains(";"))
+ if(test.tqcontains(";"))
{
SVGLengthImpl *temp = SVGSVGElementImpl::createSVGLength();
@@ -201,7 +201,7 @@ void SVGAnimateTransformElementImpl::handleTimerEvent(bool)
if(!m_lastTransform.isEmpty())
{
- int pos = trans.find(m_lastTransform);
+ int pos = trans.tqfind(m_lastTransform);
TQString extract;
extract += trans.mid(0, pos);
diff --git a/ksvg/impl/SVGAnimatedPointsImpl.cc b/ksvg/impl/SVGAnimatedPointsImpl.cc
index 07db7d3b..d3eb426d 100644
--- a/ksvg/impl/SVGAnimatedPointsImpl.cc
+++ b/ksvg/impl/SVGAnimatedPointsImpl.cc
@@ -69,12 +69,12 @@ void SVGAnimatedPointsImpl::parsePoints(TQString _points, SVGPointListImpl *poin
_points = _points.simplifyWhiteSpace();
- if(_points.contains(",,") || _points.contains(", ,"))
+ if(_points.tqcontains(",,") || _points.tqcontains(", ,"))
return;
- _points.replace(',', ' ');
- _points.replace('\r', TQString::null);
- _points.replace('\n', TQString::null);
+ _points.tqreplace(',', ' ');
+ _points.tqreplace('\r', TQString());
+ _points.tqreplace('\n', TQString());
_points = _points.simplifyWhiteSpace();
diff --git a/ksvg/impl/SVGAnimationElementImpl.cc b/ksvg/impl/SVGAnimationElementImpl.cc
index 45c4af2b..3fd29d1e 100644
--- a/ksvg/impl/SVGAnimationElementImpl.cc
+++ b/ksvg/impl/SVGAnimationElementImpl.cc
@@ -68,7 +68,7 @@ SVGElementImpl *SVGAnimationElementImpl::targetElement() const
if(!m_href.isEmpty())
modify->setTargetElement(ownerDoc()->getElementByIdRecursive(ownerSVGElement(), SVGURIReferenceImpl::getTarget(m_href)));
else if(!parentNode().isNull())
- modify->setTargetElement(ownerDoc()->getElementFromHandle(parentNode().handle()));
+ modify->setTargetElement(ownerDoc()->getElementFromHandle(parentNode().handle()));
}
return m_targetElement;
@@ -84,8 +84,8 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
double result;
- int doublePointOne = parse.find(':');
- int doublePointTwo = parse.find(':', doublePointOne + 1);
+ int doublePointOne = parse.tqfind(':');
+ int doublePointTwo = parse.tqfind(':', doublePointOne + 1);
if(doublePointOne != -1 && doublePointTwo != -1) // Spec: "Full clock values"
{
@@ -96,7 +96,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
result = (3600 * hours) + (60 * minutes) + seconds;
- if(parse.find('.') != -1)
+ if(parse.tqfind('.') != -1)
{
TQString temp = parse.mid(9, 2);
milliseconds = temp.toUInt();
@@ -111,7 +111,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
result = (60 * minutes) + seconds;
- if(parse.find('.') != -1)
+ if(parse.tqfind('.') != -1)
{
TQString temp = parse.mid(6, 2);
milliseconds = temp.toUInt();
@@ -120,7 +120,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
}
else // Spec: "Timecount values"
{
- int dotPosition = parse.find('.');
+ int dotPosition = parse.tqfind('.');
if(parse.endsWith("h"))
{
@@ -304,34 +304,34 @@ void SVGAnimationElementImpl::putValueProperty(ExecState *exec, int token, const
}
else if(current.startsWith("wallclock"))
{
- int firstBrace = current.find("(");
- int secondBrace = current.find(")");
+ int firstBrace = current.tqfind("(");
+ int secondBrace = current.tqfind(")");
TQString wallclockValue = current.mid(firstBrace + 1, secondBrace - firstBrace - 2);
kdDebug() << "WALLCLOCK VALUE " << wallclockValue << endl;
}
- else if(current.contains("."))
+ else if(current.tqcontains("."))
{
- int dotPosition = current.find(".");
+ int dotPosition = current.tqfind(".");
TQString element = current.mid(0, dotPosition);
TQString clockValue;
- if(current.contains("begin"))
+ if(current.tqcontains("begin"))
clockValue = current.mid(dotPosition + 6);
- else if(current.contains("end"))
+ else if(current.tqcontains("end"))
clockValue = current.mid(dotPosition + 4);
- else if(current.contains("repeat"))
+ else if(current.tqcontains("repeat"))
clockValue = current.mid(dotPosition + 7);
else // DOM2 Event Reference
{
int plusMinusPosition = -1;
- if(current.contains("+"))
- plusMinusPosition = current.find("+");
- else if(current.contains("-"))
- plusMinusPosition = current.find("-");
+ if(current.tqcontains("+"))
+ plusMinusPosition = current.tqfind("+");
+ else if(current.tqcontains("-"))
+ plusMinusPosition = current.tqfind("-");
TQString event = current.mid(dotPosition + 1, plusMinusPosition - dotPosition - 1);
@@ -405,9 +405,9 @@ void SVGAnimationElementImpl::setAttributes()
{
SVGElementImpl::setAttributes();
- // Spec: Default value is "replace"
+ // Spec: Default value is "tqreplace"
if(KSVG_TOKEN_NOT_PARSED(Additive))
- KSVG_SET_ALT_ATTRIBUTE(Additive, "replace")
+ KSVG_SET_ALT_ATTRIBUTE(Additive, "tqreplace")
// Spec: Default value is "none"
if(KSVG_TOKEN_NOT_PARSED(Accumulate))
diff --git a/ksvg/impl/SVGColorImpl.cc b/ksvg/impl/SVGColorImpl.cc
index 799c43ec..3808fe90 100644
--- a/ksvg/impl/SVGColorImpl.cc
+++ b/ksvg/impl/SVGColorImpl.cc
@@ -295,7 +295,7 @@ void SVGColorImpl::setRGBColor(const DOM::DOMString &rgbColor)
setRGBColor(245, 255, 250);
else if(rgbColor == "mistyrose")
setRGBColor(255, 228, 225);
- else if(rgbColor == "moccasin")
+ else if(rgbColor == "tqmoccasin")
setRGBColor(255, 228, 181);
else if(rgbColor == "navajowhite")
setRGBColor(255, 222, 173);
@@ -398,7 +398,7 @@ void SVGColorImpl::setRGBColorICCColor(const DOM::DOMString &rgbColor, const DOM
TQColor color;
TQString content = iccColor.string().right(iccColor.string().length() - 10);
- TQString iccTarget = content.mid(0, content.find(','));
+ TQString iccTarget = content.mid(0, content.tqfind(','));
TQStringList colors = TQStringList::split(',', content);
TQString r = colors[1];
diff --git a/ksvg/impl/SVGColorProfileElementImpl.cc b/ksvg/impl/SVGColorProfileElementImpl.cc
index 385a836b..7890f07e 100644
--- a/ksvg/impl/SVGColorProfileElementImpl.cc
+++ b/ksvg/impl/SVGColorProfileElementImpl.cc
@@ -229,12 +229,12 @@ void SVGColorProfileElementImpl::closeColorProfile()
cmsCloseProfile(m_hInput);
}
-QRgb SVGColorProfileElementImpl::correctPixel(float r, float g, float b)
+TQRgb SVGColorProfileElementImpl::correctPixel(float r, float g, float b)
{
if(!m_loaded)
{
if(!loadColorProfile())
- return qRgb(0, 0, 0);
+ return tqRgb(0, 0, 0);
}
unsigned short input[MAXCHANNELS], output[MAXCHANNELS];
@@ -246,9 +246,9 @@ QRgb SVGColorProfileElementImpl::correctPixel(float r, float g, float b)
cmsDoTransform(m_hTrans, input, output, 1);
if(m_outputColorSpace == icSigRgbData)
- return qRgb(output[0] / 257, output[1] / 257, output[2] / 257);
+ return tqRgb(output[0] / 257, output[1] / 257, output[2] / 257);
- return qRgb(0, 0, 0);
+ return tqRgb(0, 0, 0);
}
TQImage *SVGColorProfileElementImpl::correctImage(TQImage *input)
@@ -260,8 +260,8 @@ TQImage *SVGColorProfileElementImpl::correctImage(TQImage *input)
{
for(int x = 0; x < input->width(); x++)
{
- QRgb pixel = input->pixel(x, y);
- input->setPixel(x, y, correctPixel(qRed(pixel), qGreen(pixel), qBlue(pixel)));
+ TQRgb pixel = input->pixel(x, y);
+ input->setPixel(x, y, correctPixel(tqRed(pixel), tqGreen(pixel), tqBlue(pixel)));
}
}
diff --git a/ksvg/impl/SVGColorProfileElementImpl.h b/ksvg/impl/SVGColorProfileElementImpl.h
index ad498c4b..db4f322e 100644
--- a/ksvg/impl/SVGColorProfileElementImpl.h
+++ b/ksvg/impl/SVGColorProfileElementImpl.h
@@ -55,7 +55,7 @@ public:
unsigned short renderingIntent() const;
TQImage *correctImage(TQImage *input);
- QRgb correctPixel(float r, float g, float b);
+ TQRgb correctPixel(float r, float g, float b);
private:
bool loadColorProfile();
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<SVGShapeImpl *>(elem);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(elem);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(elem);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(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<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
- if(shape)
- shape->update(reason, param1, param2);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(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<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
- if(shape)
- shape->invalidate(c, recalc);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(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<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
- if(shape)
- shape->setReferenced(referenced);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(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<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
- if(shape)
- shape->draw();
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(node.handle()));
+ if(tqshape)
+ tqshape->draw();
}
}
diff --git a/ksvg/impl/SVGContainerImpl.h b/ksvg/impl/SVGContainerImpl.h
index 353a6154..2d01fdc8 100644
--- a/ksvg/impl/SVGContainerImpl.h
+++ b/ksvg/impl/SVGContainerImpl.h
@@ -40,7 +40,7 @@ public:
virtual void removeItem(KSVGCanvas *c);
virtual void update(CanvasItemUpdate reason, int param1, int param2);
- virtual void invalidate(KSVGCanvas *c, bool recalc);
+ virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
virtual void setReferenced(bool referenced);
virtual void draw();
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index c2b412f3..13de4b79 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cc
@@ -74,7 +74,7 @@ unsigned int SVGDocumentImpl::elemDictHashSizes [] =
const int SVGDocumentImpl::numElemDictHashSizes = sizeof(elemDictHashSizes) / sizeof(elemDictHashSizes[0]);
-SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *parentImage) : TQObject(), DOM::DomShared(), DOM::Document(), SVGDOMNodeBridge(static_cast<DOM::Node>(*this))
+SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *tqparentImage) : TQObject(), DOM::DomShared(), DOM::Document(), SVGDOMNodeBridge(static_cast<DOM::Node>(*this))
{
m_animations = anim;
@@ -97,7 +97,7 @@ SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *paren
m_resortZIndicesOnFinishedLoading = false;
m_fit = fit;
- m_parentImage = parentImage;
+ m_parentImage = tqparentImage;
if(m_parentImage)
m_parentImage->ref();
}
@@ -112,9 +112,9 @@ SVGDocumentImpl::~SVGDocumentImpl()
DOM::Node node = firstChild();
for(; !node.isNull(); node = node.nextSibling())
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(getElementFromHandle(node.handle()));
- if(shape)
- killList.append(shape);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(getElementFromHandle(node.handle()));
+ if(tqshape)
+ killList.append(tqshape);
}
SVGShapeImpl *rend = 0;
@@ -252,7 +252,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
args.getURLMode = false;
TQString url = m_baseURL.prettyURL();
- int pos = url.find('#'); // url can become like this.svg#svgView(viewBox(63,226,74,74)), get part after '#'
+ int pos = url.tqfind('#'); // url can become like this.svg#svgView(viewBox(63,226,74,74)), get part after '#'
if(pos > -1)
args.SVGFragmentId = url.mid(pos + 1);
@@ -358,7 +358,7 @@ void SVGDocumentImpl::checkFinishedLoading()
void SVGDocumentImpl::addForwardReferencingUseElement(SVGUseElementImpl *use)
{
- if(!m_forwardReferencingUseElements.contains(use))
+ if(!m_forwardReferencingUseElements.tqcontains(use))
m_forwardReferencingUseElements.append(use);
}
@@ -392,9 +392,9 @@ void SVGDocumentImpl::syncCachedMatrices()
{
if(rootElement())
{
- SVGMatrixImpl *parentMatrix = SVGSVGElementImpl::createSVGMatrix();
- rootElement()->checkCachedScreenCTM(parentMatrix);
- parentMatrix->deref();
+ SVGMatrixImpl *tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
+ rootElement()->checkCachedScreenCTM(tqparentMatrix);
+ tqparentMatrix->deref();
}
}
@@ -478,7 +478,7 @@ bool SVGDocumentImpl::dispatchRecursiveEvent(SVGEvent::EventId id, DOM::Node sta
if(element && element->hasChildNodes())
{
- // Dispatch to all children
+ // Dispatch to all tqchildren
eventExecuted = dispatchRecursiveEvent(id, element->lastChild()) ? true : eventExecuted;
// Dispatch, locally
diff --git a/ksvg/impl/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h
index 10eae77e..fcbb9f35 100644
--- a/ksvg/impl/SVGDocumentImpl.h
+++ b/ksvg/impl/SVGDocumentImpl.h
@@ -72,8 +72,9 @@ class SVGDocumentImpl : public TQObject,
public SVGDOMNodeBridge
{
Q_OBJECT
+ TQ_OBJECT
public:
- SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0);
+ SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *tqparentImage = 0);
virtual ~SVGDocumentImpl();
float screenPixelsPerMillimeterX() const;
@@ -89,7 +90,7 @@ public:
void setRootElement(SVGSVGElementImpl *);
SVGSVGElementImpl *rootElement() const;
- SVGImageElementImpl *parentImage() const { return m_parentImage; }
+ SVGImageElementImpl *tqparentImage() const { return m_parentImage; }
SVGWindowImpl *window();
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index 39843a07..e0c427ae 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -49,7 +49,7 @@ using namespace KSVG;
nodeName SVGDOMNodeBridge::NodeName DontDelete|ReadOnly
nodeValue SVGDOMNodeBridge::NodeValue DontDelete
nodeType SVGDOMNodeBridge::NodeType DontDelete|ReadOnly
- parentNode SVGDOMNodeBridge::ParentNode DontDelete|ReadOnly
+ tqparentNode SVGDOMNodeBridge::ParentNode DontDelete|ReadOnly
childNodes SVGDOMNodeBridge::ChildNodes DontDelete|ReadOnly
firstChild SVGDOMNodeBridge::FirstChild DontDelete|ReadOnly
lastChild SVGDOMNodeBridge::LastChild DontDelete|ReadOnly
@@ -74,7 +74,7 @@ using namespace KSVG;
isSupported SVGDOMNodeBridge::IsSupported DontDelete|Function 2
addEventListener SVGDOMNodeBridge::AddEventListener DontDelete|Function 3
removeEventListener SVGDOMNodeBridge::RemoveEventListener DontDelete|Function 3
- contains SVGDOMNodeBridge::Contains DontDelete|Function 1
+ tqcontains SVGDOMNodeBridge::Contains DontDelete|Function 1
getNodeName SVGDOMNodeBridge::GetNodeName DontDelete|Function 0
getNodeValue SVGDOMNodeBridge::GetNodeValue DontDelete|Function 0
getNodeType SVGDOMNodeBridge::GetNodeType DontDelete|Function 0
@@ -150,13 +150,13 @@ void SVGDOMNodeBridge::putValueProperty(ExecState *exec, int token, const Value
// triggered by one of the child nodes
void updateTextItem(ExecState *exec, const DOM::Node node)
{
- DOM::Node parent;
- while(!(parent = node.parentNode()).isNull())
+ DOM::Node tqparent;
+ while(!(tqparent = node.parentNode()).isNull())
{
- DOM::DOMString name = parent.nodeName();
+ DOM::DOMString name = tqparent.nodeName();
if(name == "text" || name == "tspan" || name == "tref")
{
- SVGHelperImpl::updateItem(exec, parent);
+ SVGHelperImpl::updateItem(exec, tqparent);
break;
}
}
@@ -169,19 +169,19 @@ void removeItem(ExecState *exec, DOM::Node &node)
SVGDocumentImpl *doc = KSVG::Window::retrieveActive(exec)->doc();
// Update canvas
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
- if(shape && shape->item())
- doc->canvas()->removeItem(shape->item());
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
+ if(tqshape && tqshape->item())
+ doc->canvas()->removeItem(tqshape->item());
}
// parseXML + getURL() need all these 5 functions to work properly
void correctHandles(SVGElementImpl *main, DOM::Node &node)
{
DOM::Element old(node.handle());
- DOM::Element *replace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
+ DOM::Element *tqreplace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
- if(replace && node.nodeType() == DOM::Node::ELEMENT_NODE)
- *replace = old;
+ if(tqreplace && node.nodeType() == DOM::Node::ELEMENT_NODE)
+ *tqreplace = old;
if(node.hasChildNodes())
{
@@ -304,7 +304,7 @@ Value appendHelper(ExecState *exec, DOM::Node node, DOM::Node newNode)
// Get some SVGElementImpl's
SVGElementImpl *nodeElement = doc->getElementFromHandle(newNode.handle());
- // TODO : extra check needed to see if the new elements parent is already appended
+ // TODO : extra check needed to see if the new elements tqparent is already appended
// in the doc. Not really nice, should be some other way? (Rob)
if(nodeElement && !nodeElement->parentNode().parentNode().isNull())
{
@@ -405,7 +405,7 @@ Value SVGDOMNodeBridgeProtoFunc::call(ExecState *exec, Object &thisObj, const Li
{
SVGEvent::EventId eventId = SVGEvent::typeToId(args[0].toString(exec).string());
if(eventId != SVGEvent::UNKNOWN_EVENT)
- element->setEventListener(eventId, new KSVGEcmaEventListener(Object::dynamicCast(args[1]), TQString::null, doc->ecmaEngine()));
+ element->setEventListener(eventId, new KSVGEcmaEventListener(Object::dynamicCast(args[1]), TQString(), doc->ecmaEngine()));
}
return Undefined();
}
@@ -556,7 +556,7 @@ Value SVGDOMElementBridgeProtoFunc::call(ExecState *exec, Object &thisObj, const
{
// For now, we strip the NS part (Rob)
DOM::DOMString attr = args[1].toString(exec).string();
- int pos = attr.string().find(':');
+ int pos = attr.string().tqfind(':');
if(pos > -1)
attr = attr.string().mid(pos + 1);
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index 940790f2..099918f5 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -134,7 +134,7 @@ bool SVGElementImpl::hasEventListener(int id, bool local)
if(local)
return false;
- // Check every parent element
+ // Check every tqparent element
for(DOM::Node node = parentNode(); !node.isNull(); node = node.parentNode())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
@@ -328,7 +328,7 @@ TQDict<DOM::DOMString> &SVGElementImpl::attributes()
// khtml overrides
void SVGElementImpl::setAttribute(const DOM::DOMString &name, const DOM::DOMString &value)
{
- m_attributes.replace(name.string(), new DOM::DOMString(value));
+ m_attributes.tqreplace(name.string(), new DOM::DOMString(value));
}
// Changes internal value. This will have no effect on getAttribute().
@@ -368,7 +368,7 @@ DOM::DOMString SVGElementImpl::getAttributeInternal(const DOM::DOMString &name)
bool SVGElementImpl::hasAttribute(const DOM::DOMString &name)
{
- return m_attributes.find(name.string()) != 0;
+ return m_attributes.tqfind(name.string()) != 0;
}
bool SVGElementImpl::hasAttributes()
@@ -496,9 +496,9 @@ void SVGElementImpl::setAttributes(bool deep)
bool SVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SVGMouseEventImpl *mev)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
- if(shape)
- return shape->prepareMouseEvent(p, a, mev);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
+ if(tqshape)
+ return tqshape->prepareMouseEvent(p, a, mev);
return false;
}
@@ -518,7 +518,7 @@ bool SVGElementImpl::dispatchEvent(SVGEventImpl *evt, bool tempEvent)
{
evt->setTarget(this);
- // Find out, where to send to -> collect parent nodes
+ // Find out, where to send to -> collect tqparent nodes
TQPtrList<SVGElementImpl> nodeChain;
for(DOM::Element e = *this; !e.isNull(); e = e.parentNode())
diff --git a/ksvg/impl/SVGElementInstanceImpl.cc b/ksvg/impl/SVGElementInstanceImpl.cc
index 97cd28a2..46252fcd 100644
--- a/ksvg/impl/SVGElementInstanceImpl.cc
+++ b/ksvg/impl/SVGElementInstanceImpl.cc
@@ -75,7 +75,7 @@ SVGUseElementImpl *SVGElementInstanceImpl::correspondingUseElement() const
return m_correspondingUseElement;
}
-SVGElementInstanceImpl *SVGElementInstanceImpl::parentNode() const
+SVGElementInstanceImpl *SVGElementInstanceImpl::tqparentNode() const
{
return m_parentNode;
}
diff --git a/ksvg/impl/SVGElementInstanceImpl.h b/ksvg/impl/SVGElementInstanceImpl.h
index d9f3afae..7ee469af 100644
--- a/ksvg/impl/SVGElementInstanceImpl.h
+++ b/ksvg/impl/SVGElementInstanceImpl.h
@@ -40,7 +40,7 @@ public:
SVGElementImpl *correspondingElement() const;
SVGUseElementImpl *correspondingUseElement() const;
- SVGElementInstanceImpl *parentNode() const;
+ SVGElementInstanceImpl *tqparentNode() const;
SVGElementInstanceListImpl *childNodes() const;
SVGElementInstanceImpl *firstChild() const;
SVGElementInstanceImpl *lastChild() const;
diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc
index 17338f45..f665d25c 100644
--- a/ksvg/impl/SVGEventImpl.cc
+++ b/ksvg/impl/SVGEventImpl.cc
@@ -43,7 +43,7 @@ SVGEventImpl::SVGEventImpl()
m_defaultPrevented = false;
m_id = SVGEvent::UNKNOWN_EVENT;
m_eventPhase = 0;
- m_createTime = TQDateTime::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
m_defaultHandled = false;
m_target = 0;
@@ -62,7 +62,7 @@ SVGEventImpl::SVGEventImpl(SVGEvent::EventId _id, bool canBubbleArg, bool cancel
m_defaultPrevented = false;
m_id = _id;
m_eventPhase = 0;
- m_createTime = TQDateTime::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
m_defaultHandled = false;
m_target = 0;
@@ -345,8 +345,8 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
{
qKeyEvent = new TQKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count());
- // Events are supposed to be accepted by default in Qt!
- // This line made QLineEdit's keyevents be ignored, so they were sent to the khtmlview
+ // Events are supposed to be accepted by default in TQt!
+ // This line made TQLineEdit's keyevents be ignored, so they were sent to the khtmlview
// (and e.g. space would make it scroll down)
//qKeyEvent->ignore();
@@ -359,147 +359,147 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
switch(key->key())
{
- case Qt::Key_Enter:
+ case TQt::Key_Enter:
m_numPad = true;
/* fall through */
- case Qt::Key_Return:
+ case TQt::Key_Return:
m_virtKeyVal = DOM_VK_ENTER;
break;
- case Qt::Key_NumLock:
+ case TQt::Key_NumLock:
m_numPad = true;
m_virtKeyVal = DOM_VK_NUM_LOCK;
break;
- case Qt::Key_Alt:
+ case TQt::Key_Alt:
m_virtKeyVal = DOM_VK_RIGHT_ALT;
// ### DOM_VK_LEFT_ALT;
break;
- case Qt::Key_Control:
+ case TQt::Key_Control:
m_virtKeyVal = DOM_VK_LEFT_CONTROL;
// ### DOM_VK_RIGHT_CONTROL
break;
- case Qt::Key_Shift:
+ case TQt::Key_Shift:
m_virtKeyVal = DOM_VK_LEFT_SHIFT;
// ### DOM_VK_RIGHT_SHIFT
break;
- case Qt::Key_Meta:
+ case TQt::Key_Meta:
m_virtKeyVal = DOM_VK_LEFT_META;
// ### DOM_VK_RIGHT_META
break;
- case Qt::Key_CapsLock:
+ case TQt::Key_CapsLock:
m_virtKeyVal = DOM_VK_CAPS_LOCK;
break;
- case Qt::Key_Delete:
+ case TQt::Key_Delete:
m_virtKeyVal = DOM_VK_DELETE;
break;
- case Qt::Key_End:
+ case TQt::Key_End:
m_virtKeyVal = DOM_VK_END;
break;
- case Qt::Key_Escape:
+ case TQt::Key_Escape:
m_virtKeyVal = DOM_VK_ESCAPE;
break;
- case Qt::Key_Home:
+ case TQt::Key_Home:
m_virtKeyVal = DOM_VK_HOME;
break;
- case Qt::Key_Insert:
+ case TQt::Key_Insert:
m_virtKeyVal = DOM_VK_INSERT;
break;
- case Qt::Key_Pause:
+ case TQt::Key_Pause:
m_virtKeyVal = DOM_VK_PAUSE;
break;
- case Qt::Key_Print:
+ case TQt::Key_Print:
m_virtKeyVal = DOM_VK_PRINTSCREEN;
break;
- case Qt::Key_ScrollLock:
+ case TQt::Key_ScrollLock:
m_virtKeyVal = DOM_VK_SCROLL_LOCK;
break;
- case Qt::Key_Left:
+ case TQt::Key_Left:
m_virtKeyVal = DOM_VK_LEFT;
break;
- case Qt::Key_Right:
+ case TQt::Key_Right:
m_virtKeyVal = DOM_VK_RIGHT;
break;
- case Qt::Key_Up:
+ case TQt::Key_Up:
m_virtKeyVal = DOM_VK_UP;
break;
- case Qt::Key_Down:
+ case TQt::Key_Down:
m_virtKeyVal = DOM_VK_DOWN;
break;
- case Qt::Key_Next:
+ case TQt::Key_Next:
m_virtKeyVal = DOM_VK_PAGE_DOWN;
break;
- case Qt::Key_Prior:
+ case TQt::Key_Prior:
m_virtKeyVal = DOM_VK_PAGE_UP;
break;
- case Qt::Key_F1:
+ case TQt::Key_F1:
m_virtKeyVal = DOM_VK_F1;
break;
- case Qt::Key_F2:
+ case TQt::Key_F2:
m_virtKeyVal = DOM_VK_F2;
break;
- case Qt::Key_F3:
+ case TQt::Key_F3:
m_virtKeyVal = DOM_VK_F3;
break;
- case Qt::Key_F4:
+ case TQt::Key_F4:
m_virtKeyVal = DOM_VK_F4;
break;
- case Qt::Key_F5:
+ case TQt::Key_F5:
m_virtKeyVal = DOM_VK_F5;
break;
- case Qt::Key_F6:
+ case TQt::Key_F6:
m_virtKeyVal = DOM_VK_F6;
break;
- case Qt::Key_F7:
+ case TQt::Key_F7:
m_virtKeyVal = DOM_VK_F7;
break;
- case Qt::Key_F8:
+ case TQt::Key_F8:
m_virtKeyVal = DOM_VK_F8;
break;
- case Qt::Key_F9:
+ case TQt::Key_F9:
m_virtKeyVal = DOM_VK_F9;
break;
- case Qt::Key_F10:
+ case TQt::Key_F10:
m_virtKeyVal = DOM_VK_F10;
break;
- case Qt::Key_F11:
+ case TQt::Key_F11:
m_virtKeyVal = DOM_VK_F11;
break;
- case Qt::Key_F12:
+ case TQt::Key_F12:
m_virtKeyVal = DOM_VK_F12;
break;
- case Qt::Key_F13:
+ case TQt::Key_F13:
m_virtKeyVal = DOM_VK_F13;
break;
- case Qt::Key_F14:
+ case TQt::Key_F14:
m_virtKeyVal = DOM_VK_F14;
break;
- case Qt::Key_F15:
+ case TQt::Key_F15:
m_virtKeyVal = DOM_VK_F15;
break;
- case Qt::Key_F16:
+ case TQt::Key_F16:
m_virtKeyVal = DOM_VK_F16;
break;
- case Qt::Key_F17:
+ case TQt::Key_F17:
m_virtKeyVal = DOM_VK_F17;
break;
- case Qt::Key_F18:
+ case TQt::Key_F18:
m_virtKeyVal = DOM_VK_F18;
break;
- case Qt::Key_F19:
+ case TQt::Key_F19:
m_virtKeyVal = DOM_VK_F19;
break;
- case Qt::Key_F20:
+ case TQt::Key_F20:
m_virtKeyVal = DOM_VK_F20;
break;
- case Qt::Key_F21:
+ case TQt::Key_F21:
m_virtKeyVal = DOM_VK_F21;
break;
- case Qt::Key_F22:
+ case TQt::Key_F22:
m_virtKeyVal = DOM_VK_F22;
break;
- case Qt::Key_F23:
+ case TQt::Key_F23:
m_virtKeyVal = DOM_VK_F23;
break;
- case Qt::Key_F24:
+ case TQt::Key_F24:
m_virtKeyVal = DOM_VK_F24;
break;
default:
@@ -507,17 +507,17 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
break;
}
- // m_keyVal should contain the unicode value
+ // m_keyVal should contain the tqunicode value
// of the pressed key if available.
if (!key->text().isNull())
- m_keyVal = key->text().unicode()[0];
+ m_keyVal = TQString(key->text()).tqunicode()[0];
// m_numPad = ???
// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
m_modifier = key->state();
- // key->text() returns the unicode sequence as a QString
+ // key->text() returns the tqunicode sequence as a TQString
m_outputString = DOM::DOMString(key->text());
}
diff --git a/ksvg/impl/SVGFitToViewBoxImpl.cc b/ksvg/impl/SVGFitToViewBoxImpl.cc
index aaee3045..7fc3856b 100644
--- a/ksvg/impl/SVGFitToViewBoxImpl.cc
+++ b/ksvg/impl/SVGFitToViewBoxImpl.cc
@@ -75,7 +75,7 @@ void SVGFitToViewBoxImpl::parseViewBox(const TQString &s)
// allow for viewbox def with ',' or whitespace
TQString viewbox(s);
- TQStringList points = TQStringList::split(' ', viewbox.replace(',', ' ').simplifyWhiteSpace());
+ TQStringList points = TQStringList::split(' ', viewbox.tqreplace(',', ' ').simplifyWhiteSpace());
viewBox()->baseVal()->setX(points[0].toFloat());
viewBox()->baseVal()->setY(points[1].toFloat());
diff --git a/ksvg/impl/SVGGlyphElementImpl.cc b/ksvg/impl/SVGGlyphElementImpl.cc
index 4fbc6bb7..ef891912 100644
--- a/ksvg/impl/SVGGlyphElementImpl.cc
+++ b/ksvg/impl/SVGGlyphElementImpl.cc
@@ -43,10 +43,10 @@ TQString SVGGlyphElementImpl::d() const
/*
@namespace KSVG
@begin SVGGlyphElementImpl::s_hashTable 11
- unicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly
+ tqunicode SVGGlyphElementImpl::Unicode DontDelete|ReadOnly
glyph-name SVGGlyphElementImpl::GlyphName DontDelete|ReadOnly
d SVGGlyphElementImpl::D DontDelete|ReadOnly
- orientation SVGGlyphElementImpl::Orientation DontDelete|ReadOnly
+ orientation SVGGlyphElementImpl::Qt::Orientation DontDelete|ReadOnly
arabic-form SVGGlyphElementImpl::ArabicForm DontDelete|ReadOnly
lang SVGGlyphElementImpl::Lang DontDelete|ReadOnly
horiz-adv-x SVGGlyphElementImpl::HorizAdvX DontDelete|ReadOnly
diff --git a/ksvg/impl/SVGHelperImpl.cc b/ksvg/impl/SVGHelperImpl.cc
index 7378b8f4..0a5f1093 100644
--- a/ksvg/impl/SVGHelperImpl.cc
+++ b/ksvg/impl/SVGHelperImpl.cc
@@ -58,13 +58,13 @@ void SVGHelperImpl::updateItem(KJS::ExecState *exec, const DOM::Node node)
SVGDocumentImpl *doc = Window::retrieveActive(exec)->doc();
// Update canvas, recursively if needed
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(doc->getElementFromHandle(node.handle()));
- if(shape && shape->item())
+ if(tqshape && tqshape->item())
{
- shape->item()->update(UPDATE_TRANSFORM);
- shape->item()->draw();
- shape->blit(doc->canvas());
+ tqshape->item()->update(UPDATE_TRANSFORM);
+ tqshape->item()->draw();
+ tqshape->blit(doc->canvas());
}
if(const_cast<DOM::Node &>(node).hasChildNodes())
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 49f48e7d..19152095 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -320,10 +320,10 @@ void SVGImageElementImpl::removeItem(KSVGCanvas *c)
void SVGImageElementImpl::setupSVGElement(SVGSVGElementImpl *svg)
{
// Set up the root svg for an svg image.
- svg->setAttributeInternal("x", TQString("%1").arg(x()->baseVal()->value()));
- svg->setAttributeInternal("y", TQString("%1").arg(y()->baseVal()->value()));
- svg->setAttributeInternal("width", TQString("%1").arg(width()->baseVal()->value()));
- svg->setAttributeInternal("height", TQString("%1").arg(height()->baseVal()->value()));
+ svg->setAttributeInternal("x", TQString("%1").tqarg(x()->baseVal()->value()));
+ svg->setAttributeInternal("y", TQString("%1").tqarg(y()->baseVal()->value()));
+ svg->setAttributeInternal("width", TQString("%1").tqarg(width()->baseVal()->value()));
+ svg->setAttributeInternal("height", TQString("%1").tqarg(height()->baseVal()->value()));
TQString par = getAttribute("preserveAspectRatio").string().stripWhiteSpace();
@@ -353,7 +353,7 @@ void SVGImageElementImpl::onScreenCTMUpdated()
SVGMatrixImpl *ctm = getScreenCTM();
m_svgRoot->setRootParentScreenCTM(ctm);
- m_svgRoot->invalidateCachedMatrices();
+ m_svgRoot->tqinvalidateCachedMatrices();
m_svgRoot->ownerDoc()->syncCachedMatrices();
}
}
@@ -380,7 +380,7 @@ bool SVGImageElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &, S
if(test && m_item)
{
- if(m_item->bbox().contains(p))
+ if(m_item->bbox().tqcontains(p))
{
mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
return true;
@@ -408,7 +408,7 @@ void SVGImageElementImpl::setImage(TQImage *image)
if(m_item)
{
- ownerDoc()->canvas()->invalidate(m_item, false);
+ ownerDoc()->canvas()->tqinvalidate(m_item, false);
ownerDoc()->rerender();
}
}
@@ -508,12 +508,12 @@ void SVGImageElementImpl::applyColorProfile(SVGColorProfileElementImpl *profile,
if(image->m_image)
{
- // Image is already painted, we apply the color profile and repaint it
+ // Image is already painted, we apply the color profile and tqrepaint it
image->applyColorProfile();
if(image->item())
{
- image->ownerDoc()->canvas()->invalidate(image->item(), false);
+ image->ownerDoc()->canvas()->tqinvalidate(image->item(), false);
image->ownerDoc()->rerender();
}
}
diff --git a/ksvg/impl/SVGImageElementImpl.h b/ksvg/impl/SVGImageElementImpl.h
index 922ef3f8..64a96421 100644
--- a/ksvg/impl/SVGImageElementImpl.h
+++ b/ksvg/impl/SVGImageElementImpl.h
@@ -52,6 +52,7 @@ class SVGImageElementImpl : public TQObject,
public SVGTransformableImpl
{
Q_OBJECT
+ TQ_OBJECT
public:
SVGImageElementImpl(DOM::ElementImpl *);
virtual ~SVGImageElementImpl();
@@ -85,7 +86,7 @@ public:
virtual SVGRectImpl *getBBox();
- // Screen-space clipping shape
+ // Screen-space clipping tqshape
KSVGPolygon clippingShape();
void onScreenCTMUpdated();
diff --git a/ksvg/impl/SVGLangSpaceImpl.cc b/ksvg/impl/SVGLangSpaceImpl.cc
index 92919698..5a55ef15 100644
--- a/ksvg/impl/SVGLangSpaceImpl.cc
+++ b/ksvg/impl/SVGLangSpaceImpl.cc
@@ -67,19 +67,19 @@ TQString SVGLangSpaceImpl::handleText(const TQString &data) const
{
// Spec: What to do here?
// It will convert all newline and tab characters into space characters
- result.replace("\n\r", TQString(" "));
- result.replace("\r\n", TQString(" "));
- result.replace('\t', ' ');
+ result.tqreplace("\n\r", TQString(" "));
+ result.tqreplace("\r\n", TQString(" "));
+ result.tqreplace('\t', ' ');
}
else if(xmlspace() == "default")
{
// Spec: What to do here?
- // First, it will remove all newline characters (replace)
+ // First, it will remove all newline characters (tqreplace)
// Then it will convert all tab characters into space characters (simplifyWhiteSpace)
// Then, it will strip off all leading and trailing space characters (stripWhiteSpace)
// Then, all contiguous space characters will be consolidated. (simplifyWhiteSpace)
- result.replace('\n', TQString::null);
- result.replace('\r', TQString::null);
+ result.tqreplace('\n', TQString());
+ result.tqreplace('\r', TQString());
result = result.stripWhiteSpace().simplifyWhiteSpace();
}
diff --git a/ksvg/impl/SVGLengthImpl.cc b/ksvg/impl/SVGLengthImpl.cc
index a8c9080c..da094837 100644
--- a/ksvg/impl/SVGLengthImpl.cc
+++ b/ksvg/impl/SVGLengthImpl.cc
@@ -282,9 +282,9 @@ void SVGLengthImpl::convertNumToPx()
bool sizeLocal = (style->getFontSize() != -1);
bool familyLocal = (style->getFontFamily() && style->getFontFamily()->getFirst());
- SVGStylableImpl *parentStyle = 0;
+ SVGStylableImpl *tqparentStyle = 0;
if((!sizeLocal || !familyLocal) && m_context)
- parentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle()));
+ tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle()));
// Look up font-size in a SAFE way, because at this place
// processStyle() has NOT yet been called, so we need
@@ -294,13 +294,13 @@ void SVGLengthImpl::convertNumToPx()
if(sizeLocal)
useSize = style->getFontSize();
- else if(parentStyle && parentStyle->getFontSize() != -1)
- useSize = parentStyle->getFontSize();
+ else if(tqparentStyle && tqparentStyle->getFontSize() != -1)
+ useSize = tqparentStyle->getFontSize();
if(familyLocal)
useFont = style->getFontFamily()->getFirst()->string();
- else if(parentStyle && parentStyle->getFontFamily() && parentStyle->getFontFamily()->getFirst())
- useFont = parentStyle->getFontFamily()->getFirst()->string();
+ else if(tqparentStyle && tqparentStyle->getFontFamily() && tqparentStyle->getFontFamily()->getFirst())
+ useFont = tqparentStyle->getFontFamily()->getFirst()->string();
if(m_unitType == SVG_LENGTHTYPE_EMS)
m_value = m_valueInSpecifiedUnits * useSize;
diff --git a/ksvg/impl/SVGLocatableImpl.cc b/ksvg/impl/SVGLocatableImpl.cc
index 0ae143fa..87ccd604 100644
--- a/ksvg/impl/SVGLocatableImpl.cc
+++ b/ksvg/impl/SVGLocatableImpl.cc
@@ -79,9 +79,9 @@ SVGMatrixImpl *SVGLocatableImpl::getTransformToElement(SVGElementImpl *)
return ret;
}
-void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
+void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM)
{
- m_cachedScreenCTM->copy(parentScreenCTM);
+ m_cachedScreenCTM->copy(tqparentScreenCTM);
const SVGMatrixImpl *local = localMatrix();
@@ -92,13 +92,13 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCT
// Notify the element
onScreenCTMUpdated();
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
- if(shape)
+ if(tqshape)
{
// TODO: Update due to matrix animations
- //if(shape->item())
- // shape->item()->update(updateReason);
+ //if(tqshape->item())
+ // tqshape->item()->update(updateReason);
SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
@@ -114,14 +114,14 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCT
}
}
-void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
+void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM)
{
if(m_cachedScreenCTMIsValid)
{
SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(this);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(this);
- if(shape)
+ if(tqshape)
{
DOM::Node node = element->firstChild();
for(; !node.isNull(); node = node.nextSibling())
@@ -135,7 +135,7 @@ void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM
}
}
else
- updateCachedScreenCTM(parentScreenCTM);
+ updateCachedScreenCTM(tqparentScreenCTM);
}
// Ecma stuff
@@ -184,9 +184,9 @@ Value SVGLocatableImplProtoFunc::call(ExecState *exec, Object &thisObj, const Li
return container->getBBox()->cache(exec);
else
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(obj);
- if(shape)
- return shape->getBBox()->cache(exec);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(obj);
+ if(tqshape)
+ return tqshape->getBBox()->cache(exec);
else
return obj->getBBox()->cache(exec);
}
diff --git a/ksvg/impl/SVGLocatableImpl.h b/ksvg/impl/SVGLocatableImpl.h
index 81ce3326..49469164 100644
--- a/ksvg/impl/SVGLocatableImpl.h
+++ b/ksvg/impl/SVGLocatableImpl.h
@@ -52,14 +52,14 @@ public:
virtual const SVGMatrixImpl *localMatrix() { return 0; }
bool cachedScreenCTMIsValid() const { return m_cachedScreenCTMIsValid; }
- void invalidateCachedMatrices() { m_cachedScreenCTMIsValid = false; }
+ void tqinvalidateCachedMatrices() { m_cachedScreenCTMIsValid = false; }
// If the cached matrix is invalid, update it and update any child elements
// recursively. Otherwise, check child elements recursively.
- virtual void checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
+ virtual void checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM);
// Update the cached matrix, and update child element cached matrices,
// recursively.
- virtual void updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
+ virtual void updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM);
// Called immediately after the screen ctm has been updated.
virtual void onScreenCTMUpdated() {}
diff --git a/ksvg/impl/SVGMarkerElementImpl.cc b/ksvg/impl/SVGMarkerElementImpl.cc
index a621b47f..c10d5280 100644
--- a/ksvg/impl/SVGMarkerElementImpl.cc
+++ b/ksvg/impl/SVGMarkerElementImpl.cc
@@ -236,21 +236,21 @@ void SVGMarkerElementImpl::draw(SVGShapeImpl *referencingElement, double x, doub
for(; !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && style && ok && style->getVisible() && style->getDisplay())
+ if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
{
SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
if(locatable)
locatable->updateCachedScreenCTM(mtx);
- shape->update(UPDATE_TRANSFORM);
- shape->setReferenced(true);
- shape->draw();
- shape->setReferenced(false);
+ tqshape->update(UPDATE_TRANSFORM);
+ tqshape->setReferenced(true);
+ tqshape->draw();
+ tqshape->setReferenced(false);
}
}
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index d0f90974..b7f26ed3 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -63,11 +63,11 @@ SVGMaskElementImpl::SVGMaskElementImpl(DOM::ElementImpl *impl) : SVGElementImpl(
m_height = new SVGAnimatedLengthImpl(LENGTHMODE_HEIGHT, this);
m_height->ref();
- m_maskUnits = new SVGAnimatedEnumerationImpl();
- m_maskUnits->ref();
+ m_tqmaskUnits = new SVGAnimatedEnumerationImpl();
+ m_tqmaskUnits->ref();
- m_maskContentUnits = new SVGAnimatedEnumerationImpl();
- m_maskContentUnits->ref();
+ m_tqmaskContentUnits = new SVGAnimatedEnumerationImpl();
+ m_tqmaskContentUnits->ref();
m_converter = new SVGUnitConverter();
m_converter->add(m_x);
@@ -77,7 +77,7 @@ SVGMaskElementImpl::SVGMaskElementImpl(DOM::ElementImpl *impl) : SVGElementImpl(
m_canvas = 0;
- m_maskCache.setMaxTotalCost(1024 * 1024);
+ m_tqmaskCache.setMaxTotalCost(1024 * 1024);
}
SVGMaskElementImpl::~SVGMaskElementImpl()
@@ -90,23 +90,23 @@ SVGMaskElementImpl::~SVGMaskElementImpl()
m_width->deref();
if(m_height)
m_height->deref();
- if(m_maskUnits)
- m_maskContentUnits->deref();
- if(m_maskUnits)
- m_maskContentUnits->deref();
+ if(m_tqmaskUnits)
+ m_tqmaskContentUnits->deref();
+ if(m_tqmaskUnits)
+ m_tqmaskContentUnits->deref();
delete m_converter;
if(m_canvas)
delete m_canvas;
}
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskUnits() const
{
- return m_maskUnits;
+ return m_tqmaskUnits;
}
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskContentUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskContentUnits() const
{
- return m_maskContentUnits;
+ return m_tqmaskContentUnits;
}
SVGAnimatedLengthImpl *SVGMaskElementImpl::x() const
@@ -132,8 +132,8 @@ SVGAnimatedLengthImpl *SVGMaskElementImpl::height() const
/*
@namespace KSVG
@begin SVGMaskElementImpl::s_hashTable 7
- maskUnits SVGMaskElementImpl::MaskUnits DontDelete|ReadOnly
- maskContentUnits SVGMaskElementImpl::MaskContentUnits DontDelete|ReadOnly
+ tqmaskUnits SVGMaskElementImpl::MaskUnits DontDelete|ReadOnly
+ tqmaskContentUnits SVGMaskElementImpl::MaskContentUnits DontDelete|ReadOnly
x SVGMaskElementImpl::X DontDelete|ReadOnly
y SVGMaskElementImpl::Y DontDelete|ReadOnly
width SVGMaskElementImpl::Width DontDelete|ReadOnly
@@ -148,14 +148,14 @@ Value SVGMaskElementImpl::getValueProperty(ExecState *exec, int token) const
{
case MaskUnits:
if(!attributeMode)
- return m_maskUnits->cache(exec);
+ return m_tqmaskUnits->cache(exec);
else
- return Number(m_maskUnits->baseVal());
+ return Number(m_tqmaskUnits->baseVal());
case MaskContentUnits:
if(!attributeMode)
- return m_maskContentUnits->cache(exec);
+ return m_tqmaskContentUnits->cache(exec);
else
- return Number(m_maskContentUnits->baseVal());
+ return Number(m_tqmaskContentUnits->baseVal());
case X:
if(!attributeMode)
return m_x->cache(exec);
@@ -194,15 +194,15 @@ void SVGMaskElementImpl::putValueProperty(ExecState *exec, int token, const Valu
{
case MaskUnits:
if(value.toString(exec).qstring() == "objectBoundingBox")
- m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+ m_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
else
- m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+ m_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
break;
case MaskContentUnits:
if(value.toString(exec).qstring() == "objectBoundingBox")
- m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+ m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
else
- m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+ m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
break;
case X:
converter()->modify(x(), value.toString(exec).qstring());
@@ -262,19 +262,19 @@ void SVGMaskElementImpl::setAttributes()
SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight)
{
- converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
+ converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
- Q_UINT32 *imageBits = new Q_UINT32[imageWidth * imageHeight];
+ TQ_UINT32 *imageBits = new TQ_UINT32[imageWidth * imageHeight];
if(m_canvas == 0)
m_canvas = CanvasFactory::self()->loadCanvas(imageWidth, imageHeight);
m_canvas->setup(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight);
- m_canvas->setBackgroundColor(qRgba(0, 0, 0, 0));
+ m_canvas->setBackgroundColor(tqRgba(0, 0, 0, 0));
SVGMatrixImpl *baseMatrix = SVGSVGElementImpl::createSVGMatrix();
- // Set the scale to map the mask onto the image
+ // Set the scale to map the tqmask onto the image
double xScale = static_cast<double>(imageWidth) / width()->baseVal()->value();
double yScale = static_cast<double>(imageHeight) / height()->baseVal()->value();
@@ -282,12 +282,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
SVGRectImpl *bbox = referencingElement->getBBox();
- if(maskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
baseMatrix->translate(-(bbox->x() + x()->baseVal()->value()), -(bbox->y() + y()->baseVal()->value()));
else
baseMatrix->translate(-x()->baseVal()->value(), -y()->baseVal()->value());
- if(maskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(tqmaskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
{
baseMatrix->translate(bbox->x(), bbox->y());
baseMatrix->scaleNonUniform(bbox->width(), bbox->height());
@@ -296,22 +296,22 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && style && ok && style->getVisible() && style->getDisplay())
+ if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
{
SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
if(locatable)
locatable->updateCachedScreenCTM(baseMatrix);
element->createItem(m_canvas);
- if(shape->item())
+ if(tqshape->item())
{
- shape->item()->setReferenced(true);
- m_canvas->invalidate(shape->item(), true);
+ tqshape->item()->setReferenced(true);
+ m_canvas->tqinvalidate(tqshape->item(), true);
}
}
}
@@ -321,33 +321,33 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
for(DOM::Node node = firstChild(); !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && style && ok && style->getVisible() && style->getDisplay())
+ if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
{
- if(shape)
- shape->removeItem(m_canvas);
+ if(tqshape)
+ tqshape->removeItem(m_canvas);
}
}
{
// Note: r and b reversed
- //TQImage maskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
- //maskImage.setAlphaBuffer(true);
- //maskImage.save("mask.png", "PNG");
+ //TQImage tqmaskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
+ //tqmaskImage.setAlphaBuffer(true);
+ //tqmaskImage.save("tqmask.png", "PNG");
}
- TQByteArray maskData(imageWidth * imageHeight);
+ TQByteArray tqmaskData(imageWidth * imageHeight);
const double epsilon = DBL_EPSILON;
- // Convert the rgba image into an 8-bit mask, according to the specs.
+ // Convert the rgba image into an 8-bit tqmask, according to the specs.
for(int i = 0; i < imageWidth * imageHeight; i++)
{
- Q_UINT32 rgba = imageBits[i];
+ TQ_UINT32 rgba = imageBits[i];
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
double r = (rgba & 0xff) / 255.0;
@@ -378,9 +378,9 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
double luminanceAlpha = 0.2125 * r + 0.7154 * g + 0.0721 * b;
// Multiply by alpha.
- double maskValue = luminanceAlpha * a;
+ double tqmaskValue = luminanceAlpha * a;
- maskData[i] = static_cast<unsigned char>(maskValue * 255 + 0.5);
+ tqmaskData[i] = static_cast<unsigned char>(tqmaskValue * 255 + 0.5);
}
delete [] imageBits;
@@ -388,16 +388,16 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
baseMatrix->deref();
bbox->deref();
- // The screenToMask matrix is calculated each time the mask is used so we don't
+ // The screenToMask matrix is calculated each time the tqmask is used so we don't
// need to set it here.
TQWMatrix tempMatrix;
- return Mask(maskData, tempMatrix, imageWidth, imageHeight);
+ return Mask(tqmaskData, tempMatrix, imageWidth, imageHeight);
}
SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement)
{
- converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
+ converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
SVGMatrixImpl *refCTM = 0;
SVGLocatableImpl *locatableRef = dynamic_cast<SVGLocatableImpl *>(referencingElement);
@@ -414,26 +414,26 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
int imageWidth = static_cast<int>(width()->baseVal()->value() * xScale + 0.5);
int imageHeight = static_cast<int>(height()->baseVal()->value() * yScale + 0.5);
- Mask mask;
+ Mask tqmask;
if(imageWidth > 0 && imageHeight > 0)
{
CacheKey key(referencingElement, imageWidth, imageHeight);
- if(!m_maskCache.find(key, mask))
+ if(!m_tqmaskCache.tqfind(key, tqmask))
{
- mask = createMask(referencingElement, imageWidth, imageHeight);
- m_maskCache.insert(key, mask, imageWidth * imageHeight);
+ tqmask = createMask(referencingElement, imageWidth, imageHeight);
+ m_tqmaskCache.insert(key, tqmask, imageWidth * imageHeight);
}
- // Generate a mask-coordinates to screen-coordinates matrix
+ // Generate a tqmask-coordinates to screen-coordinates matrix
SVGMatrixImpl *matrix = 0;
if(locatableRef)
matrix = locatableRef->getScreenCTM();
else
matrix = SVGSVGElementImpl::createSVGMatrix();
- if(maskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
{
SVGRectImpl *bbox = referencingElement->getBBox();
matrix->translate(bbox->x() + x()->baseVal()->value(), bbox->y() + y()->baseVal()->value());
@@ -447,46 +447,46 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
TQWMatrix screenToMask = matrix->qmatrix().invert();
matrix->deref();
- mask.setScreenToMask(screenToMask);
+ tqmask.setScreenToMask(screenToMask);
}
- return mask;
+ return tqmask;
}
-TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle)
+TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
{
TQByteArray cumulativeMask;
do
{
- SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(shape);
+ SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(tqshape);
if(style && style->hasMask())
{
- SVGElementImpl *element = shape->ownerDoc()->rootElement()->getElementById(style->getMask());
+ SVGElementImpl *element = tqshape->ownerDoc()->rootElement()->getElementById(style->getMask());
if(element)
{
- SVGMaskElementImpl *maskElement = dynamic_cast<SVGMaskElementImpl *>(element);
+ SVGMaskElementImpl *tqmaskElement = dynamic_cast<SVGMaskElementImpl *>(element);
- if(maskElement)
+ if(tqmaskElement)
{
- SVGMaskElementImpl::Mask mask = maskElement->createMask(shape);
+ SVGMaskElementImpl::Mask tqmask = tqmaskElement->createMask(tqshape);
- if(!mask.isEmpty())
+ if(!tqmask.isEmpty())
{
- TQByteArray maskData = mask.rectangle(screenRectangle);
+ TQByteArray tqmaskData = tqmask.rectangle(screenRectangle);
if(cumulativeMask.size() == 0)
- cumulativeMask = maskData;
+ cumulativeMask = tqmaskData;
else
{
int size = cumulativeMask.size();
- // Multiply into the cumulative mask (using fast divide by 255)
+ // Multiply into the cumulative tqmask (using fast divide by 255)
for(int i = 0; i < size; i++)
{
- int tmp = maskData[i] * cumulativeMask[i] + 0x80;
+ int tmp = tqmaskData[i] * cumulativeMask[i] + 0x80;
cumulativeMask[i] = (tmp + (tmp >> 8)) >> 8;
}
}
@@ -495,27 +495,27 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *shape, const TQRect&
}
}
- DOM::Node parentNode = shape->parentNode();
+ DOM::Node tqparentNode = tqshape->parentNode();
- if(!parentNode.isNull())
+ if(!tqparentNode.isNull())
{
- SVGElementImpl *parent = shape->ownerDoc()->getElementFromHandle(parentNode.handle());
+ SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(tqparentNode.handle());
- if(parent)
- shape = dynamic_cast<SVGShapeImpl *>(parent);
+ if(tqparent)
+ tqshape = dynamic_cast<SVGShapeImpl *>(tqparent);
else
- shape = 0;
+ tqshape = 0;
}
else
- shape = 0;
+ tqshape = 0;
- } while(shape);
+ } while(tqshape);
return cumulativeMask;
}
-SVGMaskElementImpl::Mask::Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height)
- : m_width(width), m_height(height), m_mask(mask), m_screenToMask(screenToMask)
+SVGMaskElementImpl::Mask::Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height)
+ : m_width(width), m_height(height), m_tqmask(tqmask), m_screenToMask(screenToMask)
{
}
diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h
index 2a96967c..4631ebae 100644
--- a/ksvg/impl/SVGMaskElementImpl.h
+++ b/ksvg/impl/SVGMaskElementImpl.h
@@ -56,7 +56,7 @@ public:
{
public:
Mask() : m_width(0), m_height(0) {}
- Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height);
+ Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height);
~Mask() {}
bool isEmpty() const { return m_width == 0; }
@@ -68,15 +68,15 @@ public:
private:
int m_width;
int m_height;
- TQByteArray m_mask;
+ TQByteArray m_tqmask;
TQWMatrix m_screenToMask;
};
SVGMaskElementImpl(DOM::ElementImpl *);
virtual ~SVGMaskElementImpl();
- SVGAnimatedEnumerationImpl *maskUnits() const;
- SVGAnimatedEnumerationImpl *maskContentUnits() const;
+ SVGAnimatedEnumerationImpl *tqmaskUnits() const;
+ SVGAnimatedEnumerationImpl *tqmaskContentUnits() const;
SVGAnimatedLengthImpl *x() const;
SVGAnimatedLengthImpl *y() const;
SVGAnimatedLengthImpl *width() const;
@@ -89,10 +89,10 @@ public:
Mask createMask(SVGShapeImpl *referencingElement);
- // Compute the mask on a given shape, taking into account all masks defined
- // on the shape's ancestors. This is a workaround for us not having a buffer
- // for container elements, so we can't mask containers directly.
- static TQByteArray maskRectangle(SVGShapeImpl *shape, const TQRect& screenRectangle);
+ // Compute the tqmask on a given tqshape, taking into account all tqmasks defined
+ // on the tqshape's ancestors. This is a workaround for us not having a buffer
+ // for container elements, so we can't tqmask containers directly.
+ static TQByteArray tqmaskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
private:
class CacheKey
@@ -110,8 +110,8 @@ private:
Mask createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight);
- SVGAnimatedEnumerationImpl *m_maskUnits;
- SVGAnimatedEnumerationImpl *m_maskContentUnits;
+ SVGAnimatedEnumerationImpl *m_tqmaskUnits;
+ SVGAnimatedEnumerationImpl *m_tqmaskContentUnits;
SVGAnimatedLengthImpl *m_x;
SVGAnimatedLengthImpl *m_y;
SVGAnimatedLengthImpl *m_width;
@@ -120,7 +120,7 @@ private:
SVGUnitConverter *m_converter;
KSVGCanvas *m_canvas;
- MinOneLRUCache<CacheKey, Mask> m_maskCache;
+ MinOneLRUCache<CacheKey, Mask> m_tqmaskCache;
public:
KSVG_GET
@@ -137,7 +137,7 @@ public:
void putValueProperty(KJS::ExecState *exec, int token, const KJS::Value &value, int attr);
};
-KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "mask")
+KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "tqmask")
inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) const
{
@@ -146,7 +146,7 @@ inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) c
m_screenToMask.map(screenX, screenY, &x, &y);
if(x >= 0 && x < m_width && y >= 0 && y < m_height)
- return m_mask[x + y * m_width];
+ return m_tqmask[x + y * m_width];
else
return 0;
}
diff --git a/ksvg/impl/SVGPathElementImpl.cc b/ksvg/impl/SVGPathElementImpl.cc
index 506ad01a..5a0d0057 100644
--- a/ksvg/impl/SVGPathElementImpl.cc
+++ b/ksvg/impl/SVGPathElementImpl.cc
@@ -678,21 +678,21 @@ SVGPathElementImpl::MarkerData::MarkerData(SVGPathSegListImpl *path)
previousCubicY2 = cury + s->y2();
break;
}
- case PATHSEG_CURVETO_QUADRATIC_ABS:
+ case PATHSEG_CURVETO_TQUADRATIC_ABS:
{
SVGPathSegCurvetoQuadraticAbsImpl *s = static_cast<SVGPathSegCurvetoQuadraticAbsImpl *>(segment);
previousQuadraticX1 = s->x1();
previousQuadraticY1 = s->y1();
break;
}
- case PATHSEG_CURVETO_QUADRATIC_REL:
+ case PATHSEG_CURVETO_TQUADRATIC_REL:
{
SVGPathSegCurvetoQuadraticRelImpl *s = static_cast<SVGPathSegCurvetoQuadraticRelImpl *>(segment);
previousQuadraticX1 = curx + s->x1();
previousQuadraticY1 = cury + s->y1();
break;
}
- case PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
+ case PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS:
{
SVGPathSegCurvetoQuadraticSmoothAbsImpl *s = static_cast<SVGPathSegCurvetoQuadraticSmoothAbsImpl *>(segment);
s->setPreviousX1(previousQuadraticX1);
@@ -701,7 +701,7 @@ SVGPathElementImpl::MarkerData::MarkerData(SVGPathSegListImpl *path)
previousQuadraticY1 = s->y1(cury);
break;
}
- case PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
+ case PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL:
{
SVGPathSegCurvetoQuadraticSmoothRelImpl *s = static_cast<SVGPathSegCurvetoQuadraticSmoothRelImpl *>(segment);
s->setPreviousAbsX1(previousQuadraticX1);
diff --git a/ksvg/impl/SVGPathSegArcImpl.h b/ksvg/impl/SVGPathSegArcImpl.h
index d8a1f8f9..d77f0497 100644
--- a/ksvg/impl/SVGPathSegArcImpl.h
+++ b/ksvg/impl/SVGPathSegArcImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_ARC_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "A"; }
- virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("A %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); }
void setX(double x);
double x() const;
@@ -94,7 +94,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_ARC_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "a"; }
- virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").arg(m_r1).arg(m_r2).arg(m_angle).arg(m_largeArcFlag).arg(m_sweepFlag).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("a %1 %2 %3 %4 %5 %6 %7").tqarg(m_r1).tqarg(m_r2).tqarg(m_angle).tqarg(m_largeArcFlag).tqarg(m_sweepFlag).tqarg(m_x).tqarg(m_y); }
void setX(double x);
double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
index 83f4de6b..7ab3a87b 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoCubicImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "C"; }
- virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("C %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -88,7 +88,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "c"; }
- virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").arg(m_x1).arg(m_y1).arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("c %1 %2 %3 %4 %5 %6").tqarg(m_x1).tqarg(m_y1).tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
index 3bcc8c87..ff52bfab 100644
--- a/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoCubicSmoothImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "S"; }
- virtual TQString toString() const { return TQString("S %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("S %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -88,7 +88,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "s"; }
- virtual TQString toString() const { return TQString("s %1 %2 %3 %4").arg(m_x2).arg(m_y2).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("s %1 %2 %3 %4").tqarg(m_x2).tqarg(m_y2).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
index 6772605f..d8e876b5 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticImpl.h
@@ -34,9 +34,9 @@ public:
SVGPathSegCurvetoQuadraticAbsImpl();
virtual ~SVGPathSegCurvetoQuadraticAbsImpl();
- virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_ABS; }
+ virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "Q"; }
- virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("Q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -78,9 +78,9 @@ public:
SVGPathSegCurvetoQuadraticRelImpl();
virtual ~SVGPathSegCurvetoQuadraticRelImpl();
- virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_REL; }
+ virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "q"; }
- virtual TQString toString() const { return TQString("q %1 %2 %3 %4").arg(m_x1).arg(m_y1).arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("q %1 %2 %3 %4").tqarg(m_x1).tqarg(m_y1).tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
index 6c471bd6..be0a4033 100644
--- a/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
+++ b/ksvg/impl/SVGPathSegCurvetoQuadraticSmoothImpl.h
@@ -34,9 +34,9 @@ public:
SVGPathSegCurvetoQuadraticSmoothAbsImpl();
virtual ~SVGPathSegCurvetoQuadraticSmoothAbsImpl();
- virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS; }
+ virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "T"; }
- virtual TQString toString() const { return TQString("T %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("T %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -78,9 +78,9 @@ public:
SVGPathSegCurvetoQuadraticSmoothRelImpl();
virtual ~SVGPathSegCurvetoQuadraticSmoothRelImpl();
- virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL; }
+ virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "t"; }
- virtual TQString toString() const { return TQString("t %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("t %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegImpl.cc b/ksvg/impl/SVGPathSegImpl.cc
index c1f2934d..ba2c8ec2 100644
--- a/ksvg/impl/SVGPathSegImpl.cc
+++ b/ksvg/impl/SVGPathSegImpl.cc
@@ -79,8 +79,8 @@ Value SVGPathSegImpl::getValueProperty(ExecState *, int token) const
PATHSEG_LINETO_REL KSVG::PATHSEG_LINETO_REL DontDelete|ReadOnly
PATHSEG_CURVETO_CUBIC_ABS KSVG::PATHSEG_CURVETO_CUBIC_ABS DontDelete|ReadOnly
PATHSEG_CURVETO_CUBIC_REL KSVG::PATHSEG_CURVETO_CUBIC_REL DontDelete|ReadOnly
- PATHSEG_CURVETO_QUADRATIC_ABS KSVG::PATHSEG_CURVETO_QUADRATIC_ABS DontDelete|ReadOnly
- PATHSEG_CURVETO_QUADRATIC_REL KSVG::PATHSEG_CURVETO_QUADRATIC_REL DontDelete|ReadOnly
+ PATHSEG_CURVETO_TQUADRATIC_ABS KSVG::PATHSEG_CURVETO_TQUADRATIC_ABS DontDelete|ReadOnly
+ PATHSEG_CURVETO_TQUADRATIC_REL KSVG::PATHSEG_CURVETO_TQUADRATIC_REL DontDelete|ReadOnly
PATHSEG_ARC_ABS KSVG::PATHSEG_ARC_ABS DontDelete|ReadOnly
PATHSEG_ARC_REL KSVG::PATHSEG_ARC_REL DontDelete|ReadOnly
PATHSEG_LINETO_HORIZONTAL_ABS KSVG::PATHSEG_LINETO_HORIZONTAL_ABS DontDelete|ReadOnly
@@ -89,8 +89,8 @@ Value SVGPathSegImpl::getValueProperty(ExecState *, int token) const
PATHSEG_LINETO_VERTICAL_REL KSVG::PATHSEG_LINETO_VERTICAL_REL DontDelete|ReadOnly
PATHSEG_CURVETO_CUBIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS DontDelete|ReadOnly
PATHSEG_CURVETO_CUBIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_CUBIC_SMOOTH_REL DontDelete|ReadOnly
- PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS DontDelete|ReadOnly
- PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL DontDelete|ReadOnly
+ PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_ABS DontDelete|ReadOnly
+ PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL KSVG::PATHSEG_CURVETO_TQUADRATIC_SMOOTH_REL DontDelete|ReadOnly
@end
*/
diff --git a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
index 52355c5d..f170b303 100644
--- a/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoHorizontalImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "H"; }
- virtual TQString toString() const { return TQString("H %1").arg(m_x); }
+ virtual TQString toString() const { return TQString("H %1").tqarg(m_x); }
void setX(const double &);
double x() const;
@@ -68,7 +68,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "h"; }
- virtual TQString toString() const { return TQString("h %1").arg(m_x); }
+ virtual TQString toString() const { return TQString("h %1").tqarg(m_x); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegLinetoImpl.h b/ksvg/impl/SVGPathSegLinetoImpl.h
index 78df51b9..69caeba4 100644
--- a/ksvg/impl/SVGPathSegLinetoImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "L"; }
- virtual TQString toString() const { return TQString("L %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("L %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -72,7 +72,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "l"; }
- virtual TQString toString() const { return TQString("l %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("l %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
index 1bbf41f4..9e50405f 100644
--- a/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
+++ b/ksvg/impl/SVGPathSegLinetoVerticalImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "V"; }
- virtual TQString toString() const { return TQString("V %1").arg(m_y); }
+ virtual TQString toString() const { return TQString("V %1").tqarg(m_y); }
void setY(const double &);
double y() const;
@@ -68,7 +68,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "v"; }
- virtual TQString toString() const { return TQString("v %1").arg(m_y); }
+ virtual TQString toString() const { return TQString("v %1").tqarg(m_y); }
void setY(const double &);
double y() const;
diff --git a/ksvg/impl/SVGPathSegMovetoImpl.h b/ksvg/impl/SVGPathSegMovetoImpl.h
index 6db95702..dfa25935 100644
--- a/ksvg/impl/SVGPathSegMovetoImpl.h
+++ b/ksvg/impl/SVGPathSegMovetoImpl.h
@@ -36,7 +36,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "M"; }
- virtual TQString toString() const { return TQString("M %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("M %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
@@ -72,7 +72,7 @@ public:
virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; }
virtual DOM::DOMString pathSegTypeAsLetter() const { return "m"; }
- virtual TQString toString() const { return TQString("m %1 %2").arg(m_x).arg(m_y); }
+ virtual TQString toString() const { return TQString("m %1 %2").tqarg(m_x).tqarg(m_y); }
void setX(const double &);
double x() const;
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc
index 24d03239..99c79ff6 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cc
@@ -314,7 +314,7 @@ TQImage SVGPatternElementImpl::createTile(SVGShapeImpl *referencingElement, int
if(m_canvas == 0)
{
m_canvas = CanvasFactory::self()->loadCanvas(image.width(), image.height());
- m_canvas->setBackgroundColor(qRgba(0, 0, 0, 0));
+ m_canvas->setBackgroundColor(tqRgba(0, 0, 0, 0));
}
m_canvas->setup(image.bits(), image.width(), image.height());
@@ -350,22 +350,22 @@ TQImage SVGPatternElementImpl::createTile(SVGShapeImpl *referencingElement, int
for(DOM::Node node = m_location->firstChild(); !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && style && ok && style->getVisible() && style->getDisplay())
+ if(element && tqshape && style && ok && style->getVisible() && style->getDisplay())
{
SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(element);
if(locatable)
locatable->updateCachedScreenCTM(baseMatrix);
element->createItem(m_canvas);
- if(shape->item())
+ if(tqshape->item())
{
- shape->item()->setReferenced(true);
- m_canvas->invalidate(shape->item(), true);
+ tqshape->item()->setReferenced(true);
+ m_canvas->tqinvalidate(tqshape->item(), true);
}
}
}
@@ -433,7 +433,7 @@ void SVGPatternElementImpl::reference(const TQString &href)
SVGHelperImpl::copyAttributes(src, this);
// Spec: Change location to referenced element so we
- // can take the children elements to render from there
+ // can take the tqchildren elements to render from there
if(m_location == this)
m_location = src;
}
@@ -486,7 +486,7 @@ SVGPatternElementImpl::Tile SVGPatternElementImpl::createTile(SVGShapeImpl *refe
TQSize size(imageWidth, imageHeight);
TQImage image;
- if(!m_tileCache.find(size, image))
+ if(!m_tileCache.tqfind(size, image))
{
image = createTile(referencingElement, imageWidth, imageHeight);
m_tileCache.insert(size, image, image.width() * image.height() * 4);
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc
index c9b82445..b436ee73 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cc
@@ -166,7 +166,7 @@ void SVGSVGElementImpl::setAttributes()
m_viewport->setWidth(width()->baseVal()->value());
m_viewport->setHeight(height()->baseVal()->value());
- if(isRootElement() && ownerDoc()->parentImage() == 0)
+ if(isRootElement() && ownerDoc()->tqparentImage() == 0)
{
if(ownerDoc()->canvas())
ownerDoc()->canvas()->setViewportDimension(int(ceil(width()->baseVal()->value() * currentScale())), int(ceil(height()->baseVal()->value() * currentScale())));
@@ -271,7 +271,7 @@ void SVGSVGElementImpl::setCurrentScale(float currentScale)
if( m_currentScale != currentScale )
{
m_currentScale = currentScale;
- invalidateCachedMatrices();
+ tqinvalidateCachedMatrices();
if(hasEventListener(SVGEvent::ZOOM_EVENT, true))
dispatchEvent(SVGEvent::ZOOM_EVENT, false, false);
@@ -289,7 +289,7 @@ void SVGSVGElementImpl::setCurrentTranslate(const TQPoint &p)
{
m_currentTranslate->setX(p.x());
m_currentTranslate->setY(p.y());
- invalidateCachedMatrices();
+ tqinvalidateCachedMatrices();
if(hasEventListener(SVGEvent::SCROLL_EVENT, true))
dispatchEvent(SVGEvent::SCROLL_EVENT, false, false);
}
@@ -372,18 +372,18 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
for(; !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
- if(shape)
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+ if(tqshape)
{
- if(shape->isContainer())
+ if(tqshape->isContainer())
// TODO : pass it on to container::getEnclosureList() which should return a NodeList
- kdDebug() << "!shape" << endl;
+ kdDebug() << "!tqshape" << endl;
else
{
- // TODO : add the shape to list if the test succeeds
- SVGRectImpl *current = shape->getBBox();
- if(rect->qrect().contains(current->qrect(), true))
- kdDebug() << "shape : " << element->nodeName().string() << " is fully enclosed" << endl;
+ // TODO : add the tqshape to list if the test succeeds
+ SVGRectImpl *current = tqshape->getBBox();
+ if(rect->qrect().tqcontains(current->qrect(), true))
+ kdDebug() << "tqshape : " << element->nodeName().string() << " is fully enclosed" << endl;
current->deref();
}
@@ -395,11 +395,11 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl *rect)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
- if(!shape)
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+ if(!tqshape)
return false;
- SVGRectImpl *current = shape->getBBox();
+ SVGRectImpl *current = tqshape->getBBox();
bool result = rect->qrect().intersects(current->qrect());
current->deref();
return result;
@@ -407,12 +407,12 @@ bool SVGSVGElementImpl::checkIntersection(SVGElementImpl *element, SVGRectImpl *
bool SVGSVGElementImpl::checkEnclosure(SVGElementImpl *element, SVGRectImpl *rect)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
- if(!shape)
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
+ if(!tqshape)
return false;
- SVGRectImpl *current = shape->getBBox();
- bool result = rect->qrect().contains(current->qrect());
+ SVGRectImpl *current = tqshape->getBBox();
+ bool result = rect->qrect().tqcontains(current->qrect());
current->deref();
return result;
}
@@ -672,7 +672,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
elem = (*it)->element();
if(elem)
{
- // Check if mouse is over a certain shape...
+ // Check if mouse is over a certain tqshape...
// mop: once an element has been found check eventlisteners and leave immediately
ret = elem->prepareMouseEvent(p, userA, mev);
if(ret) break;
@@ -693,7 +693,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
dorerender = true; // mop: if it has the event then rerender
}
- // If a mouse "moves" over a shape, it's also "over" the shape
+ // If a mouse "moves" over a tqshape, it's also "over" the tqshape
if(mev->id() == SVGEvent::MOUSEMOVE_EVENT)
{
mev->target()->setMouseOver(true);
@@ -742,7 +742,7 @@ bool SVGSVGElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &a, SV
}
}
- // The mouse is over a shape, so we have a target..we need to register that for a mouseout
+ // The mouse is over a tqshape, so we have a target..we need to register that for a mouseout
ownerDoc()->setLastTarget(mev->target());
}
diff --git a/ksvg/impl/SVGSVGElementImpl.h b/ksvg/impl/SVGSVGElementImpl.h
index d2667a35..b5d6212d 100644
--- a/ksvg/impl/SVGSVGElementImpl.h
+++ b/ksvg/impl/SVGSVGElementImpl.h
@@ -158,7 +158,7 @@ private:
TQMap<TQString, SVGElementImpl *> m_map;
- // Transformation provided by the 'parent' of the outermost svg element
+ // Transformation provided by the 'tqparent' of the outermost svg element
SVGMatrixImpl *m_rootParentScreenCTM;
SVGMatrixImpl *m_localMatrix;
diff --git a/ksvg/impl/SVGScriptElementImpl.cc b/ksvg/impl/SVGScriptElementImpl.cc
index 230adf25..c7e6994e 100644
--- a/ksvg/impl/SVGScriptElementImpl.cc
+++ b/ksvg/impl/SVGScriptElementImpl.cc
@@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(KIO::Job *)
m_data[m_data.size() - 1] = '\0';
TQBuffer buf(m_data);
- TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false);
+ TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false);
TQByteArray contents;
if(dev->open(IO_ReadOnly))
contents = dev->readAll();
diff --git a/ksvg/impl/SVGScriptElementImpl.h b/ksvg/impl/SVGScriptElementImpl.h
index f3662fa6..50ff92b2 100644
--- a/ksvg/impl/SVGScriptElementImpl.h
+++ b/ksvg/impl/SVGScriptElementImpl.h
@@ -42,6 +42,7 @@ class SVGScriptElementImpl : public TQObject,
public SVGExternalResourcesRequiredImpl
{
Q_OBJECT
+ TQ_OBJECT
public:
SVGScriptElementImpl(DOM::ElementImpl *);
virtual ~SVGScriptElementImpl();
diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cc
index d8ef45c5..255ab286 100644
--- a/ksvg/impl/SVGShapeImpl.cc
+++ b/ksvg/impl/SVGShapeImpl.cc
@@ -59,9 +59,9 @@ SVGShapeImpl::~SVGShapeImpl()
bool SVGShapeImpl::directRender()
{
- SVGShapeImpl *parent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle()));
- if(parent)
- return parent->directRender();
+ SVGShapeImpl *tqparent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle()));
+ if(tqparent)
+ return tqparent->directRender();
else
return true;
}
@@ -125,10 +125,10 @@ void SVGShapeImpl::update(CanvasItemUpdate reason, int param1, int param2)
m_item->update(reason, param1, param2);
}
-void SVGShapeImpl::invalidate(KSVGCanvas *c, bool recalc)
+void SVGShapeImpl::tqinvalidate(KSVGCanvas *c, bool recalc)
{
if(m_item && c)
- c->invalidate(m_item, recalc);
+ c->tqinvalidate(m_item, recalc);
}
void SVGShapeImpl::setReferenced(bool referenced)
diff --git a/ksvg/impl/SVGShapeImpl.h b/ksvg/impl/SVGShapeImpl.h
index c61038d2..c059d448 100644
--- a/ksvg/impl/SVGShapeImpl.h
+++ b/ksvg/impl/SVGShapeImpl.h
@@ -49,7 +49,7 @@ public:
virtual bool isContainer() const { return false; }
virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0);
- virtual void invalidate(KSVGCanvas *c, bool recalc);
+ virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
virtual void setReferenced(bool referenced);
virtual void draw();
virtual void blit(KSVGCanvas *);
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 17a3e8cd..4b20ecc7 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -98,9 +98,9 @@ SVGStylableImpl::~SVGStylableImpl()
void SVGStylableImpl::processStyle()
{
- SVGStylableImpl *parentStyle = 0;
+ SVGStylableImpl *tqparentStyle = 0;
if(m_object && m_object->ownerDoc())
- parentStyle = dynamic_cast<SVGStylableImpl *>(m_object->ownerDoc()->getElementFromHandle((*m_object).parentNode().handle()));
+ tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_object->ownerDoc()->getElementFromHandle((*m_object).parentNode().handle()));
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_STROKE)
@@ -109,8 +109,8 @@ void SVGStylableImpl::processStyle()
m_strokeColor->ref();
SVGPaintImpl *strokeColor = 0L;
- if(parentStyle)
- strokeColor = parentStyle->getStrokeColor();
+ if(tqparentStyle)
+ strokeColor = tqparentStyle->getStrokeColor();
if(strokeColor)
*m_strokeColor = *strokeColor;
@@ -125,8 +125,8 @@ void SVGStylableImpl::processStyle()
m_fillColor->ref();
SVGPaintImpl *fillColor = 0;
- if(parentStyle)
- fillColor = parentStyle->getFillColor();
+ if(tqparentStyle)
+ fillColor = tqparentStyle->getFillColor();
if(fillColor)
*m_fillColor = *fillColor;
@@ -140,8 +140,8 @@ void SVGStylableImpl::processStyle()
m_color = new SVGColorImpl(m_object);
m_color->ref();
SVGColorImpl *color = 0;
- if(parentStyle)
- color = parentStyle->getColor();
+ if(tqparentStyle)
+ color = tqparentStyle->getColor();
if(color)
*m_color = *color;
@@ -150,8 +150,8 @@ void SVGStylableImpl::processStyle()
// Spec: default sRGB
if(~m_flags & SVG_STYLE_FLAG_COLOR_INTERPOLATION)
{
- if(parentStyle)
- m_colorInterpolation = parentStyle->getColorInterpolation();
+ if(tqparentStyle)
+ m_colorInterpolation = tqparentStyle->getColorInterpolation();
else
m_colorInterpolation = CI_SRGB;
}
@@ -163,8 +163,8 @@ void SVGStylableImpl::processStyle()
m_strokeWidth->ref();
SVGAnimatedLengthImpl *strokeWidth = 0;
- if(parentStyle)
- strokeWidth = parentStyle->getStrokeWidth();
+ if(tqparentStyle)
+ strokeWidth = tqparentStyle->getStrokeWidth();
if(strokeWidth)
*m_strokeWidth = *strokeWidth;
@@ -175,8 +175,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "4"
if(~m_flags & SVG_STYLE_FLAG_STROKE_MITER_LIMIT)
{
- if(parentStyle)
- m_strokeMiterlimit = parentStyle->getStrokeMiterlimit();
+ if(tqparentStyle)
+ m_strokeMiterlimit = tqparentStyle->getStrokeMiterlimit();
else
m_strokeMiterlimit = 4;
}
@@ -184,8 +184,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "butt"
if(~m_flags & SVG_STYLE_FLAG_STROKE_LINE_CAP)
{
- if(parentStyle)
- m_capStyle = parentStyle->getCapStyle();
+ if(tqparentStyle)
+ m_capStyle = tqparentStyle->getCapStyle();
else
m_capStyle = PATH_STROKE_CAP_BUTT;
}
@@ -193,8 +193,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "miter"
if(~m_flags & SVG_STYLE_FLAG_STROKE_LINE_JOIN)
{
- if(parentStyle)
- m_joinStyle = parentStyle->getJoinStyle();
+ if(tqparentStyle)
+ m_joinStyle = tqparentStyle->getJoinStyle();
else
m_joinStyle = PATH_STROKE_JOIN_MITER;
}
@@ -202,8 +202,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "auto"
if(~m_flags & SVG_STYLE_FLAG_CURSOR)
{
- if(parentStyle)
- m_cursor = parentStyle->getCursor();
+ if(tqparentStyle)
+ m_cursor = tqparentStyle->getCursor();
else
m_cursor = CURSOR_AUTO;
}
@@ -211,8 +211,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "visiblePainted"
if(~m_flags & SVG_STYLE_FLAG_POINTER_EVENTS)
{
- if(parentStyle)
- m_pointerEvents = parentStyle->getPointerEvents();
+ if(tqparentStyle)
+ m_pointerEvents = tqparentStyle->getPointerEvents();
else
m_pointerEvents = PE_VISIBLE_PAINTED;
}
@@ -224,8 +224,8 @@ void SVGStylableImpl::processStyle()
m_dashOffset->ref();
SVGAnimatedLengthImpl *dashOffset = 0;
- if(parentStyle)
- dashOffset = parentStyle->getDashOffset();
+ if(tqparentStyle)
+ dashOffset = tqparentStyle->getDashOffset();
if(dashOffset)
*m_dashOffset = *dashOffset;
@@ -237,8 +237,8 @@ void SVGStylableImpl::processStyle()
if(~m_flags & SVG_STYLE_FLAG_STROKE_DASH_ARRAY)
{
SVGAnimatedLengthListImpl *dashArray = 0;
- if(parentStyle)
- dashArray = parentStyle->getDashArray();
+ if(tqparentStyle)
+ dashArray = tqparentStyle->getDashArray();
if(dashArray)
{
@@ -256,51 +256,51 @@ void SVGStylableImpl::processStyle()
// Spec: default "1" -> 1 == Not opaque
if(~m_flags & SVG_STYLE_FLAG_FILL_OPACITY)
{
- if(parentStyle)
- m_fillOpacity = parentStyle->getFillOpacity();
+ if(tqparentStyle)
+ m_fillOpacity = tqparentStyle->getFillOpacity();
else
m_fillOpacity = 1;
}
if(~m_flags & SVG_STYLE_FLAG_STROKE_OPACITY)
{
- if(parentStyle)
- m_strokeOpacity = parentStyle->getStrokeOpacity();
+ if(tqparentStyle)
+ m_strokeOpacity = tqparentStyle->getStrokeOpacity();
else
m_strokeOpacity = 1;
}
- // Fake group opacity by multiplying by our parent's group opacity
+ // Fake group opacity by multiplying by our tqparent's group opacity
if(~m_flags & SVG_STYLE_FLAG_OPACITY)
{
- if(parentStyle)
- m_opacity = parentStyle->getOpacity();
+ if(tqparentStyle)
+ m_opacity = tqparentStyle->getOpacity();
else
m_opacity = 1;
}
else
- if(parentStyle)
- m_opacity *= parentStyle->getOpacity();
+ if(tqparentStyle)
+ m_opacity *= tqparentStyle->getOpacity();
if(~m_flags & SVG_STYLE_FLAG_CLIP_PATH)
m_clipPath = "";
if(~m_flags & SVG_STYLE_FLAG_MASK)
- m_mask = "";
+ m_tqmask = "";
// Spec: default "nonzero"
if(~m_flags & SVG_STYLE_FLAG_FILL_RULE)
{
- if(parentStyle)
- m_fillRule = parentStyle->getFillRule();
+ if(tqparentStyle)
+ m_fillRule = tqparentStyle->getFillRule();
else
m_fillRule = RULE_NONZERO;
}
if(~m_flags & SVG_STYLE_FLAG_CLIP_RULE)
{
- if(parentStyle)
- m_clipRule = parentStyle->getClipRule();
+ if(tqparentStyle)
+ m_clipRule = tqparentStyle->getClipRule();
else
m_clipRule = RULE_NONZERO;
}
@@ -308,8 +308,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "hidden"
if(~m_flags & SVG_STYLE_FLAG_OVERFLOW)
{
- if(parentStyle)
- m_overflow = parentStyle->getOverflow();
+ if(tqparentStyle)
+ m_overflow = tqparentStyle->getOverflow();
else
m_overflow = false;
}
@@ -322,8 +322,8 @@ void SVGStylableImpl::processStyle()
if(~m_flags & SVG_STYLE_FLAG_VISIBILITY)
{
- if(parentStyle)
- m_visible = parentStyle->getVisible();
+ if(tqparentStyle)
+ m_visible = tqparentStyle->getVisible();
else
m_visible = true;
}
@@ -331,8 +331,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "medium"
if(~m_flags & SVG_STYLE_FLAG_FONT_SIZE)
{
- if(parentStyle)
- m_fontSize = parentStyle->getFontSize();
+ if(tqparentStyle)
+ m_fontSize = tqparentStyle->getFontSize();
else
m_fontSize = fontSizeForText("medium");
}
@@ -347,8 +347,8 @@ void SVGStylableImpl::processStyle()
}
SVGStringListImpl *fontFamily = 0;
- if(parentStyle)
- fontFamily = parentStyle->getFontFamily();
+ if(tqparentStyle)
+ fontFamily = tqparentStyle->getFontFamily();
if(fontFamily)
*m_fontFamily = *fontFamily;
@@ -364,8 +364,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_FONT_STYLE)
{
- if(parentStyle)
- m_fontStyle = parentStyle->getFontStyle();
+ if(tqparentStyle)
+ m_fontStyle = tqparentStyle->getFontStyle();
else
m_fontStyle = FSNORMAL;
}
@@ -373,8 +373,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_FONT_WEIGHT)
{
- if(parentStyle)
- m_fontWeight = parentStyle->getFontWeight();
+ if(tqparentStyle)
+ m_fontWeight = tqparentStyle->getFontWeight();
else
m_fontWeight = "normal";
}
@@ -382,8 +382,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "start"
if(~m_flags & SVG_STYLE_FLAG_TEXT_ANCHOR)
{
- if(parentStyle)
- m_textAnchor = parentStyle->getTextAnchor();
+ if(tqparentStyle)
+ m_textAnchor = tqparentStyle->getTextAnchor();
else
m_textAnchor = TASTART;
}
@@ -391,8 +391,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "LTR"
if(~m_flags & SVG_STYLE_FLAG_TEXT_DIRECTION)
{
- if(parentStyle)
- m_textDirection = parentStyle->getTextDirection();
+ if(tqparentStyle)
+ m_textDirection = tqparentStyle->getTextDirection();
else
m_textDirection = LTR;
}
@@ -400,8 +400,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_TEXT_DECORATION)
{
- if(parentStyle)
- m_textDecoration = parentStyle->getTextDecoration();
+ if(tqparentStyle)
+ m_textDecoration = tqparentStyle->getTextDecoration();
else
m_textDecoration = TDNONE;
}
@@ -409,8 +409,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "baseline"
if(~m_flags & SVG_STYLE_FLAG_BASELINE_SHIFT)
{
- if(parentStyle)
- m_baselineShift = parentStyle->getBaselineShift();
+ if(tqparentStyle)
+ m_baselineShift = tqparentStyle->getBaselineShift();
else
m_baselineShift = "baseline";
}
@@ -418,8 +418,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "lr-tb", FIXME
if(~m_flags & SVG_STYLE_FLAG_TEXT_WRITING_MODE)
{
- if(parentStyle)
- m_textWritingMode = parentStyle->getTextWritingMode();
+ if(tqparentStyle)
+ m_textWritingMode = tqparentStyle->getTextWritingMode();
else
m_textWritingMode = LR;
}
@@ -427,8 +427,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_TEXT_UNICODE_BIDI)
{
- if(parentStyle)
- m_textUnicodeBidi = parentStyle->getTextUnicodeBidi();
+ if(tqparentStyle)
+ m_textUnicodeBidi = tqparentStyle->getTextUnicodeBidi();
else
m_textUnicodeBidi = UBNORMAL;
}
@@ -436,8 +436,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "auto"
if(~m_flags & SVG_STYLE_FLAG_GLYPH_ORIENTATION_VERTICAL)
{
- if(parentStyle)
- m_glyphOrientationVertical = parentStyle->getGlyphOrientationVertical();
+ if(tqparentStyle)
+ m_glyphOrientationVertical = tqparentStyle->getGlyphOrientationVertical();
else
m_glyphOrientationVertical = "auto";
}
@@ -445,8 +445,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "auto"
if(~m_flags & SVG_STYLE_FLAG_GLYPH_ORIENTATION_HORIZONTAL)
{
- if(parentStyle)
- m_glyphOrientationHorizontal = parentStyle->getGlyphOrientationHorizontal();
+ if(tqparentStyle)
+ m_glyphOrientationHorizontal = tqparentStyle->getGlyphOrientationHorizontal();
else
m_glyphOrientationHorizontal = "auto";
}
@@ -454,8 +454,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_LETTER_SPACING)
{
- if(parentStyle)
- m_letterSpacing = parentStyle->getLetterSpacing();
+ if(tqparentStyle)
+ m_letterSpacing = tqparentStyle->getLetterSpacing();
else
m_letterSpacing = "normal";
}
@@ -463,8 +463,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_WORD_SPACING)
{
- if(parentStyle)
- m_wordSpacing = parentStyle->getWordSpacing();
+ if(tqparentStyle)
+ m_wordSpacing = tqparentStyle->getWordSpacing();
else
m_wordSpacing = "normal";
}
@@ -481,28 +481,28 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_START)
{
- if(parentStyle)
- m_startMarker = parentStyle->getStartMarker();
+ if(tqparentStyle)
+ m_startMarker = tqparentStyle->getStartMarker();
else
- m_startMarker = TQString::null;
+ m_startMarker = TQString();
}
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_MID)
{
- if(parentStyle)
- m_midMarker = parentStyle->getMidMarker();
+ if(tqparentStyle)
+ m_midMarker = tqparentStyle->getMidMarker();
else
- m_midMarker = TQString::null;
+ m_midMarker = TQString();
}
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_END)
{
- if(parentStyle)
- m_endMarker = parentStyle->getEndMarker();
+ if(tqparentStyle)
+ m_endMarker = tqparentStyle->getEndMarker();
else
- m_endMarker = TQString::null;
+ m_endMarker = TQString();
}
}
@@ -532,7 +532,7 @@ TQString SVGStylableImpl::extractUrlId(const TQString &url)
if(url.startsWith("url(#"))
{
- int idstart = url.find("#") + 1;
+ int idstart = url.tqfind("#") + 1;
id = url.mid(idstart, url.length() - idstart - 1);
}
else
@@ -552,33 +552,33 @@ void SVGStylableImpl::setStartMarker(const TQString &startMarker)
{
if(startMarker.startsWith("url(#"))
{
- int idstart = startMarker.find("#") + 1;
+ int idstart = startMarker.tqfind("#") + 1;
m_startMarker = startMarker.mid(idstart, startMarker.length() - idstart - 1);
}
else if(startMarker == "none")
- m_startMarker = TQString::null;
+ m_startMarker = TQString();
}
void SVGStylableImpl::setMidMarker(const TQString &midMarker)
{
if(midMarker.startsWith("url(#"))
{
- int idstart = midMarker.find("#") + 1;
+ int idstart = midMarker.tqfind("#") + 1;
m_midMarker = midMarker.mid(idstart, midMarker.length() - idstart - 1);
}
else if(midMarker == "none")
- m_midMarker = TQString::null;
+ m_midMarker = TQString();
}
void SVGStylableImpl::setEndMarker(const TQString &endMarker)
{
if(endMarker.startsWith("url(#"))
{
- int idstart = endMarker.find("#") + 1;
+ int idstart = endMarker.tqfind("#") + 1;
m_endMarker = endMarker.mid(idstart, endMarker.length() - idstart - 1);
}
else if(endMarker == "none")
- m_endMarker = TQString::null;
+ m_endMarker = TQString();
}
bool SVGStylableImpl::hasMarkers() const
@@ -600,7 +600,7 @@ void SVGStylableImpl::setColor(const TQString &param, SVGColorImpl *svgColor)
{
if(param.stripWhiteSpace().startsWith("#"))
{
- if(param.contains("icc-color"))
+ if(param.tqcontains("icc-color"))
{
TQString first = param.left(7);
TQString last = param.right(param.length() - 8);
@@ -622,19 +622,19 @@ void SVGStylableImpl::setColor(const TQString &param, SVGColorImpl *svgColor)
TQString g = colors[1];
TQString b = colors[2].left((colors[2].length() - 1));
- if(r.contains("%"))
+ if(r.tqcontains("%"))
{
r = r.left(r.length() - 1);
r = TQString::number(int((double(255 * r.toDouble()) / 100.0)));
}
- if(g.contains("%"))
+ if(g.tqcontains("%"))
{
g = g.left(g.length() - 1);
g = TQString::number(int((double(255 * g.toDouble()) / 100.0)));
}
- if(b.contains("%"))
+ if(b.tqcontains("%"))
{
b = b.left(b.length() - 1);
b = TQString::number(int((double(255 * b.toDouble()) / 100.0)));
@@ -711,7 +711,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value)
text-anchor SVGStylableImpl::TextAnchor DontDelete|ReadOnly
direction SVGStylableImpl::Direction DontDelete|ReadOnly
writing-mode SVGStylableImpl::WritingMode DontDelete|ReadOnly
- unicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly
+ tqunicode-bidi SVGStylableImpl::UnicodeBidi DontDelete|ReadOnly
opacity SVGStylableImpl::Opacity DontDelete|ReadOnly
fill-opacity SVGStylableImpl::FillOpacity DontDelete|ReadOnly
stroke-opacity SVGStylableImpl::StrokeOpacity DontDelete|ReadOnly
@@ -737,7 +737,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value)
glyph-orientation-vertical SVGStylableImpl::GlyphOrientationVertical DontDelete|ReadOnly
glyph-orientation-horizontal SVGStylableImpl::GlyphOrientationHorizontal DontDelete|ReadOnly
color-interpolation SVGStylableImpl::ColorInterpolation DontDelete|ReadOnly
- mask SVGStylableImpl::Mask DontDelete|ReadOnly
+ tqmask SVGStylableImpl::Mask DontDelete|ReadOnly
@end
@namespace KSVG
@begin SVGStylableImplProto::s_hashTable 2
@@ -946,12 +946,12 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
// Hacks
// #1 Replace "'" characters by ""
- param = param.replace('\'', TQString::null);
+ param = param.tqreplace('\'', TQString());
// #2 Replace "MS-Gothic" by "MS Gothic"
- param = param.replace("MS-Gothic", "MS Gothic");
+ param = param.tqreplace("MS-Gothic", "MS Gothic");
// #3 Replace "Helvetica" by "Arial"
- param = param.replace("Helvetica", "Arial");
- param = param.replace("helvetica", "Arial");
+ param = param.tqreplace("Helvetica", "Arial");
+ param = param.tqreplace("helvetica", "Arial");
if(!m_fontFamily)
{
@@ -974,7 +974,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
else if(param == "italic")
m_fontStyle = ITALIC;
else if(param == "oblique")
- m_fontStyle = OBLIQUE;
+ m_fontStyle = OBLITQUE;
break;
case TextDecoration:
m_flags |= SVG_STYLE_FLAG_TEXT_DECORATION;
@@ -1006,7 +1006,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
break;
case Direction:
m_flags |= SVG_STYLE_FLAG_TEXT_DIRECTION;
- // Spec: direction is only processed when unicode-bidi
+ // Spec: direction is only processed when tqunicode-bidi
// is set to bidi-override or embedded
if(m_textUnicodeBidi == OVERRIDE ||
m_textUnicodeBidi == EMBED ||
@@ -1076,7 +1076,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
case Mask:
m_flags |= SVG_STYLE_FLAG_MASK;
if(!inherit)
- m_mask = extractUrlId(param);
+ m_tqmask = extractUrlId(param);
break;
case MarkerStart:
m_flags |= SVG_STYLE_FLAG_MARKER_START;
@@ -1276,16 +1276,16 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
if(redraw)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_object);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_object);
if(inherit)
processStyle();
- if(shape && shape->item())
+ if(tqshape && tqshape->item())
{
if(update > -1)
- shape->item()->update(static_cast<CanvasItemUpdate>(update));
+ tqshape->item()->update(static_cast<CanvasItemUpdate>(update));
else if(m_object)
- m_object->ownerDoc()->canvas()->invalidate(shape->item(), false);
+ m_object->ownerDoc()->canvas()->tqinvalidate(tqshape->item(), false);
}
}
}
diff --git a/ksvg/impl/SVGStylableImpl.h b/ksvg/impl/SVGStylableImpl.h
index 50a37568..e2493317 100644
--- a/ksvg/impl/SVGStylableImpl.h
+++ b/ksvg/impl/SVGStylableImpl.h
@@ -162,7 +162,7 @@ enum EUnicodeBidi
enum EFontStyle
{
- FSNORMAL, ITALIC, OBLIQUE
+ FSNORMAL, ITALIC, OBLITQUE
};
enum ETextWritingMode
@@ -225,7 +225,7 @@ public:
STYLE_GET(TQString, WordSpacing, m_wordSpacing)
STYLE_GET(TQString, FontWeight, m_fontWeight)
STYLE_GET(TQString, ClipPath, m_clipPath)
- STYLE_GET(TQString, Mask, m_mask)
+ STYLE_GET(TQString, Mask, m_tqmask)
STYLE_GET(TQString, StartMarker, m_startMarker)
STYLE_GET(TQString, MidMarker, m_midMarker)
STYLE_GET(TQString, EndMarker, m_endMarker)
@@ -255,7 +255,7 @@ public:
STYLE_GET_OPTIM(EColorInterpolation, ColorInterpolation, m_colorInterpolation, 1)
STYLE_HAS(ClipPath, m_clipPath)
- STYLE_HAS(Mask, m_mask)
+ STYLE_HAS(Mask, m_tqmask)
STYLE_HAS(StartMarker, m_startMarker)
STYLE_HAS(MidMarker, m_midMarker)
STYLE_HAS(EndMarker, m_endMarker)
diff --git a/ksvg/impl/SVGSwitchElementImpl.cc b/ksvg/impl/SVGSwitchElementImpl.cc
index 613a1982..f6861521 100644
--- a/ksvg/impl/SVGSwitchElementImpl.cc
+++ b/ksvg/impl/SVGSwitchElementImpl.cc
@@ -41,13 +41,13 @@ void SVGSwitchElementImpl::createItem(KSVGCanvas *c)
for(; !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && ok && style->getVisible() && style->getDisplay() && (shape->directRender() || !directRender()))
+ if(element && tqshape && ok && style->getVisible() && style->getDisplay() && (tqshape->directRender() || !directRender()))
{
element->createItem(c);
break;
diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cc
index 302b54b7..63157883 100644
--- a/ksvg/impl/SVGTextContentElementImpl.cc
+++ b/ksvg/impl/SVGTextContentElementImpl.cc
@@ -95,7 +95,7 @@ TQString SVGTextContentElementImpl::textDirectionAwareText()
return text;
}
-T2P::GlyphLayoutParams *SVGTextContentElementImpl::layoutParams() const
+T2P::GlyphLayoutParams *SVGTextContentElementImpl::tqlayoutParams() const
{
SVGStylableImpl *style = const_cast<SVGTextContentElementImpl *>(this);
diff --git a/ksvg/impl/SVGTextContentElementImpl.h b/ksvg/impl/SVGTextContentElementImpl.h
index bd962037..85999cb9 100644
--- a/ksvg/impl/SVGTextContentElementImpl.h
+++ b/ksvg/impl/SVGTextContentElementImpl.h
@@ -52,7 +52,7 @@ public:
TQString textDirectionAwareText();
- virtual T2P::GlyphLayoutParams *layoutParams() const;
+ virtual T2P::GlyphLayoutParams *tqlayoutParams() const;
SVGAnimatedLengthImpl *textLength() const;
SVGAnimatedEnumerationImpl *lengthAdjust() const;
diff --git a/ksvg/impl/SVGTextElementImpl.cc b/ksvg/impl/SVGTextElementImpl.cc
index 82a53ea9..7603c622 100644
--- a/ksvg/impl/SVGTextElementImpl.cc
+++ b/ksvg/impl/SVGTextElementImpl.cc
@@ -111,7 +111,7 @@ bool SVGTextElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &, SV
if(test)
{
- if(m_item->bbox().contains(p))
+ if(m_item->bbox().tqcontains(p))
{
mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
return true;
diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cc
index 78c272f8..6ef8d545 100644
--- a/ksvg/impl/SVGTextPathElementImpl.cc
+++ b/ksvg/impl/SVGTextPathElementImpl.cc
@@ -104,9 +104,9 @@ void SVGTextPathElementImpl::setAttributes()
KSVG_SET_ALT_ATTRIBUTE(Spacing, "exact")
}
-T2P::GlyphLayoutParams *SVGTextPathElementImpl::layoutParams() const
+T2P::GlyphLayoutParams *SVGTextPathElementImpl::tqlayoutParams() const
{
- T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::layoutParams();
+ T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::tqlayoutParams();
params->setTextPathStartOffset(startOffset()->baseVal()->value());
return params;
}
diff --git a/ksvg/impl/SVGTextPathElementImpl.h b/ksvg/impl/SVGTextPathElementImpl.h
index 98a88d33..e1776815 100644
--- a/ksvg/impl/SVGTextPathElementImpl.h
+++ b/ksvg/impl/SVGTextPathElementImpl.h
@@ -41,7 +41,7 @@ public:
SVGAnimatedEnumerationImpl *spacing() const;
virtual void setAttributes();
- virtual T2P::GlyphLayoutParams *layoutParams() const;
+ virtual T2P::GlyphLayoutParams *tqlayoutParams() const;
private:
SVGAnimatedLengthImpl *m_startOffset;
diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cc
index caddf81f..d2a10e5a 100644
--- a/ksvg/impl/SVGTimeScheduler.cc
+++ b/ksvg/impl/SVGTimeScheduler.cc
@@ -92,7 +92,7 @@ void SVGTimer::notifyAll()
animation->handleTimerEvent();
SVGElementImpl *target = animation->targetElement();
- if(!elements.contains(target))
+ if(!elements.tqcontains(target))
elements.append(target);
}
}
@@ -101,9 +101,9 @@ void SVGTimer::notifyAll()
TQValueList<SVGElementImpl *>::iterator it2;
for(it2 = elements.begin(); it2 != elements.end(); ++it2)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(*it2);
- if(shape && shape->item())
- shape->item()->update(UPDATE_TRANSFORM);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(*it2);
+ if(tqshape && tqshape->item())
+ tqshape->item()->update(UPDATE_TRANSFORM);
}
}
diff --git a/ksvg/impl/SVGTimeScheduler.h b/ksvg/impl/SVGTimeScheduler.h
index 52f9c9b9..5b184a52 100644
--- a/ksvg/impl/SVGTimeScheduler.h
+++ b/ksvg/impl/SVGTimeScheduler.h
@@ -64,9 +64,10 @@ private:
typedef TQValueList<SVGTimer *> SVGTimerList;
class SVGDocumentImpl;
-class SVGTimeScheduler : public QObject
+class SVGTimeScheduler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
SVGTimeScheduler(SVGDocumentImpl *doc);
~SVGTimeScheduler();
diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cc
index 59dd904b..ce69aa83 100644
--- a/ksvg/impl/SVGTransformableImpl.cc
+++ b/ksvg/impl/SVGTransformableImpl.cc
@@ -83,18 +83,18 @@ SVGMatrixImpl *SVGTransformableImpl::getCTM()
SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
Q_ASSERT(element);
- DOM::Node parentNde = element->parentNode();
+ DOM::Node tqparentNde = element->parentNode();
- if(!parentNde.isNull() && parentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
+ if(!tqparentNde.isNull() && tqparentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
{
- SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNde.handle());
- SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(parent);
+ SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNde.handle());
+ SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
if(locatableParent)
{
- SVGMatrixImpl *parentCTM = locatableParent->getCTM();
- ctm->multiply(parentCTM);
- parentCTM->deref();
+ SVGMatrixImpl *tqparentCTM = locatableParent->getCTM();
+ ctm->multiply(tqparentCTM);
+ tqparentCTM->deref();
}
}
@@ -124,7 +124,7 @@ void SVGTransformableImpl::updateLocalMatrix()
}
}
- invalidateCachedMatrices();
+ tqinvalidateCachedMatrices();
}
// Ecma stuff
diff --git a/ksvg/impl/SVGURIReferenceImpl.cc b/ksvg/impl/SVGURIReferenceImpl.cc
index 8a6fda76..52db7a86 100644
--- a/ksvg/impl/SVGURIReferenceImpl.cc
+++ b/ksvg/impl/SVGURIReferenceImpl.cc
@@ -50,7 +50,7 @@ SVGAnimatedStringImpl *SVGURIReferenceImpl::href() const
bool SVGURIReferenceImpl::parseURIReference(const TQString &urireference, TQString &uri, TQString &elementreference)
{
- int seperator = urireference.find("#");
+ int seperator = urireference.tqfind("#");
if(seperator == -1)
return false;
@@ -71,14 +71,14 @@ TQString SVGURIReferenceImpl::getTarget(const TQString &url)
{
if(url.startsWith("url(")) // URI References, ie. fill:url(#target)
{
- unsigned int start = url.find("#") + 1;
- unsigned int end = url.findRev(")");
+ unsigned int start = url.tqfind("#") + 1;
+ unsigned int end = url.tqfindRev(")");
return url.mid(start, end - start);
}
- else if(url.find("#") > -1) // format is #target
+ else if(url.tqfind("#") > -1) // format is #target
{
- unsigned int start = url.find("#") + 1;
+ unsigned int start = url.tqfind("#") + 1;
return url.mid(start, url.length() - start);
}
diff --git a/ksvg/impl/SVGUnitConverter.h b/ksvg/impl/SVGUnitConverter.h
index 78eb2528..db85c42d 100644
--- a/ksvg/impl/SVGUnitConverter.h
+++ b/ksvg/impl/SVGUnitConverter.h
@@ -41,14 +41,14 @@ public:
void add(SVGAnimatedLengthImpl *obj)
{
UnitData *data = new UnitData();
- data->valueAsString = TQString::null;
+ data->valueAsString = TQString();
m_dict.insert(obj, data);
}
void modify(SVGAnimatedLengthImpl *obj, const TQString &value)
{
- UnitData *data = m_dict.find(obj);
+ UnitData *data = m_dict.tqfind(obj);
if(data)
data->valueAsString = value;
diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cc
index 457436cb..b7bc40f2 100644
--- a/ksvg/impl/SVGUseElementImpl.cc
+++ b/ksvg/impl/SVGUseElementImpl.cc
@@ -182,9 +182,9 @@ SVGRectImpl *SVGUseElementImpl::getBBox()
{
if(m_instanceRoot)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
- if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && shape)
- return shape->getBBox();
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+ if(KSVG_TOKEN_NOT_PARSED(Width) && KSVG_TOKEN_NOT_PARSED(Height) && tqshape)
+ return tqshape->getBBox();
}
SVGRectImpl *ret = new SVGRectImpl();
@@ -223,7 +223,7 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
KURL fragmentUrl(ownerDoc()->baseUrl(), url.string());
id = fragmentUrl.ref();
- fragmentUrl.setRef(TQString::null);
+ fragmentUrl.setRef(TQString());
orig = KSVGLoader::getSVGFragment(fragmentUrl, ownerDoc(), id);
}
@@ -243,10 +243,10 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
setReferencedElement(orig);
- // Create a parent, a <g>
- SVGElementImpl *parent = 0;
+ // Create a tqparent, a <g>
+ SVGElementImpl *tqparent = 0;
DOM::Element impl = static_cast<DOM::Document *>(ownerDoc())->createElement("g");
- parent = SVGDocumentImpl::createElement("g", impl, ownerDoc());
+ tqparent = SVGDocumentImpl::createElement("g", impl, ownerDoc());
SVGElementImpl *clone = orig->cloneNode(true);
// Apply the use-correction
@@ -258,8 +258,8 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
trans += ")";
// Apply the transform attribute and render the element
- parent->setAttributeInternal("transform", trans);
- parent->setAttribute("transform", trans);
+ tqparent->setAttributeInternal("transform", trans);
+ tqparent->setAttribute("transform", trans);
// Apply width/height if symbol
if(dynamic_cast<SVGSymbolElementImpl *>(clone))
@@ -294,14 +294,14 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c)
}
}
- appendChild(*parent);
- parent->appendChild(*clone);
+ appendChild(*tqparent);
+ tqparent->appendChild(*clone);
- setupSubtree(parent, ownerSVGElement(), viewportElement());
+ setupSubtree(tqparent, ownerSVGElement(), viewportElement());
m_instanceRoot->setCorrespondingElement(clone);
- dynamic_cast<SVGLocatableImpl *>(parent)->updateCachedScreenCTM(screenCTM());
+ dynamic_cast<SVGLocatableImpl *>(tqparent)->updateCachedScreenCTM(screenCTM());
// Redirect local ecma event handlers to the correspondingElement
TQPtrListIterator<SVGRegisteredEventListener> it(eventListeners());
@@ -370,19 +370,19 @@ void SVGUseElementImpl::update(CanvasItemUpdate reason, int param1, int param2)
{
if(m_instanceRoot)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
- if(shape)
- shape->update(reason, param1, param2);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+ if(tqshape)
+ tqshape->update(reason, param1, param2);
}
}
-void SVGUseElementImpl::invalidate(KSVGCanvas *c, bool recalc)
+void SVGUseElementImpl::tqinvalidate(KSVGCanvas *c, bool recalc)
{
if(m_instanceRoot)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
- if(shape)
- shape->invalidate(c, recalc);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+ if(tqshape)
+ tqshape->tqinvalidate(c, recalc);
}
}
@@ -390,9 +390,9 @@ void SVGUseElementImpl::setReferenced(bool referenced)
{
if(m_instanceRoot)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
- if(shape)
- shape->setReferenced(referenced);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+ if(tqshape)
+ tqshape->setReferenced(referenced);
}
}
@@ -400,9 +400,9 @@ void SVGUseElementImpl::draw()
{
if(m_instanceRoot)
{
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
- if(shape)
- shape->draw();
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(m_instanceRoot->correspondingElement());
+ if(tqshape)
+ tqshape->draw();
}
}
diff --git a/ksvg/impl/SVGUseElementImpl.h b/ksvg/impl/SVGUseElementImpl.h
index 02eb8d88..15c644f7 100644
--- a/ksvg/impl/SVGUseElementImpl.h
+++ b/ksvg/impl/SVGUseElementImpl.h
@@ -59,7 +59,7 @@ public:
virtual void createItem(KSVGCanvas *c);
virtual void removeItem(KSVGCanvas *c);
virtual void update(CanvasItemUpdate reason, int param1, int param2);
- virtual void invalidate(KSVGCanvas *c, bool recalc);
+ virtual void tqinvalidate(KSVGCanvas *c, bool recalc);
virtual void setReferenced(bool referenced);
virtual void draw();
diff --git a/ksvg/impl/SVGWindowImpl.cc b/ksvg/impl/SVGWindowImpl.cc
index 476185f1..f1506c14 100644
--- a/ksvg/impl/SVGWindowImpl.cc
+++ b/ksvg/impl/SVGWindowImpl.cc
@@ -133,9 +133,9 @@ DOM::DOMString SVGWindowImpl::printNode(const DOM::Node &node, unsigned short le
TQDictIterator<DOM::DOMString> it(elem->attributes());
for(;it.current(); ++it)
ret += " " + it.currentKey() + "=\"" + it.current()->string() + '\"';
- if(elem->firstChild().isNull()) // no children
+ if(elem->firstChild().isNull()) // no tqchildren
ret += " />\n";
- else // handle children
+ else // handle tqchildren
{
ret += ">\n";
for(DOM::Node child = node.firstChild();!child.isNull();child = child.nextSibling())
diff --git a/ksvg/impl/generateddata.cpp b/ksvg/impl/generateddata.cpp
index 5a4b3d7b..16ac3456 100644
--- a/ksvg/impl/generateddata.cpp
+++ b/ksvg/impl/generateddata.cpp
@@ -283,7 +283,7 @@ const ClassInfo SVGMPathElementImpl::s_classInfo = {"KSVG::SVGMPathElementImpl",
const DOM::DOMString SVGMarkerElementImpl::s_tagName = "marker";
const ClassInfo SVGMarkerElementImpl::s_classInfo = {"KSVG::SVGMarkerElementImpl",0,&SVGMarkerElementImpl::s_hashTable,0};
const ClassInfo SVGMarkerElementImplConstructor::s_classInfo = {"KSVG::SVGMarkerElementImplConstructor",0,&SVGMarkerElementImplConstructor::s_hashTable,0};
-const DOM::DOMString SVGMaskElementImpl::s_tagName = "mask";
+const DOM::DOMString SVGMaskElementImpl::s_tagName = "tqmask";
const ClassInfo SVGMaskElementImpl::s_classInfo = {"KSVG::SVGMaskElementImpl",0,&SVGMaskElementImpl::s_hashTable,0};
const ClassInfo SVGMatrixImpl::s_classInfo = {"KSVG::SVGMatrixImpl",0,&SVGMatrixImpl::s_hashTable,0};
const ClassInfo SVGMetadataElementImpl::s_classInfo = {"KSVG::SVGMetadataElementImpl",0,0,0};
diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c
index 69b45306..6645fe2d 100644
--- a/ksvg/impl/libs/art_support/art_misc.c
+++ b/ksvg/impl/libs/art_support/art_misc.c
@@ -464,7 +464,7 @@ struct _ksvgArtRgbAffineClipAlphaData
int src_width;
int src_height;
int src_rowstride;
- const art_u8 *mask;
+ const art_u8 *tqmask;
int y0;
};
@@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y,
}
static
-void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
{
const art_u8 *src_p;
@@ -626,7 +626,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0
srcAlpha = alpha * src_p[3] + 0x80;
srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
- srcAlpha = (srcAlpha * *mask++) + 0x80;
+ srcAlpha = (srcAlpha * *tqmask++) + 0x80;
srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
d = *dst_p;
@@ -656,13 +656,13 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0
else
{
dst_p += 3;
- mask++;
+ tqmask++;
}
}
}
static void
-ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
+ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -673,14 +673,14 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *maskbuf;
+ const art_u8 *tqmaskbuf;
linebuf = data->dst;
x0 = data->x0;
x1 = data->x1;
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (x1 - x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -689,7 +689,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
for(k = 0; k < n_steps - 1; k++)
@@ -701,7 +701,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
running_sum += steps[k].delta;
@@ -709,14 +709,14 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
data->dst += data->dst_rowstride;
@@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y,
}
static
-void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
{
const art_u8 *src_p;
@@ -887,7 +887,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x
srcAlpha = alpha * src_p[3] + 0x80;
srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
- srcAlpha = (srcAlpha * *mask++) + 0x80;
+ srcAlpha = (srcAlpha * *tqmask++) + 0x80;
srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8;
d = *dst_p;
@@ -924,13 +924,13 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x
else
{
dst_p += 4;
- mask++;
+ tqmask++;
}
}
}
static void
-ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
+ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -941,14 +941,14 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *maskbuf;
+ const art_u8 *tqmaskbuf;
linebuf = data->dst;
x0 = data->x0;
x1 = data->x1;
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (x1 - x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -957,7 +957,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
for(k = 0; k < n_steps - 1; k++)
@@ -969,7 +969,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
running_sum += steps[k].delta;
@@ -977,14 +977,14 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
data->dst += data->dst_rowstride;
@@ -1030,7 +1030,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
const art_u8 *src,
int src_width, int src_height, int src_rowstride,
const double affine[6],
- int alpha, const art_u8 *mask)
+ int alpha, const art_u8 *tqmask)
{
ksvgArtRgbAffineClipAlphaData data;
int i;
@@ -1052,7 +1052,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
data.x0 = x0;
data.x1 = x1;
data.y0 = y0;
- data.mask = mask;
+ data.tqmask = tqmask;
art_affine_invert(data.inv, affine);
@@ -1063,15 +1063,15 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
if(dst_channels == 3)
{
- if(mask)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data);
+ if(tqmask)
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_tqmask_callback, &data);
else
art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data);
}
else
{
- if(mask)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data);
+ if(tqmask)
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_tqmask_callback, &data);
else
art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data);
}
@@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y,
}
static
-void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
{
const art_u8 *src_p;
@@ -1277,11 +1277,11 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, in
/* Pattern source is in RGBA format, premultiplied.
* alpha represents fill/stroke/group opacity.
*
- * Multiply source alpha by 'alpha' and mask value then composite over.
- * For each channel, d = d + alpha * mask * (s - srcAlpha * d).
+ * Multiply source alpha by 'alpha' and tqmask value then composite over.
+ * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d).
*/
- am = (alpha * *mask++) + 0x80;
+ am = (alpha * *tqmask++) + 0x80;
am = (am + (am >> 8)) >> 8;
srcAlpha = src_p[3];
@@ -1322,7 +1322,7 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, in
}
static void
-ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
+ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -1333,7 +1333,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *maskbuf;
+ const art_u8 *tqmaskbuf;
linebuf = data->dst;
x0 = data->x0;
@@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (x1 - x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -1350,7 +1350,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
for(k = 0; k < n_steps - 1; k++)
@@ -1362,7 +1362,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_texture_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
running_sum += steps[k].delta;
@@ -1370,14 +1370,14 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_texture_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
data->dst += data->dst_rowstride;
@@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y,
}
static
-void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
{
const art_u8 *src_p;
@@ -1594,11 +1594,11 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i
/* Pattern source is in RGBA format, premultiplied.
* alpha represents fill/stroke/group opacity.
*
- * Multiply source alpha by 'alpha' and mask value then composite over.
- * For each channel, d = d + alpha * mask * (s - srcAlpha * d).
+ * Multiply source alpha by 'alpha' and tqmask value then composite over.
+ * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d).
*/
- am = (alpha * *mask++) + 0x80;
+ am = (alpha * *tqmask++) + 0x80;
am = (am + (am >> 8)) >> 8;
srcAlpha = src_p[3];
@@ -1636,7 +1636,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i
*dst_p++ = d + tmp2;
- /* dstAlpha = dstAlpha + srcAlpha * alpha * mask * (1 - dstAlpha) */
+ /* dstAlpha = dstAlpha + srcAlpha * alpha * tqmask * (1 - dstAlpha) */
d = *dst_p;
tmp = srcAlpha * am + 0x80;
@@ -1651,7 +1651,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i
}
static void
-ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
+ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -1662,7 +1662,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *maskbuf;
+ const art_u8 *tqmaskbuf;
linebuf = data->dst;
x0 = data->x0;
@@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (x1 - x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -1679,7 +1679,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
for(k = 0; k < n_steps - 1; k++)
@@ -1691,7 +1691,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_texture_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
running_sum += steps[k].delta;
@@ -1699,14 +1699,14 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_texture_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+ ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
}
data->dst += data->dst_rowstride;
@@ -1756,7 +1756,7 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
ArtFilterLevel level,
ArtAlphaGamma *alphaGamma,
int alpha,
- const art_u8 *mask)
+ const art_u8 *tqmask)
{
ksvgArtRgbAffineClipAlphaData data;
int i;
@@ -1790,15 +1790,15 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
data.src_height = src_height;
data.src_rowstride = src_rowstride;
- data.mask = mask;
+ data.tqmask = tqmask;
data.y0 = y0;
- if(mask)
+ if(tqmask)
{
if(dst_channels == 3)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_tqmask_callback, &data);
else
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_mask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_tqmask_callback, &data);
}
else
{
diff --git a/ksvg/impl/libs/art_support/art_misc.h b/ksvg/impl/libs/art_support/art_misc.h
index 52f09a63..7311d4b7 100644
--- a/ksvg/impl/libs/art_support/art_misc.h
+++ b/ksvg/impl/libs/art_support/art_misc.h
@@ -58,7 +58,7 @@ extern "C" {
const art_u8 *src,
int src_width, int src_height, int src_rowstride,
const double affine[6],
- int alpha, const art_u8 *mask);
+ int alpha, const art_u8 *tqmask);
void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride,
int dst_channels,
@@ -68,7 +68,7 @@ extern "C" {
ArtFilterLevel level,
ArtAlphaGamma *alphaGamma,
int alpha,
- const art_u8 *mask);
+ const art_u8 *tqmask);
void ksvg_art_svp_move(ArtSVP *svp, int dx, int dy);
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c
index 47c7d924..ea2c1476 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.c
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.c
@@ -37,7 +37,7 @@ struct _ArtKSVGRgbaSVPAlphaData {
art_u8 r, g, b, alpha;
art_u32 rgba;
art_u8 *buf;
- art_u8 *mask;
+ art_u8 *tqmask;
int rowstride;
int x0, x1;
int y0;
@@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i
}
static void
-art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgba_tqmask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
{
int i;
int v;
@@ -136,7 +136,7 @@ art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art
for(i = 0; i < n; i++)
{
- am = (alpha * *mask++) + 0x80;
+ am = (alpha * *tqmask++) + 0x80;
am = (am + (am >> 8)) >> 8;
v = *buf;
@@ -330,7 +330,7 @@ art_ksvg_rgba_svp_alpha_opaque_callback(void *callback_data, int y,
}
static void
-art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
+art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data;
@@ -342,7 +342,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
art_u8 r, g, b;
int *alphatab;
int alpha;
- art_u8 *maskbuf;
+ art_u8 *tqmaskbuf;
linebuf = data->buf;
x0 = data->x0;
@@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
b = data->b;
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
if(n_steps > 0)
{
@@ -362,7 +362,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf,
+ art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf,
r, g, b, alphatab[alpha],
run_x1 - x0);
}
@@ -376,7 +376,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_mask_run_alpha (linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0),
+ art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0),
r, g, b, alphatab[alpha],
run_x1 - run_x0);
}
@@ -386,7 +386,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_mask_run_alpha (linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0) ,
+ art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0) ,
r, g, b, alphatab[alpha],
x1 - run_x1);
}
@@ -395,7 +395,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf,
+ art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf,
r, g, b, alphatab[alpha],
x1 - x0);
}
@@ -415,7 +415,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
* @rowstride: Rowstride of @buf buffer.
* @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
*
- * Renders the shape specified with @svp over the @buf RGB buffer.
+ * Renders the tqshape specified with @svp over the @buf RGB buffer.
* @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
* of the rectangle rendered. The new pixels are stored starting at
* the first byte of @buf. Thus, the @x0 and @y0 parameters specify
@@ -436,7 +436,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
art_u32 rgba,
art_u8 *buf, int rowstride,
ArtAlphaGamma *alphagamma,
- art_u8 *mask)
+ art_u8 *tqmask)
{
ArtKSVGRgbaSVPAlphaData data;
int r, g, b;
@@ -454,7 +454,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
data.b = b;
data.alpha = alpha;
data.rgba = rgba;
- data.mask = mask;
+ data.tqmask = tqmask;
a = 0x8000;
da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */
@@ -471,8 +471,8 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
data.x1 = x1;
data.y0 = y0;
- if(mask)
- art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data);
+ if(tqmask)
+ art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_tqmask_callback, &data);
else
{
if (alpha == 255)
@@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
/* RGB renderers */
static void
-art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgb_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
{
int i;
int v;
@@ -497,7 +497,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u
for(i = 0; i < n; i++)
{
- am = (alpha * *mask++) + 0x80;
+ am = (alpha * *tqmask++) + 0x80;
am = (am + (am >> 8)) >> 8;
v = *buf;
@@ -515,7 +515,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u
}
static void
-art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
+art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data;
@@ -527,7 +527,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
art_u8 r, g, b;
int *alphatab;
int alpha;
- art_u8 *maskbuf;
+ art_u8 *tqmaskbuf;
linebuf = data->buf;
x0 = data->x0;
@@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
b = data->b;
alphatab = data->alphatab;
- maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0);
+ tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
if(n_steps > 0)
{
@@ -547,7 +547,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf,
+ art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf,
r, g, b, alphatab[alpha],
run_x1 - x0);
}
@@ -561,7 +561,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_mask_run_alpha (linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0),
+ art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0),
r, g, b, alphatab[alpha],
run_x1 - run_x0);
}
@@ -571,7 +571,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_mask_run_alpha (linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0) ,
+ art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0) ,
r, g, b, alphatab[alpha],
x1 - run_x1);
}
@@ -580,7 +580,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf,
+ art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf,
r, g, b, alphatab[alpha],
x1 - x0);
}
@@ -600,7 +600,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
* @rowstride: Rowstride of @buf buffer.
* @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing.
*
- * Renders the shape specified with @svp over the @buf RGB buffer.
+ * Renders the tqshape specified with @svp over the @buf RGB buffer.
* @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height,
* of the rectangle rendered. The new pixels are stored starting at
* the first byte of @buf. Thus, the @x0 and @y0 parameters specify
@@ -616,12 +616,12 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
* @alphagamma is NULL.
**/
void
-art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
+art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
int x0, int y0, int x1, int y1,
art_u32 rgba,
art_u8 *buf, int rowstride,
ArtAlphaGamma *alphagamma,
- art_u8 *mask)
+ art_u8 *tqmask)
{
ArtKSVGRgbaSVPAlphaData data;
int r, g, b, alpha;
@@ -637,7 +637,7 @@ art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
data.g = g;
data.b = b;
data.alpha = alpha;
- data.mask = mask;
+ data.tqmask = tqmask;
a = 0x8000;
da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */
@@ -654,6 +654,6 @@ art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
data.x1 = x1;
data.y0 = y0;
- art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_mask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_tqmask_callback, &data);
}
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.h b/ksvg/impl/libs/art_support/art_rgba_svp.h
index b59096d4..860eabcc 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.h
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.h
@@ -40,15 +40,15 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
art_u32 rgba,
art_u8 *buf, int rowstride,
ArtAlphaGamma *alphagamma,
- art_u8 *mask);
+ art_u8 *tqmask);
void
-art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp,
+art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
int x0, int y0, int x1, int y1,
art_u32 rgba,
art_u8 *buf, int rowstride,
ArtAlphaGamma *alphagamma,
- art_u8 *mask);
+ art_u8 *tqmask);
#ifdef __cplusplus
}
diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec
index e0c217bd..208de711 100644
--- a/ksvg/impl/libs/libtext2path/libtext2path.spec
+++ b/ksvg/impl/libs/libtext2path/libtext2path.spec
@@ -31,8 +31,8 @@ make -j
make install-strip DESTDIR=$RPM_BUILD_ROOT
cd
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
-find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
+tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
+tqfind . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
%clean
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h
index a85fdf92..51d09f45 100644
--- a/ksvg/impl/libs/libtext2path/src/Cache.h
+++ b/ksvg/impl/libs/libtext2path/src/Cache.h
@@ -118,7 +118,7 @@ namespace T2P
}
// Lookup entry
- SharedT find(const std::string &key)
+ SharedT tqfind(const std::string &key)
{
for(typename std::vector<SharedT>::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it)
{
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 59ab8e5c..16aef608 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -90,7 +90,7 @@ void Converter::setKerning(bool mode)
SharedFont Converter::requestFont(const FontVisualParams *params)
{
std::string cacheKey = cacheFontKey(params);
- SharedFont cached = m_fontCache.find(cacheKey);
+ SharedFont cached = m_fontCache.tqfind(cacheKey);
// If not available in cache, create new one and cache it :)
if(cached)
@@ -122,10 +122,10 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b
// needed to generate the cache lookup key
selectGlyph(params);
- SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params));
+ SharedGlyph cached = m_glyphCache.tqfind(cacheGlyphKey(params));
// If not available in cache, render new one and cache it :)
- // If we're mixing ie. japanese and latin characters (TTB layout),
+ // If we're mixing ie. japanese and latin characters (TTB tqlayout),
// then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko)
if(!cached || !onlyLatin)
cached = calcGlyph(params, affine, onlyLatin);
@@ -162,13 +162,13 @@ void Converter::selectGlyph(GlyphRenderParams *params)
// 2. Load glyph into font's glyphSlot, according to the GlyphLayoutParams
int flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
- // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering
+ // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB tqlayouts when rendering
// a latin glyph because it needs to be rotated...
- if(params->layout()->tb())
+ if(params->tqlayout()->tb())
{
Script script;
SCRIPT_FOR_CHAR(script, params->character())
- if(script != Latin || params->layout()->glyphOrientationVertical() == 0)
+ if(script != Latin || params->tqlayout()->glyphOrientationVertical() == 0)
flags |= FT_LOAD_VERTICAL_LAYOUT;
}
@@ -193,7 +193,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
affine.dx() += kx + affine.m21() * ky;
// Only apply y kerning in TB mode
- if(params->layout()->tb())
+ if(params->tqlayout()->tb())
affine.dy() += kx + affine.m22() * ky;
}
@@ -206,7 +206,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
traceAffine.scale(1000.0 / params->font()->fontFace()->units_per_EM);
// 3b. Enable character rotation, if needed
- if(params->layout()->tb())
+ if(params->tqlayout()->tb())
{
Script script;
SCRIPT_FOR_CHAR(script, params->character())
@@ -214,7 +214,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine
{
FT_Matrix matrix;
- double angle = deg2rad * params->layout()->glyphOrientationVertical();
+ double angle = deg2rad * params->tqlayout()->glyphOrientationVertical();
matrix.xx = (FT_Fixed)( cos(angle) * 0x10000L);
matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L);
matrix.yx = (FT_Fixed)( sin(angle) * 0x10000L);
@@ -257,21 +257,21 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
if(params->useBidi())
{
FriBidiCharType baseDir = FRIBIDI_TYPE_N;
- FriBidiChar *unicodeIn = new FriBidiChar[length + 1];
- FriBidiChar *unicodeOut = new FriBidiChar[length + 1];
+ FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1];
+ FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1];
bidi = new unsigned short[length + 1];
for(unsigned int i = 0; i < length; i++)
- unicodeIn[i] = text[i];
+ tqunicodeIn[i] = text[i];
- fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0);
+ fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0);
for(unsigned int i = 0; i < length; i++)
- bidi[i] = unicodeOut[i];
+ bidi[i] = tqunicodeOut[i];
bidi[length] = 0;
- delete []unicodeIn;
- delete []unicodeOut;
+ delete []tqunicodeIn;
+ delete []tqunicodeOut;
}
else
bidi = const_cast<unsigned short *>(text);
@@ -302,7 +302,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
int pixelUnderlineThickness = T2PMAX(1, (int) ((font->fontFace()->underline_thickness * fontSize / font->fontFace()->units_per_EM) * affine.m22()));
// 3. Prepare needed variables for the rendering loop
- // - rendering params (layout, font...)
+ // - rendering params (tqlayout, font...)
// - bounding box (per glyph, overall)
// - glyph matrix (overall)
// - resulting glyph sets
@@ -456,7 +456,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
result->m_height = T2PMAX(1, int(bbox.b().y() - bbox.a().y()));
// Correct bounding box information also on
- // vertical layouts! (Niko)
+ // vertical tqlayouts! (Niko)
if(!params->tb())
{
if(bpath)
diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp
index 1d6f7005..2ced971d 100644
--- a/ksvg/impl/libs/libtext2path/src/Font.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Font.cpp
@@ -141,7 +141,7 @@ std::string Font::buildRequest(const FontVisualParams *fontParams, int &id)
FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast<const FcChar8 *>(string.c_str()));
}
- // Always load vertical layout
+ // Always load vertical tqlayout
FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true);
// Disable hinting
@@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams)
return false;
}
- // Choose unicode charmap
+ // Choose tqunicode charmap
for(int charmap = 0; charmap < m_fontFace->num_charmaps; charmap++)
{
if(m_fontFace->charmaps[charmap]->encoding == ft_encoding_unicode)
@@ -217,7 +217,7 @@ bool Font::load(const FontVisualParams *fontParams)
if(error)
{
- std::cout << "Font::load(), unable to select unicode charmap. Aborting!" << std::endl;
+ std::cout << "Font::load(), unable to select tqunicode charmap. Aborting!" << std::endl;
FT_Done_Face(m_fontFace);
m_fontFace = 0;
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.cpp b/ksvg/impl/libs/libtext2path/src/Glyph.cpp
index 5d172018..08ad55a8 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp
@@ -1,5 +1,4 @@
-/*
- Copyright (C) 2003 Nikolas Zimmermann <wildfox@kde.org>
+/* Copyright (C) 2003 Nikolas Zimmermann <wildfox@kde.org>
This file is part of the KDE project
This library is free software; you can redistribute it and/or
@@ -310,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font)
m_font = font;
}
-const GlyphLayoutParams *GlyphRenderParams::layout() const
+const GlyphLayoutParams *GlyphRenderParams::tqlayout() const
{
return m_layout;
}
-void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout)
+void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout)
{
- m_layout = layout;
+ m_layout = tqlayout;
}
unsigned int GlyphRenderParams::glyphIndex() const
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h
index b3bd3fb5..73951b47 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.h
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.h
@@ -171,8 +171,8 @@ namespace T2P
Font *font() const;
void setFont(Font *font);
- const GlyphLayoutParams *layout() const;
- void setLayout(const GlyphLayoutParams *layout);
+ const GlyphLayoutParams *tqlayout() const;
+ void setLayout(const GlyphLayoutParams *tqlayout);
unsigned int glyphIndex() const;
void setGlyphIndex(unsigned int glyphIndex);
@@ -185,7 +185,7 @@ namespace T2P
private:
Font *m_font;
- const GlyphLayoutParams *m_layout; // Glyph layouting params
+ const GlyphLayoutParams *m_layout; // Glyph tqlayouting params
unsigned int m_glyphIndex; // 'character' index in font
unsigned int m_lastGlyph; // Kerning
diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
index 33855a81..1103ab69 100644
--- a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
+++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp
@@ -5,27 +5,27 @@
**
** Copyright (C) 2002-2003 Trolltech AS. All rights reserved.
**
-** This file is part of the kernel module of the Qt GUI Toolkit.
+** This file is part of the kernel module of the TQt GUI Toolkit.
**
** This file may be distributed under the terms of the Q Public License
** as defined by Trolltech AS of Norway and appearing in the file
-** LICENSE.QPL included in the packaging of this file.
+** LICENSE.TQPL included in the packaging of this file.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
** Agreement provided with the Software.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about Qt Commercial License Agreements.
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** information about TQt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for TQPL licensing information.
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.h b/ksvg/impl/libs/libtext2path/src/QtUnicode.h
index 41008500..29714502 100644
--- a/ksvg/impl/libs/libtext2path/src/QtUnicode.h
+++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef T2P_QT_UNICODE_H
-#define T2P_QT_UNICODE_H
+#ifndef T2P_TQT_UNICODE_H
+#define T2P_TQT_UNICODE_H
namespace T2P
{
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
index 3f2fe30d..696cfec3 100644
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
+++ b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
@@ -372,7 +372,7 @@ template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> co
#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 also doesn't accept it
+// aptqparently EDG 2.38 also doesn't accept it
template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
{
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 01f60976..522480f1 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,24 +1103,24 @@ xlib_window_is_viewable (Window w)
XWindowAttributes wa;
while (w != 0) {
- Window parent, root, *children;
- int nchildren;
+ Window tqparent, root, *tqchildren;
+ int ntqchildren;
XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
if (wa.map_state != IsViewable)
return 0;
if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
- &parent, &children, &nchildren))
+ &tqparent, &tqchildren, &ntqchildren))
return 0;
- if (nchildren > 0)
- XFree (children);
+ if (ntqchildren > 0)
+ XFree (tqchildren);
- if (parent == root)
+ if (tqparent == root)
return 1;
- w = parent;
+ w = tqparent;
}
return 0;
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
index aa94c7c6..7848f8d3 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
@@ -61,9 +61,9 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
XlibRgbDither dither,
int x_dither, int y_dither);
-void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
Pixmap *pixmap_return,
- Pixmap *mask_return,
+ Pixmap *tqmask_return,
int alpha_threshold);
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
index eb7e4cdf..95a6c722 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
@@ -913,7 +913,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
static_image[i]->byte_order = MSBFirst;
}
}
- /* ok, so apparently, image_info->bpp is actually
+ /* ok, so aptqparently, image_info->bpp is actually
BYTES per pixel. What fun! */
switch (static_image[0]->bits_per_pixel) {
case 1:
diff --git a/ksvg/impl/svgpathparser.cc b/ksvg/impl/svgpathparser.cc
index 590ac2ba..e072b715 100644
--- a/ksvg/impl/svgpathparser.cc
+++ b/ksvg/impl/svgpathparser.cc
@@ -100,7 +100,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process )
if(!s.isEmpty())
{
TQString d = s;
- d = d.replace(',', ' ');
+ d = d.tqreplace(',', ' ');
d = d.simplifyWhiteSpace();
const char *ptr = d.latin1();
const char *end = d.latin1() + d.length() + 1;
diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h
index 8e7d4747..92ba5b69 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 *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList());
+ virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
};
};
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.cpp b/ksvg/plugin/backends/agg/AggCanvasItems.cpp
index be4727ac..36b84e86 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->invalidate(this, false);
+ m_canvas->tqinvalidate(this, false);
}
else if(reason == UPDATE_TRANSFORM)
{
freeSVPs();
init();
- m_canvas->invalidate(this, true);
+ m_canvas->tqinvalidate(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->invalidate(this, true);
+ m_canvas->tqinvalidate(this, true);
}
}
-void AggShape::draw(SVGShapeImpl *shape)
+void AggShape::draw(SVGShapeImpl *tqshape)
{
- if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender()))
+ if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender()))
return;
//if(!m_strokeSVP && (!m_fillSVP || !m_style->isFilled()))
@@ -292,14 +292,14 @@ void AggShape::draw(SVGShapeImpl *shape)
m_curved.approximation_scale(pow(m_transform.scale(), 0.75));
if(m_fillPainter)
- m_fillPainter->draw(m_canvas, m_curved_trans, m_style, shape);
+ m_fillPainter->draw(m_canvas, m_curved_trans, m_style, tqshape);
if(m_strokePainter)
- m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, shape);
+ m_strokePainter->draw(m_canvas, m_curved_stroked_trans, m_style, tqshape);
}
-bool AggShape::isVisible(SVGShapeImpl *shape)
+bool AggShape::isVisible(SVGShapeImpl *tqshape)
{
- return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender());
+ return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->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 *shape)
+void AggStrokePaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape)
{
canvas->m_ras.reset();
if(style->getStrokeColor()->paintType() == SVG_PAINTTYPE_URI)
{
- AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getStrokeColor()->uri().string()));
+ AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getStrokeColor()->uri().string()));
if(!pserver) return;
- pserver->setBBoxTarget(shape);
+ pserver->setBBoxTarget(tqshape);
// 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 *shape)
+void AggFillPaintServer::draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape)
{
canvas->m_ras.reset();
if(style->getFillColor()->paintType() == SVG_PAINTTYPE_URI)
{
- AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), style->getFillColor()->uri().string()));
+ AggPaintServer *pserver = static_cast<AggPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), style->getFillColor()->uri().string()));
if(!pserver) return;
- pserver->setBBoxTarget(shape);
+ pserver->setBBoxTarget(tqshape);
// TODO : Clipping
if(!pserver->finalized())
@@ -1166,13 +1166,13 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2)
svpelement = ++it;
}
- m_canvas->invalidate(this, false);
+ m_canvas->tqinvalidate(this, false);
}
else if(reason == UPDATE_TRANSFORM)
{
clearCurved();
init();
- m_canvas->invalidate(this, true);
+ m_canvas->tqinvalidate(this, true);
}
else if(reason == UPDATE_ZOOM)
{
@@ -1398,7 +1398,7 @@ void AggGradient::parseGradientStops(SVGGradientElementImpl *gradient)
opacity *= elem->stopOpacity();
// Get rgba color including stop-opacity
- Q_UINT32 rgba = (stopColor << 8) | int(floor(int(opacity * 255.0) + 0.5));
+ TQ_UINT32 rgba = (stopColor << 8) | int(floor(int(opacity * 255.0) + 0.5));
// Convert from separated to premultiplied alpha
a = rgba & 0xff;
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.h b/ksvg/plugin/backends/agg/AggCanvasItems.h
index b5599952..7612b234 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 *shape);
+ void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape);
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 *shape);
+ void draw(AggCanvas *canvas, VertexSource &vs, SVGStylableImpl *style, SVGShapeImpl *tqshape);
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 *shape);
+ void draw(SVGShapeImpl *tqshape);
void calcSVPs(const SVGMatrixImpl *matrix);
virtual void init();
virtual void init(const SVGMatrixImpl *);
- bool isVisible(SVGShapeImpl *shape);
+ bool isVisible(SVGShapeImpl *tqshape);
void setRenderContext(RenderContext context) { m_context = context; }
@@ -327,7 +327,7 @@ namespace KSVG
RenderContext m_context;
AggCanvas *m_canvas;
- QRect m_bbox;
+ TQRect m_bbox;
AggFillPaintServer *m_fillPainter;
AggStrokePaintServer *m_strokePainter;
};
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp
index 55b371dd..05f37e82 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 *shape = dynamic_cast<SVGShapeImpl *>(style);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(style);
- if(shape)
+ if(tqshape)
{
if(image.depth() != 32)
image = image.convertDepth(32);
ArtSVP *imageBorder = svpFromPolygon(clippingPolygon);
- ArtSVP *clipSvp = clipSingleSVP(imageBorder, shape);
+ ArtSVP *clipSvp = clipSingleSVP(imageBorder, tqshape);
ArtDRect bbox;
art_drect_svp(&bbox, clipSvp);
@@ -214,12 +214,12 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat
TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
- TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox);
+ TQByteArray tqmask = SVGMaskElementImpl::tqmaskRectangle(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 *)mask.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 *)tqmask.data());
}
art_svp_free(imageBorder);
@@ -266,10 +266,10 @@ ArtSVP *LibartCanvas::clippingRect(const TQRect &rect, const SVGMatrixImpl *ctm)
return result;
}
-ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
+ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
{
ArtSVP *clippedSvp = copy_svp(svp);
- SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(shape);
+ SVGStylableImpl *style = dynamic_cast<SVGStylableImpl *>(tqshape);
if(style)
{
@@ -282,7 +282,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
if(clipPath)
{
LibartClipPath *lclip = dynamic_cast<LibartClipPath *>(clipPath);
- reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(shape);
+ reinterpret_cast<SVGClipPathElementImpl *>(clipPath->element())->setBBoxTarget(tqshape);
lclip->init();
@@ -296,7 +296,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
}
}
- SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(shape);
+ SVGSVGElementImpl *svg = dynamic_cast<SVGSVGElementImpl *>(tqshape);
// 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 *shape)
clippedSvp = s;
}
- if(dynamic_cast<SVGPatternElementImpl *>(shape) != 0)
+ if(dynamic_cast<SVGPatternElementImpl *>(tqshape) != 0)
{
// TODO: inherit clipping paths into tile space
}
- else if(dynamic_cast<SVGMarkerElementImpl *>(shape) != 0)
+ else if(dynamic_cast<SVGMarkerElementImpl *>(tqshape) != 0)
{
- SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(shape);
+ SVGMarkerElementImpl *marker = static_cast<SVGMarkerElementImpl *>(tqshape);
if(!marker->clipShape().isEmpty())
{
@@ -329,23 +329,23 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
}
else
{
- SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(shape);
- DOM::Node parentNode = element->parentNode();
+ SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(tqshape);
+ DOM::Node tqparentNode = element->parentNode();
- if(!parentNode.isNull())
+ if(!tqparentNode.isNull())
{
- SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNode.handle());
+ SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNode.handle());
- if(parent)
+ if(tqparent)
{
- SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(parent);
+ SVGShapeImpl *tqparentShape = dynamic_cast<SVGShapeImpl *>(tqparent);
- if(parentShape)
+ if(tqparentShape)
{
// Clip against ancestor clipping paths
- ArtSVP *parentClippedSvp = clipSingleSVP(clippedSvp, parentShape);
+ ArtSVP *tqparentClippedSvp = clipSingleSVP(clippedSvp, tqparentShape);
art_svp_free(clippedSvp);
- clippedSvp = parentClippedSvp;
+ clippedSvp = tqparentClippedSvp;
}
}
}
@@ -354,7 +354,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *shape)
return clippedSvp;
}
-void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox)
+void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox)
{
int x0 = screenBBox.left();
int y0 = screenBBox.top();
@@ -363,13 +363,13 @@ void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect
if(m_nrChannels == 3)
{
- 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());
+ 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());
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 *)mask.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 *)tqmask.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 9232789a..ff3829bd 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 mask, TQRect screenBBox);
+ void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray tqmask, 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 58ad5047..0e5e3bed 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 *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList());
+ virtual TQObject *createObject(TQObject *tqparent = 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 998fb51f..32dad452 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 *shape)
+bool LibartShape::isVisible(SVGShapeImpl *tqshape)
{
- return m_referenced || (m_style->getVisible() && m_style->getDisplay() && shape->directRender());
+ return m_referenced || (m_style->getVisible() && m_style->getDisplay() && tqshape->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->invalidate(this, false);
+ m_canvas->tqinvalidate(this, false);
}
else if(reason == UPDATE_TRANSFORM)
{
reset();
- m_canvas->invalidate(this, true);
+ m_canvas->tqinvalidate(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->invalidate(this, true);
+ m_canvas->tqinvalidate(this, true);
}
}
-void LibartShape::draw(SVGShapeImpl *shape)
+void LibartShape::draw(SVGShapeImpl *tqshape)
{
- if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !shape->directRender()))
+ if(!m_referenced && (!m_style->getVisible() || !m_style->getDisplay() || !tqshape->directRender()))
return;
bool fillOk = m_fillSVP && m_style->isFilled();
@@ -199,10 +199,10 @@ void LibartShape::draw(SVGShapeImpl *shape)
if(fillOk || strokeOk)
{
if(m_fillPainter && m_fillSVP)
- m_fillPainter->draw(m_canvas, m_fillSVP, m_style, shape);
+ m_fillPainter->draw(m_canvas, m_fillSVP, m_style, tqshape);
if(m_strokePainter && m_strokeSVP)
- m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, shape);
+ m_strokePainter->draw(m_canvas, m_strokeSVP, m_style, tqshape);
}
}
@@ -230,9 +230,9 @@ void LibartPainter::update(SVGStylableImpl *style)
}
}
-void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape)
+void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape)
{
- ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, shape);
+ ArtSVP *clippedSvp = canvas->clipSingleSVP(svp, tqshape);
// Clipping
ArtDRect bbox;
@@ -252,22 +252,22 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st
TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
- TQByteArray mask = SVGMaskElementImpl::maskRectangle(shape, screenBBox);
+ TQByteArray tqmask = SVGMaskElementImpl::tqmaskRectangle(tqshape, screenBBox);
if(paintType(style) == SVG_PAINTTYPE_URI)
{
- LibartPaintServer *pserver = static_cast<LibartPaintServer *>(SVGPaintServerImpl::paintServer(shape->ownerDoc(), paintUri(style)));
+ LibartPaintServer *pserver = static_cast<LibartPaintServer *>(SVGPaintServerImpl::paintServer(tqshape->ownerDoc(), paintUri(style)));
if(pserver)
{
- pserver->setBBoxTarget(shape);
+ pserver->setBBoxTarget(tqshape);
if(!pserver->finalized())
pserver->finalizePaintServer();
- pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox);
+ pserver->render(canvas, clippedSvp, opacity(style), tqmask, screenBBox);
}
}
else
- canvas->drawSVP(clippedSvp, m_color, mask, screenBBox);
+ canvas->drawSVP(clippedSvp, m_color, tqmask, screenBBox);
}
art_svp_free(clippedSvp);
@@ -1064,29 +1064,29 @@ void LibartPath::init(const SVGMatrixImpl *screenCTM)
double cury = m_array[index - 1].y3;
// Find last subpath
- int find = -1;
+ int tqfind = -1;
for(int i = index - 1; i >= 0; i--)
{
if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
{
- find = i;
+ tqfind = i;
break;
}
}
// Fix a problem where the .svg file used floats as values... (sofico.svg)
- if(curx != m_array[find].x3 && cury != m_array[find].y3)
+ if(curx != m_array[tqfind].x3 && cury != m_array[tqfind].y3)
{
- if((int) curx == (int) m_array[find].x3 && (int) cury == (int) m_array[find].y3)
+ if((int) curx == (int) m_array[tqfind].x3 && (int) cury == (int) m_array[tqfind].y3)
{
ensureSpace(m_array, index)
m_array[index].code = ART_LINETO;
- m_array[index].x3 = m_array[find].x3;
- m_array[index].y3 = m_array[find].y3;
+ m_array[index].x3 = m_array[tqfind].x3;
+ m_array[index].y3 = m_array[tqfind].y3;
- curx = m_array[find].x3;
- cury = m_array[find].y3;
+ curx = m_array[tqfind].x3;
+ cury = m_array[tqfind].y3;
index++;
}
@@ -1095,16 +1095,16 @@ void LibartPath::init(const SVGMatrixImpl *screenCTM)
// handle filled paths that are not closed explicitly
if(m_path->getFillColor()->paintType() != SVG_PAINTTYPE_NONE)
{
- if((int) curx != (int) m_array[find].x3 || (int) cury != (int) m_array[find].y3)
+ if((int) curx != (int) m_array[tqfind].x3 || (int) cury != (int) m_array[tqfind].y3)
{
ensureSpace(m_array, index)
m_array[index].code = (ArtPathcode)ART_END2;
- m_array[index].x3 = m_array[find].x3;
- m_array[index].y3 = m_array[find].y3;
+ m_array[index].x3 = m_array[tqfind].x3;
+ m_array[index].y3 = m_array[tqfind].y3;
- curx = m_array[find].x3;
- cury = m_array[find].y3;
+ curx = m_array[tqfind].x3;
+ cury = m_array[tqfind].y3;
index++;
}
@@ -1147,12 +1147,12 @@ void LibartPath::svgMoveTo(double x1, double y1, bool closed, bool)
if(index > 0 && !closed)
{
// Find last subpath
- int find = -1;
+ int tqfind = -1;
for(int i = index - 1; i >= 0; i--)
{
if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
{
- find = i;
+ tqfind = i;
break;
}
}
@@ -1160,8 +1160,8 @@ void LibartPath::svgMoveTo(double x1, double y1, bool closed, bool)
ensureSpace(m_array, index)
m_array[index].code = (ArtPathcode) ART_END2;
- m_array[index].x3 = m_array[find].x3;
- m_array[index].y3 = m_array[find].y3;
+ m_array[index].x3 = m_array[tqfind].x3;
+ m_array[index].y3 = m_array[tqfind].y3;
index++;
}
@@ -1205,25 +1205,25 @@ void LibartPath::svgClosePath()
double curx = m_array[index - 1].x3;
double cury = m_array[index - 1].y3;
- int find = -1;
+ int tqfind = -1;
for(int i = index - 1; i >= 0; i--)
{
if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
{
- find = i;
+ tqfind = i;
break;
}
}
- if(find != -1)
+ if(tqfind != -1)
{
- if(m_array[find].x3 != curx || m_array[find].y3 != cury)
+ if(m_array[tqfind].x3 != curx || m_array[tqfind].y3 != cury)
{
ensureSpace(m_array, index)
m_array[index].code = ART_LINETO;
- m_array[index].x3 = m_array[find].x3;
- m_array[index].y3 = m_array[find].y3;
+ m_array[index].x3 = m_array[tqfind].x3;
+ m_array[index].y3 = m_array[tqfind].y3;
}
}
}
@@ -1285,28 +1285,28 @@ void LibartClipPath::init()
for(; !node.isNull(); node = node.nextSibling())
{
SVGElementImpl *element = m_clipPath->ownerDoc()->getElementFromHandle(node.handle());
- SVGShapeImpl *shape = dynamic_cast<SVGShapeImpl *>(element);
+ SVGShapeImpl *tqshape = dynamic_cast<SVGShapeImpl *>(element);
SVGTestsImpl *tests = dynamic_cast<SVGTestsImpl *>(element);
bool ok = tests ? tests->ok() : true;
- if(element && shape && ok && !shape->isContainer())
+ if(element && tqshape && ok && !tqshape->isContainer())
{
- LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(shape->item());
+ LibartClipItem *clipElement = dynamic_cast<LibartClipItem *>(tqshape->item());
- if(dynamic_cast<LibartText *>(shape->item()))
+ if(dynamic_cast<LibartText *>(tqshape->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 *>(shape->item());
+ clipElement = dynamic_cast<LibartText *>(tqshape->item());
}
if(clipElement)
{
clipElement->setRenderContext(CLIPPING);
- // Push coordinate system down to children.
- SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(shape);
+ // Push coordinate system down to tqchildren.
+ SVGLocatableImpl *locatable = dynamic_cast<SVGLocatableImpl *>(tqshape);
if(locatable)
locatable->updateCachedScreenCTM(clipMatrix);
@@ -1505,22 +1505,22 @@ void LibartText::update(CanvasItemUpdate reason, int param1, int param2)
bool strokeOk = stroke && stroke->svp && text->isStroked() && text->getStrokeWidth()->baseVal()->value() > 0; // Spec: A zero value causes no stroke to be painted.
if(fillOk || strokeOk)
{
- if(m_fillPainters.find(text))
+ if(m_fillPainters.tqfind(text))
m_fillPainters[text]->update(text);
- if(m_strokePainters.find(text))
+ if(m_strokePainters.tqfind(text))
m_strokePainters[text]->update(text);
}
fill = ++it1;
stroke = ++it2;
}
- m_canvas->invalidate(this, false);
+ m_canvas->tqinvalidate(this, false);
}
else if(reason == UPDATE_TRANSFORM)
{
clearSVPs();
init();
- m_canvas->invalidate(this, true);
+ m_canvas->tqinvalidate(this, true);
}
else if(reason == UPDATE_ZOOM)
{
@@ -1574,10 +1574,10 @@ void LibartText::draw()
if(fillOk || strokeOk)
{
- if(fillOk && m_fillPainters.find(text))
+ if(fillOk && m_fillPainters.tqfind(text))
m_fillPainters[text]->draw(m_canvas, fill->svp, text, text);
- if(strokeOk && m_strokePainters.find(text))
+ if(strokeOk && m_strokePainters.tqfind(text))
m_strokePainters[text]->draw(m_canvas, stroke->svp, text, text);
}
fill = ++it1;
@@ -1655,11 +1655,11 @@ void LibartText::renderCallback(SVGTextContentElementImpl *element, const SVGMat
m_drawFillItems.append(fillElement);
m_drawStrokeItems.append(strokeElement);
- if(!m_fillPainters.find(element) && element->isFilled())
+ if(!m_fillPainters.tqfind(element) && element->isFilled())
m_fillPainters.insert(element, new LibartFillPainter(element));
// Spec: A zero value causes no stroke to be painted.
- if(!m_strokePainters.find(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
+ if(!m_strokePainters.tqfind(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
m_strokePainters.insert(element, new LibartStrokePainter(element));
}
}
@@ -1734,7 +1734,7 @@ void LibartText::addTextDecoration(SVGTextContentElementImpl *element, double x,
m_drawFillItems.append(fillElement);
- if(!m_fillPainters.find(element) && element->isFilled())
+ if(!m_fillPainters.tqfind(element) && element->isFilled())
m_fillPainters.insert(element, new LibartFillPainter(element));
art_svp_free(temp);
@@ -1752,7 +1752,7 @@ void LibartText::addTextDecoration(SVGTextContentElementImpl *element, double x,
m_drawStrokeItems.append(strokeElement);
// Spec: A zero value causes no stroke to be painted.
- if(!m_strokePainters.find(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
+ if(!m_strokePainters.tqfind(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
m_strokePainters.insert(element, new LibartStrokePainter(element));
}
art_free(vec);
@@ -1799,10 +1799,10 @@ ArtRender *LibartPaintServer::createRenderer(TQRect bbox, KSVGCanvas *c)
// Note: We always pass 3 for the number of channels since the ART_ALPHA parameter
// adds the alpha channel when present.
ArtRender *render = 0;
- render = art_render_new(QMIN(x0, x1),
- QMIN(y0, y1),
- QMAX(x0, x1) + 1,
- QMAX(y0, y1) + 1,
+ render = art_render_new(TQMIN(x0, x1),
+ TQMIN(y0, y1),
+ TQMAX(x0, x1) + 1,
+ TQMAX(y0, y1) + 1,
c->renderingBuffer() + x0 * c->nrChannels() + y0 * c->rowStride(),
c->rowStride(), 3, 8,
c->nrChannels() == 3 ? ART_ALPHA_NONE : ART_ALPHA_PREMUL, 0);
@@ -1868,8 +1868,8 @@ void LibartGradient::parseGradientStops(SVGGradientElementImpl *gradient)
float opacity = elem->stopOpacity();
// Get rgba color including stop-opacity
- Q_UINT32 rgba = (stopColor << 8) | int(opacity * 255.0 + 0.5);
- Q_UINT32 r, g, b, a;
+ TQ_UINT32 rgba = (stopColor << 8) | int(opacity * 255.0 + 0.5);
+ TQ_UINT32 r, g, b, a;
a = rgba & 0xff;
r = (rgba >> 24) & 0xff;
@@ -1899,7 +1899,7 @@ void LibartGradient::reference(const TQString &)
{
}
-void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox)
+void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, 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(mask.data())
+ if(tqmask.data())
art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1,
- (const art_u8 *)mask.data(), screenBBox.width());
+ (const art_u8 *)tqmask.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 mask, TQRect screenBBox)
+void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox)
{
if(!m_stops.isEmpty())
{
@@ -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 shape due to the non-uniform scaling.
+ // It also produces the elliptical tqshape due to the non-uniform scaling.
SVGRectImpl *userBBox = getBBoxTarget()->getBBox();
double width = userBBox->width();
@@ -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(mask.data())
+ if(tqmask.data())
art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1,
- (const art_u8 *)mask.data(), screenBBox.width());
+ (const art_u8 *)tqmask.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 mask, TQRect screenBBox)
+void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, 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 *)mask.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 *)tqmask.data());
}
}
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h
index d34ec9f4..bf18dbd0 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 mask, TQRect screenBBox) = 0;
+ virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, 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 mask, TQRect screenBBox);
+ virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, 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 mask, TQRect screenBBox);
+ virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, 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 mask, TQRect screenBBox);
+ virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox);
protected:
SVGPatternElementImpl *m_pattern;
@@ -138,12 +138,12 @@ namespace KSVG
virtual ~LibartPainter() {}
void update(SVGStylableImpl *style);
- void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *shape);
+ void draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *style, SVGShapeImpl *tqshape);
virtual float opacity(SVGStylableImpl *style) const = 0;
virtual unsigned short paintType(SVGStylableImpl *style) const = 0;
virtual TQString paintUri(SVGStylableImpl *style) const = 0;
- virtual QRgb color(SVGStylableImpl *style) const = 0;
+ virtual TQRgb color(SVGStylableImpl *style) const = 0;
protected:
art_u32 m_color;
@@ -157,7 +157,7 @@ namespace KSVG
float opacity(SVGStylableImpl *style) const { return style->getFillOpacity() * style->getOpacity(); }
unsigned short paintType(SVGStylableImpl *style) const { return style->getFillColor()->paintType(); }
TQString paintUri(SVGStylableImpl *style) const { return style->getFillColor()->uri().string(); }
- QRgb color(SVGStylableImpl *style) const { return style->getFillColor()->rgbColor().color(); }
+ TQRgb color(SVGStylableImpl *style) const { return style->getFillColor()->rgbColor().color(); }
};
class LibartStrokePainter : public LibartPainter
@@ -168,7 +168,7 @@ namespace KSVG
float opacity(SVGStylableImpl *style) const { return style->getStrokeOpacity() * style->getOpacity(); }
unsigned short paintType(SVGStylableImpl *style) const { return style->getStrokeColor()->paintType(); }
TQString paintUri(SVGStylableImpl *style) const { return style->getStrokeColor()->uri().string(); }
- QRgb color(SVGStylableImpl *style) const { return style->getStrokeColor()->rgbColor().color(); }
+ TQRgb color(SVGStylableImpl *style) const { return style->getStrokeColor()->rgbColor().color(); }
};
class LibartClipItem
@@ -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 *shape);
- bool isVisible(SVGShapeImpl *shape);
+ void draw(SVGShapeImpl *tqshape);
+ bool isVisible(SVGShapeImpl *tqshape);
virtual void init();
virtual void init(const SVGMatrixImpl *);
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index d5e5e1dc..41392c55 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -43,7 +43,7 @@ extern "C"
KInstance *KSVGPluginFactory::s_instance = 0;
KAboutData *KSVGPluginFactory::s_about = 0;
-KSVGPluginFactory::KSVGPluginFactory(TQObject *parent, const char *name) : KParts::Factory(parent, name)
+KSVGPluginFactory::KSVGPluginFactory(TQObject *tqparent, const char *name) : KParts::Factory(tqparent, name)
{
}
@@ -56,7 +56,7 @@ KSVGPluginFactory::~KSVGPluginFactory()
s_about = 0;
}
-KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, const char *, const TQStringList &args)
+KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *tqparentWidget, 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 *parentWidget, const
height = r2.cap(3).toUInt(&dummy);
}
- return new KSVGPlugin(parentWidget, wname, parent, name, width, height);
+ return new KSVGPlugin(tqparentWidget, wname, tqparent, name, width, height);
}
KInstance *KSVGPluginFactory::instance()
@@ -90,8 +90,8 @@ KInstance *KSVGPluginFactory::instance()
return s_instance;
}
-KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *parent)
-: KParts::BrowserExtension(parent, "KSVGPlugin BrowserExtension")
+KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *tqparent)
+: KParts::BrowserExtension(tqparent, "KSVGPlugin BrowserExtension")
{
}
diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h
index c931e503..04b351be 100644
--- a/ksvg/plugin/ksvg_factory.h
+++ b/ksvg/plugin/ksvg_factory.h
@@ -30,11 +30,12 @@ class KInstance;
class KSVGPluginFactory : public KParts::Factory
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVGPluginFactory(TQObject *parent = 0, const char *name = 0);
+ KSVGPluginFactory(TQObject *tqparent = 0, const char *name = 0);
virtual ~KSVGPluginFactory();
- virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
+ 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());
static KInstance *instance();
@@ -46,10 +47,11 @@ private:
class KSVGPluginBrowserExtension : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
friend class KSVGPlugin;
public:
- KSVGPluginBrowserExtension(KSVGPlugin *parent);
+ KSVGPluginBrowserExtension(KSVGPlugin *tqparent);
virtual ~KSVGPluginBrowserExtension();
};
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 75699ec7..87cd7398 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -81,7 +81,7 @@ struct KSVGPlugin::Private
unsigned int height;
};
-KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(parent, name)
+KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(tqparent, name)
{
kdDebug(26003) << "KSVGPlugin::KSVGPlugin" << endl;
setInstance(KSVGPluginFactory::instance());
@@ -95,7 +95,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
ksvgd->doc = 0;
- ksvgd->window = new KSVGWidget(this, wparent, "Rendering Widget");
+ ksvgd->window = new KSVGWidget(this, wtqparent, "Rendering Widget");
connect(ksvgd->window, TQT_SIGNAL(browseURL(const TQString &)), this, TQT_SLOT(browseURL(const TQString &)));
ksvgd->window->show();
@@ -110,7 +110,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
+ ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
@@ -144,7 +144,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
ksvgd->renderingBackendAction->setItems(items);
ksvgd->renderingBackendAction->setCurrentItem(KSVG::CanvasFactory::self()->itemInList(ksvgd->canvas));
- ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wparent);
+ ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wtqparent);
setXMLFile("ksvgplugin.rc");
}
@@ -299,7 +299,7 @@ void KSVGPlugin::slotRenderingBackend()
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
+ ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
openURL(m_url);
}
@@ -398,7 +398,7 @@ void KSVGPlugin::update()
void KSVGPlugin::slotSetDescription(const TQString &desc)
{
ksvgd->description = desc;
- emit setStatusBarText(i18n("Description: %1").arg(desc));
+ emit setStatusBarText(i18n("Description: %1").tqarg(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").arg(ksvgd->description));
+ emit setStatusBarText(i18n("Description: %1").tqarg(ksvgd->description));
else
emit setStatusBarText(text);
}
diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h
index 669d3661..6bff6144 100644
--- a/ksvg/plugin/ksvg_plugin.h
+++ b/ksvg/plugin/ksvg_plugin.h
@@ -35,8 +35,9 @@ namespace KSVG
class KSVGPlugin : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, unsigned int width = 0, unsigned int height = 0);
+ KSVGPlugin(TQWidget *tqparentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0);
virtual ~KSVGPlugin();
virtual bool openFile() { return false; }
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index 0f1b9d3e..8cfb4baa 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -27,11 +27,11 @@
#include "SVGDocumentImpl.h"
#include "SVGSVGElementImpl.h"
-KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name)
-: TQWidget(parent, name), m_part(part)
+KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name)
+: TQWidget(tqparent, name), m_part(part)
{
setMouseTracking(true);
- setFocusPolicy(WheelFocus);
+ setFocusPolicy(TQ_WheelFocus);
setBackgroundMode(NoBackground);
@@ -90,10 +90,10 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T
event->globalY(), // screenYArg,
clientX, // clientXArg
clientY, // clientYArg
- (event->state() & Qt::ControlButton), // ctrlKeyArg
- (event->state() & Qt::AltButton), // altKeyArg
- (event->state() & Qt::ShiftButton), // shiftKeyArg
- (event->state() & Qt::MetaButton), // metaKeyArg
+ (event->state() & TQt::ControlButton), // ctrlKeyArg
+ (event->state() & TQt::AltButton), // altKeyArg
+ (event->state() & TQt::ShiftButton), // shiftKeyArg
+ (event->state() & TQt::MetaButton), // metaKeyArg
button, // buttonArg
0);
@@ -104,7 +104,7 @@ KSVG::SVGMouseEventImpl *KSVGWidget::newMouseEvent(KSVG::SVGEvent::EventId id, T
void KSVGWidget::mouseMoveEvent(TQMouseEvent *event)
{
- if(event->state() & TQMouseEvent::ControlButton && event->state() & TQMouseEvent::LeftButton)
+ if(event->state() & TQt::ControlButton && event->state() & Qt::LeftButton)
{
if(m_panningPos.isNull())
m_panningPos = event->pos();
@@ -113,7 +113,7 @@ void KSVGWidget::mouseMoveEvent(TQMouseEvent *event)
return;
}
- else if(event->state() & TQMouseEvent::ControlButton)
+ else if(event->state() & TQt::ControlButton)
return;
KSVG::SVGMouseEventImpl *mev = newMouseEvent(KSVG::SVGEvent::MOUSEMOVE_EVENT, event);
@@ -183,10 +183,10 @@ void KSVGWidget::mouseMoveEvent(TQMouseEvent *event)
void KSVGWidget::mousePressEvent(TQMouseEvent *event)
{
- if(event->state() & TQMouseEvent::ControlButton)
+ if(event->state() & TQt::ControlButton)
return;
- if(event->button() == RightButton)
+ if(event->button() == Qt::RightButton)
{
if(part() && part()->factory())
{
@@ -213,7 +213,7 @@ void KSVGWidget::mouseReleaseEvent(TQMouseEvent *event)
m_panningPos.setY(0);
}
- if(event->state() & TQMouseEvent::ControlButton)
+ if(event->state() & TQt::ControlButton)
return;
KSVG::SVGMouseEventImpl *mev = newMouseEvent(KSVG::SVGEvent::MOUSEUP_EVENT, event);
@@ -234,7 +234,7 @@ void KSVGWidget::mouseReleaseEvent(TQMouseEvent *event)
void KSVGWidget::keyPressEvent(TQKeyEvent *ke)
{
- if(ke->stateAfter() & TQMouseEvent::ControlButton)
+ if(ke->stateAfter() & TQt::ControlButton)
{
setCursor(KCursor::sizeAllCursor());
return;
@@ -246,7 +246,7 @@ void KSVGWidget::keyPressEvent(TQKeyEvent *ke)
void KSVGWidget::keyReleaseEvent(TQKeyEvent *ke)
{
- if(ke->state() & TQMouseEvent::ControlButton)
+ if(ke->state() & TQt::ControlButton)
{
setCursor(KCursor::arrowCursor());
return;
diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h
index c25fddbc..33fc82e3 100644
--- a/ksvg/plugin/ksvg_widget.h
+++ b/ksvg/plugin/ksvg_widget.h
@@ -28,11 +28,12 @@
#include <SVGEventImpl.h>
class KSVGPlugin;
-class KSVGWidget : public QWidget
+class KSVGWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name);
+ KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name);
virtual ~KSVGWidget();
KSVGPlugin *part() const;
diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp
index dc20e06f..02e6cf95 100644
--- a/ksvg/plugin/svgcreator.cpp
+++ b/ksvg/plugin/svgcreator.cpp
@@ -56,10 +56,10 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im
doc->ref();
TQPixmap pix(width, height);
- pix.fill(Qt::white);
+ pix.fill(TQt::white);
KSVG::KSVGCanvas *c = KSVG::CanvasFactory::self()->loadCanvas(width, height);
- c->setup(&pix, &pix);
+ c->setup(TQT_TQPAINTDEVICE(&pix), TQT_TQPAINTDEVICE(&pix));
doc->attach(c);
connect(doc, TQT_SIGNAL(finishedRendering()), TQT_SLOT(slotFinished()));
diff --git a/ksvg/plugin/svgcreator.h b/ksvg/plugin/svgcreator.h
index 403f0a78..4f4c6510 100644
--- a/ksvg/plugin/svgcreator.h
+++ b/ksvg/plugin/svgcreator.h
@@ -27,6 +27,7 @@
class SVGCreator : public TQObject, public ThumbCreator
{
Q_OBJECT
+ TQ_OBJECT
public:
SVGCreator();
virtual ~SVGCreator();
diff --git a/ksvg/scripts/check_hashtablesize.pl b/ksvg/scripts/check_hashtablesize.pl
index d22e3f30..b1fd103a 100755
--- a/ksvg/scripts/check_hashtablesize.pl
+++ b/ksvg/scripts/check_hashtablesize.pl
@@ -88,9 +88,9 @@ my %counter2;
my %counter3;
# Read hashtable size
-my $readSize1 = `find -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep Function`;
-my $readSize2 = `find -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep -v Function`;
-my $readSize3 = `find -type f | xargs grep -I DontDelete | grep KSVG::`;
+my $readSize1 = `tqfind -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep Function`;
+my $readSize2 = `tqfind -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep -v Function`;
+my $readSize3 = `tqfind -type f | xargs grep -I DontDelete | grep KSVG::`;
my @result1 = split(/.\//, $readSize1);
my @result2 = split(/.\//, $readSize2);
@@ -100,9 +100,9 @@ my @result3 = split(/.\//, $readSize3);
# calcSize1 = print out all prototype hashtables
# calcSize2 = print out all non-prototype hashtables
# calcSize3 = print out all svg*constructors hashtables
-my $calcSize1 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Impl:: | grep -v Bridge::`;
-my $calcSize2 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Proto::`;
-my $calcSize3 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep Constructor`;
+my $calcSize1 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Impl:: | grep -v Bridge::`;
+my $calcSize2 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Proto::`;
+my $calcSize3 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep Constructor`;
# Bring in suitable form
calcSize($calcSize1, \%counter1, 5);
diff --git a/ksvg/scripts/generate.pl b/ksvg/scripts/generate.pl
index a9419dcc..0ef0ddc6 100755
--- a/ksvg/scripts/generate.pl
+++ b/ksvg/scripts/generate.pl
@@ -26,7 +26,7 @@ my %excludes = (
# List headers, and exclude the ones listed above
my @headers = ();
my $incdir=$here;
-opendir (INCS, $incdir) or die "Couldn't find $incdir";
+opendir (INCS, $incdir) or die "Couldn't tqfind $incdir";
foreach $filename (readdir(INCS)) {
$entry = $incdir."/".$filename;
if ( ( -e $entry or -l $entry ) # A real file or a symlink
diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1
index b0766355..39d280c4 100644
--- a/ksvg/test/W3C_TESTSUITE_1.1
+++ b/ksvg/test/W3C_TESTSUITE_1.1
@@ -103,13 +103,13 @@ linking-uri-02-b -
linking-uri-03-t x
[MASKING]
-masking-mask-01-b -
-masking-opacity-01-b o
-masking-path-01-b x
-masking-path-02-b x
-masking-path-03-t x
-masking-path-04-b o
-masking-path-05-f x
+tqmasking-tqmask-01-b -
+tqmasking-opacity-01-b o
+tqmasking-path-01-b x
+tqmasking-path-02-b x
+tqmasking-path-03-t x
+tqmasking-path-04-b o
+tqmasking-path-05-f x
[METADATA]
metadata-example-01-b x
@@ -169,12 +169,12 @@ script-handle-03-t x
script-handle-04-t x
[SHAPES]
-shapes-circle-01-t x
-shapes-ellipse-01-t x
-shapes-line-01-t x
-shapes-polygon-01-t x
-shapes-polyline-01-t x
-shapes-rect-01-t x
+tqshapes-circle-01-t x
+tqshapes-ellipse-01-t x
+tqshapes-line-01-t x
+tqshapes-polygon-01-t x
+tqshapes-polyline-01-t x
+tqshapes-rect-01-t x
[STRUCT]
struct-cond-01-t x
diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED
index 81cb6d52..1f92bef0 100644
--- a/ksvg/test/ZVON-TEST-PASSED
+++ b/ksvg/test/ZVON-TEST-PASSED
@@ -81,15 +81,15 @@ linking-view-BE-05.svg o
linking-xlinkAttr-BE-02.svg x
Group 11: [Masking] - 21.09.2003
-masking-clipPath-BE-01.svg: x
-masking-clipPath-BE-02.svg: x
-masking-clipPath-BE-08.svg: x
-masking-clipRule-BE-03.svg: x
-masking-groupOpac-BE-04.svg: x
-masking-mask-BE-05.svg: x
-masking-mask-BE-06.svg: x
-masking-property-BE-07.svg: x
-masking-vportClip-BE-09.svg: x
+tqmasking-clipPath-BE-01.svg: x
+tqmasking-clipPath-BE-02.svg: x
+tqmasking-clipPath-BE-08.svg: x
+tqmasking-clipRule-BE-03.svg: x
+tqmasking-groupOpac-BE-04.svg: x
+tqmasking-tqmask-BE-05.svg: x
+tqmasking-tqmask-BE-06.svg: x
+tqmasking-property-BE-07.svg: x
+tqmasking-vportClip-BE-09.svg: x
Group 12: [Metadata] - 21.09.2003
metadata-sample-BE-01.svg: x PLANE REFERENCE IMAGE LOOKS WRONG - WE MATCH BATIK'S OUTPUT
@@ -112,7 +112,7 @@ path-lines-BE-01.svg: x
Group 16: [Rendering] - 21.09.2003
rendering-orderGr-BE-01.svg: x
-rendering-shape-BE-03.svg: x
+rendering-tqshape-BE-03.svg: x
rendering-text-BE-02.svg: x
Group 17: [Script] - 21.09.2003
@@ -120,12 +120,12 @@ script-eventDom-BE-01.svg: x
script-uiEvents-BE-02.svg: x
Group 18: [Shapes] - 21.09.2003
-shapes-circle-BE-03.svg: x
-shapes-ellipse-BE-02.svg: x
-shapes-line-BE-04.svg: x
-shapes-polygon-BE-05.svg: x
-shapes-polyline-BE-06.svg: x
-shapes-rect-BE-01.svg: x
+tqshapes-circle-BE-03.svg: x
+tqshapes-ellipse-BE-02.svg: x
+tqshapes-line-BE-04.svg: x
+tqshapes-polygon-BE-05.svg: x
+tqshapes-polyline-BE-06.svg: x
+tqshapes-rect-BE-01.svg: x
Group 19: [Structure] - 21.09.2003
structure-allElem-BE-09.svg: x
@@ -146,8 +146,8 @@ style-selector-BE-02.svg: o
style-selector-BE-03.svg: o
Group 21: [Text] - 29.09.2003
-text-alignment-BE-10.svg: x
-text-alignment-BE-11.svg: x
+text-tqalignment-BE-10.svg: x
+text-tqalignment-BE-11.svg: x
text-altGlyph-BE-07.svg: o FONTS SUPPORT MISSING
text-decoration-BE-12.svg: x
text-extTref-BE-18.svg: x
diff --git a/ksvg/test/ecma/bbox/bbox.js b/ksvg/test/ecma/bbox/bbox.js
index 2d692694..88eaa592 100644
--- a/ksvg/test/ecma/bbox/bbox.js
+++ b/ksvg/test/ecma/bbox/bbox.js
@@ -13,12 +13,12 @@ function bbox_loop(drawit, number)
for(var i = 0; i < number; i++)
{
- var shape = doc.getElementById("test-" + i);
- var bbox = shape.getBBox();
+ var tqshape = doc.getElementById("test-" + i);
+ var bbox = tqshape.getBBox();
if(drawit == "true")
{
- draw_it(doc, bbox, shape, i + 1);
+ draw_it(doc, bbox, tqshape, i + 1);
}
else
{
@@ -27,13 +27,13 @@ function bbox_loop(drawit, number)
}
}
-function do_string(shape, number)
+function do_string(tqshape, number)
{
- var string = "\nShape " + number + "\nX = " + shape.x + "\nY = " + shape.y + "\nW = " + shape.width + "\nH = " + shape.height;
+ var string = "\nShape " + number + "\nX = " + tqshape.x + "\nY = " + tqshape.y + "\nW = " + tqshape.width + "\nH = " + shape.height;
alert(string);
}
-function draw_it(doc, bbox, shape, number)
+function draw_it(doc, bbox, tqshape, number)
{
var element = doc.createElement("rect");
element.setAttribute("x", bbox.x);
@@ -45,7 +45,7 @@ function draw_it(doc, bbox, shape, number)
element.setAttribute("stroke-width", "3");
element.setAttribute("id", "bbox" + number);
- shape.getParentNode().appendChild(element);
+ tqshape.getParentNode().appendChild(element);
}
function gen_buttons(evt, number)
diff --git a/ksvg/test/external/SVGTestWidget.cc b/ksvg/test/external/SVGTestWidget.cc
index aa968e24..ba17bc37 100644
--- a/ksvg/test/external/SVGTestWidget.cc
+++ b/ksvg/test/external/SVGTestWidget.cc
@@ -16,11 +16,11 @@ using namespace KSVG;
SVGTestWidget::SVGTestWidget(const KURL &url)
{
- setBackgroundColor(Qt::white);
+ setBackgroundColor(TQt::white);
setMouseTracking(true);
- setFocusPolicy(WheelFocus);
+ setFocusPolicy(TQ_WheelFocus);
- m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotRenderingFinished()));
+ m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished()));
if(!m_doc)
return;
@@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
if(!m_canvas)
return;
- m_canvas->setup(this, this);
+ m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this));
if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc))
return;
@@ -104,10 +104,10 @@ KSVG::SVGMouseEventImpl *newMouseEvent(SVGDocument *doc, KSVG::SVGEventImpl::Eve
event->globalY(), // screenYArg,
clientX, // clientXArg
clientY, // clientYArg
- (event->state() & Qt::ControlButton), // ctrlKeyArg
- (event->state() & Qt::AltButton), // altKeyArg
- (event->state() & Qt::ShiftButton), // shiftKeyArg
- (event->state() & Qt::MetaButton), // metaKeyArg
+ (event->state() & TQt::ControlButton), // ctrlKeyArg
+ (event->state() & TQt::AltButton), // altKeyArg
+ (event->state() & TQt::ShiftButton), // shiftKeyArg
+ (event->state() & TQt::MetaButton), // metaKeyArg
button, // buttonArg
0);
@@ -185,7 +185,7 @@ void SVGTestWidget::keyReleaseEvent(TQKeyEvent *event)
}
SVGSVGElementImpl *root = m_doc->rootElement();
if(!root) return;
- if(event->key() == Qt::Key_Minus)
+ if(event->key() == TQt::Key_Minus)
{
erase(0, 0, m_canvas->width(), m_canvas->height());
float zoomFactor = root->currentScale() / 1.2;
@@ -193,7 +193,7 @@ void SVGTestWidget::keyReleaseEvent(TQKeyEvent *event)
m_doc->syncCachedMatrices();
m_canvas->update(zoomFactor);
}
- else if(event->key() == Qt::Key_Plus)
+ else if(event->key() == TQt::Key_Plus)
{
float zoomFactor = root->currentScale() * 1.2;
root->setCurrentScale(zoomFactor);
diff --git a/ksvg/test/external/SVGTestWidget.h b/ksvg/test/external/SVGTestWidget.h
index 676f3269..d3ad6b77 100644
--- a/ksvg/test/external/SVGTestWidget.h
+++ b/ksvg/test/external/SVGTestWidget.h
@@ -6,9 +6,10 @@
#include "SVGDocument.h"
#include "KSVGCanvas.h"
-class SVGTestWidget : public QWidget
+class SVGTestWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
SVGTestWidget(const KURL &url);
~SVGTestWidget();
diff --git a/ksvg/test/external/printnodetest.h b/ksvg/test/external/printnodetest.h
index 19385014..ac1bdbf8 100644
--- a/ksvg/test/external/printnodetest.h
+++ b/ksvg/test/external/printnodetest.h
@@ -8,9 +8,10 @@ namespace KSVG
{
class SVGDocument;
-class Worker : public QObject
+class Worker : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Worker(const KURL &url);
~Worker();