summaryrefslogtreecommitdiffstats
path: root/ksvg/impl
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/impl')
-rw-r--r--ksvg/impl/SVGDocumentImpl.cc10
-rw-r--r--ksvg/impl/SVGDocumentImpl.h4
-rw-r--r--ksvg/impl/SVGEcma.cc2
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.cc2
-rw-r--r--ksvg/impl/SVGElementInstanceImpl.h2
-rw-r--r--ksvg/impl/SVGImageElementImpl.cc2
-rw-r--r--ksvg/impl/SVGLengthImpl.cc12
-rw-r--r--ksvg/impl/SVGLocatableImpl.cc8
-rw-r--r--ksvg/impl/SVGLocatableImpl.h6
-rw-r--r--ksvg/impl/SVGMaskElementImpl.cc94
-rw-r--r--ksvg/impl/SVGMaskElementImpl.h14
-rw-r--r--ksvg/impl/SVGSVGElementImpl.cc6
-rw-r--r--ksvg/impl/SVGStylableImpl.cc152
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTextContentElementImpl.h2
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.cc4
-rw-r--r--ksvg/impl/SVGTextPathElementImpl.h2
-rw-r--r--ksvg/impl/SVGTransformableImpl.cc14
-rw-r--r--ksvg/impl/libs/art_support/art_misc.c72
-rw-r--r--ksvg/impl/libs/art_support/art_rgba_svp.c36
-rw-r--r--ksvg/impl/libs/libtext2path/src/Converter.cpp4
-rw-r--r--ksvg/impl/libs/libtext2path/src/Glyph.h2
-rw-r--r--ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp2
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h2
-rw-r--r--ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c2
25 files changed, 229 insertions, 229 deletions
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index 13de4b79..2b0383ec 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 *tqparentImage) : TQObject(), DOM::DomShared(), DOM::Document(), SVGDOMNodeBridge(static_cast<DOM::Node>(*this))
+SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *parentImage) : 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 *tqpar
m_resortZIndicesOnFinishedLoading = false;
m_fit = fit;
- m_parentImage = tqparentImage;
+ m_parentImage = parentImage;
if(m_parentImage)
m_parentImage->ref();
}
@@ -392,9 +392,9 @@ void SVGDocumentImpl::syncCachedMatrices()
{
if(rootElement())
{
- SVGMatrixImpl *tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
- rootElement()->checkCachedScreenCTM(tqparentMatrix);
- tqparentMatrix->deref();
+ SVGMatrixImpl *parentMatrix = SVGSVGElementImpl::createSVGMatrix();
+ rootElement()->checkCachedScreenCTM(parentMatrix);
+ parentMatrix->deref();
}
}
diff --git a/ksvg/impl/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h
index fcbb9f35..479cb7f7 100644
--- a/ksvg/impl/SVGDocumentImpl.h
+++ b/ksvg/impl/SVGDocumentImpl.h
@@ -74,7 +74,7 @@ class SVGDocumentImpl : public TQObject,
Q_OBJECT
TQ_OBJECT
public:
- SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *tqparentImage = 0);
+ SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0);
virtual ~SVGDocumentImpl();
float screenPixelsPerMillimeterX() const;
@@ -90,7 +90,7 @@ public:
void setRootElement(SVGSVGElementImpl *);
SVGSVGElementImpl *rootElement() const;
- SVGImageElementImpl *tqparentImage() const { return m_parentImage; }
+ SVGImageElementImpl *parentImage() const { return m_parentImage; }
SVGWindowImpl *window();
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index e0c427ae..c7105d41 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
- tqparentNode SVGDOMNodeBridge::ParentNode DontDelete|ReadOnly
+ parentNode SVGDOMNodeBridge::ParentNode DontDelete|ReadOnly
childNodes SVGDOMNodeBridge::ChildNodes DontDelete|ReadOnly
firstChild SVGDOMNodeBridge::FirstChild DontDelete|ReadOnly
lastChild SVGDOMNodeBridge::LastChild DontDelete|ReadOnly
diff --git a/ksvg/impl/SVGElementInstanceImpl.cc b/ksvg/impl/SVGElementInstanceImpl.cc
index 46252fcd..97cd28a2 100644
--- a/ksvg/impl/SVGElementInstanceImpl.cc
+++ b/ksvg/impl/SVGElementInstanceImpl.cc
@@ -75,7 +75,7 @@ SVGUseElementImpl *SVGElementInstanceImpl::correspondingUseElement() const
return m_correspondingUseElement;
}
-SVGElementInstanceImpl *SVGElementInstanceImpl::tqparentNode() const
+SVGElementInstanceImpl *SVGElementInstanceImpl::parentNode() const
{
return m_parentNode;
}
diff --git a/ksvg/impl/SVGElementInstanceImpl.h b/ksvg/impl/SVGElementInstanceImpl.h
index 7ee469af..d9f3afae 100644
--- a/ksvg/impl/SVGElementInstanceImpl.h
+++ b/ksvg/impl/SVGElementInstanceImpl.h
@@ -40,7 +40,7 @@ public:
SVGElementImpl *correspondingElement() const;
SVGUseElementImpl *correspondingUseElement() const;
- SVGElementInstanceImpl *tqparentNode() const;
+ SVGElementInstanceImpl *parentNode() const;
SVGElementInstanceListImpl *childNodes() const;
SVGElementInstanceImpl *firstChild() const;
SVGElementInstanceImpl *lastChild() const;
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 19152095..4a60d622 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -353,7 +353,7 @@ void SVGImageElementImpl::onScreenCTMUpdated()
SVGMatrixImpl *ctm = getScreenCTM();
m_svgRoot->setRootParentScreenCTM(ctm);
- m_svgRoot->tqinvalidateCachedMatrices();
+ m_svgRoot->invalidateCachedMatrices();
m_svgRoot->ownerDoc()->syncCachedMatrices();
}
}
diff --git a/ksvg/impl/SVGLengthImpl.cc b/ksvg/impl/SVGLengthImpl.cc
index da094837..a8c9080c 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 *tqparentStyle = 0;
+ SVGStylableImpl *parentStyle = 0;
if((!sizeLocal || !familyLocal) && m_context)
- tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle()));
+ parentStyle = 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(tqparentStyle && tqparentStyle->getFontSize() != -1)
- useSize = tqparentStyle->getFontSize();
+ else if(parentStyle && parentStyle->getFontSize() != -1)
+ useSize = parentStyle->getFontSize();
if(familyLocal)
useFont = style->getFontFamily()->getFirst()->string();
- else if(tqparentStyle && tqparentStyle->getFontFamily() && tqparentStyle->getFontFamily()->getFirst())
- useFont = tqparentStyle->getFontFamily()->getFirst()->string();
+ else if(parentStyle && parentStyle->getFontFamily() && parentStyle->getFontFamily()->getFirst())
+ useFont = parentStyle->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 87ccd604..63384d7e 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 *tqparentScreenCTM)
+void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
{
- m_cachedScreenCTM->copy(tqparentScreenCTM);
+ m_cachedScreenCTM->copy(parentScreenCTM);
const SVGMatrixImpl *local = localMatrix();
@@ -114,7 +114,7 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreen
}
}
-void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM)
+void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
{
if(m_cachedScreenCTMIsValid)
{
@@ -135,7 +135,7 @@ void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenC
}
}
else
- updateCachedScreenCTM(tqparentScreenCTM);
+ updateCachedScreenCTM(parentScreenCTM);
}
// Ecma stuff
diff --git a/ksvg/impl/SVGLocatableImpl.h b/ksvg/impl/SVGLocatableImpl.h
index 49469164..81ce3326 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 tqinvalidateCachedMatrices() { m_cachedScreenCTMIsValid = false; }
+ void invalidateCachedMatrices() { 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 *tqparentScreenCTM);
+ virtual void checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
// Update the cached matrix, and update child element cached matrices,
// recursively.
- virtual void updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM);
+ virtual void updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
// Called immediately after the screen ctm has been updated.
virtual void onScreenCTMUpdated() {}
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index b7f26ed3..8096c26d 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_tqmaskUnits = new SVGAnimatedEnumerationImpl();
- m_tqmaskUnits->ref();
+ m_maskUnits = new SVGAnimatedEnumerationImpl();
+ m_maskUnits->ref();
- m_tqmaskContentUnits = new SVGAnimatedEnumerationImpl();
- m_tqmaskContentUnits->ref();
+ m_maskContentUnits = new SVGAnimatedEnumerationImpl();
+ m_maskContentUnits->ref();
m_converter = new SVGUnitConverter();
m_converter->add(m_x);
@@ -77,7 +77,7 @@ SVGMaskElementImpl::SVGMaskElementImpl(DOM::ElementImpl *impl) : SVGElementImpl(
m_canvas = 0;
- m_tqmaskCache.setMaxTotalCost(1024 * 1024);
+ m_maskCache.setMaxTotalCost(1024 * 1024);
}
SVGMaskElementImpl::~SVGMaskElementImpl()
@@ -90,23 +90,23 @@ SVGMaskElementImpl::~SVGMaskElementImpl()
m_width->deref();
if(m_height)
m_height->deref();
- if(m_tqmaskUnits)
- m_tqmaskContentUnits->deref();
- if(m_tqmaskUnits)
- m_tqmaskContentUnits->deref();
+ if(m_maskUnits)
+ m_maskContentUnits->deref();
+ if(m_maskUnits)
+ m_maskContentUnits->deref();
delete m_converter;
if(m_canvas)
delete m_canvas;
}
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskUnits() const
{
- return m_tqmaskUnits;
+ return m_maskUnits;
}
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskContentUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskContentUnits() const
{
- return m_tqmaskContentUnits;
+ return m_maskContentUnits;
}
SVGAnimatedLengthImpl *SVGMaskElementImpl::x() const
@@ -132,8 +132,8 @@ SVGAnimatedLengthImpl *SVGMaskElementImpl::height() const
/*
@namespace KSVG
@begin SVGMaskElementImpl::s_hashTable 7
- tqmaskUnits SVGMaskElementImpl::MaskUnits DontDelete|ReadOnly
- tqmaskContentUnits SVGMaskElementImpl::MaskContentUnits DontDelete|ReadOnly
+ maskUnits SVGMaskElementImpl::MaskUnits DontDelete|ReadOnly
+ maskContentUnits 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_tqmaskUnits->cache(exec);
+ return m_maskUnits->cache(exec);
else
- return Number(m_tqmaskUnits->baseVal());
+ return Number(m_maskUnits->baseVal());
case MaskContentUnits:
if(!attributeMode)
- return m_tqmaskContentUnits->cache(exec);
+ return m_maskContentUnits->cache(exec);
else
- return Number(m_tqmaskContentUnits->baseVal());
+ return Number(m_maskContentUnits->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_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+ m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
else
- m_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+ m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
break;
case MaskContentUnits:
if(value.toString(exec).qstring() == "objectBoundingBox")
- m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+ m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
else
- m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+ m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
break;
case X:
converter()->modify(x(), value.toString(exec).qstring());
@@ -262,7 +262,7 @@ void SVGMaskElementImpl::setAttributes()
SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight)
{
- converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
+ converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
TQ_UINT32 *imageBits = new TQ_UINT32[imageWidth * imageHeight];
@@ -282,12 +282,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
SVGRectImpl *bbox = referencingElement->getBBox();
- if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(maskUnits()->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(tqmaskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(maskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
{
baseMatrix->translate(bbox->x(), bbox->y());
baseMatrix->scaleNonUniform(bbox->width(), bbox->height());
@@ -336,12 +336,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
{
// Note: r and b reversed
- //TQImage tqmaskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
- //tqmaskImage.setAlphaBuffer(true);
- //tqmaskImage.save("tqmask.png", "PNG");
+ //TQImage maskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
+ //maskImage.setAlphaBuffer(true);
+ //maskImage.save("tqmask.png", "PNG");
}
- TQByteArray tqmaskData(imageWidth * imageHeight);
+ TQByteArray maskData(imageWidth * imageHeight);
const double epsilon = DBL_EPSILON;
// Convert the rgba image into an 8-bit tqmask, according to the specs.
@@ -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 tqmaskValue = luminanceAlpha * a;
+ double maskValue = luminanceAlpha * a;
- tqmaskData[i] = static_cast<unsigned char>(tqmaskValue * 255 + 0.5);
+ maskData[i] = static_cast<unsigned char>(maskValue * 255 + 0.5);
}
delete [] imageBits;
@@ -392,12 +392,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
// need to set it here.
TQWMatrix tempMatrix;
- return Mask(tqmaskData, tempMatrix, imageWidth, imageHeight);
+ return Mask(maskData, tempMatrix, imageWidth, imageHeight);
}
SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement)
{
- converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
+ converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
SVGMatrixImpl *refCTM = 0;
SVGLocatableImpl *locatableRef = dynamic_cast<SVGLocatableImpl *>(referencingElement);
@@ -420,10 +420,10 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
{
CacheKey key(referencingElement, imageWidth, imageHeight);
- if(!m_tqmaskCache.tqfind(key, tqmask))
+ if(!m_maskCache.tqfind(key, tqmask))
{
tqmask = createMask(referencingElement, imageWidth, imageHeight);
- m_tqmaskCache.insert(key, tqmask, imageWidth * imageHeight);
+ m_maskCache.insert(key, tqmask, imageWidth * imageHeight);
}
// Generate a tqmask-coordinates to screen-coordinates matrix
@@ -433,7 +433,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
else
matrix = SVGSVGElementImpl::createSVGMatrix();
- if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+ if(maskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
{
SVGRectImpl *bbox = referencingElement->getBBox();
matrix->translate(bbox->x() + x()->baseVal()->value(), bbox->y() + y()->baseVal()->value());
@@ -453,7 +453,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
return tqmask;
}
-TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
+TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
{
TQByteArray cumulativeMask;
@@ -467,18 +467,18 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
if(element)
{
- SVGMaskElementImpl *tqmaskElement = dynamic_cast<SVGMaskElementImpl *>(element);
+ SVGMaskElementImpl *maskElement = dynamic_cast<SVGMaskElementImpl *>(element);
- if(tqmaskElement)
+ if(maskElement)
{
- SVGMaskElementImpl::Mask tqmask = tqmaskElement->createMask(tqshape);
+ SVGMaskElementImpl::Mask tqmask = maskElement->createMask(tqshape);
if(!tqmask.isEmpty())
{
- TQByteArray tqmaskData = tqmask.rectangle(screenRectangle);
+ TQByteArray maskData = tqmask.rectangle(screenRectangle);
if(cumulativeMask.size() == 0)
- cumulativeMask = tqmaskData;
+ cumulativeMask = maskData;
else
{
int size = cumulativeMask.size();
@@ -486,7 +486,7 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
// Multiply into the cumulative tqmask (using fast divide by 255)
for(int i = 0; i < size; i++)
{
- int tmp = tqmaskData[i] * cumulativeMask[i] + 0x80;
+ int tmp = maskData[i] * cumulativeMask[i] + 0x80;
cumulativeMask[i] = (tmp + (tmp >> 8)) >> 8;
}
}
@@ -495,11 +495,11 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
}
}
- DOM::Node tqparentNode = tqshape->parentNode();
+ DOM::Node parentNode = tqshape->parentNode();
- if(!tqparentNode.isNull())
+ if(!parentNode.isNull())
{
- SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(tqparentNode.handle());
+ SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle());
if(tqparent)
tqshape = dynamic_cast<SVGShapeImpl *>(tqparent);
diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h
index 4631ebae..0e4f0f89 100644
--- a/ksvg/impl/SVGMaskElementImpl.h
+++ b/ksvg/impl/SVGMaskElementImpl.h
@@ -75,8 +75,8 @@ public:
SVGMaskElementImpl(DOM::ElementImpl *);
virtual ~SVGMaskElementImpl();
- SVGAnimatedEnumerationImpl *tqmaskUnits() const;
- SVGAnimatedEnumerationImpl *tqmaskContentUnits() const;
+ SVGAnimatedEnumerationImpl *maskUnits() const;
+ SVGAnimatedEnumerationImpl *maskContentUnits() const;
SVGAnimatedLengthImpl *x() const;
SVGAnimatedLengthImpl *y() const;
SVGAnimatedLengthImpl *width() const;
@@ -89,10 +89,10 @@ public:
Mask createMask(SVGShapeImpl *referencingElement);
- // Compute the tqmask on a given tqshape, taking into account all tqmasks defined
+ // Compute the tqmask on a given tqshape, taking into account all masks 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);
+ static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
private:
class CacheKey
@@ -110,8 +110,8 @@ private:
Mask createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight);
- SVGAnimatedEnumerationImpl *m_tqmaskUnits;
- SVGAnimatedEnumerationImpl *m_tqmaskContentUnits;
+ SVGAnimatedEnumerationImpl *m_maskUnits;
+ SVGAnimatedEnumerationImpl *m_maskContentUnits;
SVGAnimatedLengthImpl *m_x;
SVGAnimatedLengthImpl *m_y;
SVGAnimatedLengthImpl *m_width;
@@ -120,7 +120,7 @@ private:
SVGUnitConverter *m_converter;
KSVGCanvas *m_canvas;
- MinOneLRUCache<CacheKey, Mask> m_tqmaskCache;
+ MinOneLRUCache<CacheKey, Mask> m_maskCache;
public:
KSVG_GET
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc
index b436ee73..68bb7dd1 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()->tqparentImage() == 0)
+ if(isRootElement() && ownerDoc()->parentImage() == 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;
- tqinvalidateCachedMatrices();
+ invalidateCachedMatrices();
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());
- tqinvalidateCachedMatrices();
+ invalidateCachedMatrices();
if(hasEventListener(SVGEvent::SCROLL_EVENT, true))
dispatchEvent(SVGEvent::SCROLL_EVENT, false, false);
}
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 4b20ecc7..2bc64df7 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -98,9 +98,9 @@ SVGStylableImpl::~SVGStylableImpl()
void SVGStylableImpl::processStyle()
{
- SVGStylableImpl *tqparentStyle = 0;
+ SVGStylableImpl *parentStyle = 0;
if(m_object && m_object->ownerDoc())
- tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_object->ownerDoc()->getElementFromHandle((*m_object).parentNode().handle()));
+ parentStyle = 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(tqparentStyle)
- strokeColor = tqparentStyle->getStrokeColor();
+ if(parentStyle)
+ strokeColor = parentStyle->getStrokeColor();
if(strokeColor)
*m_strokeColor = *strokeColor;
@@ -125,8 +125,8 @@ void SVGStylableImpl::processStyle()
m_fillColor->ref();
SVGPaintImpl *fillColor = 0;
- if(tqparentStyle)
- fillColor = tqparentStyle->getFillColor();
+ if(parentStyle)
+ fillColor = parentStyle->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(tqparentStyle)
- color = tqparentStyle->getColor();
+ if(parentStyle)
+ color = parentStyle->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(tqparentStyle)
- m_colorInterpolation = tqparentStyle->getColorInterpolation();
+ if(parentStyle)
+ m_colorInterpolation = parentStyle->getColorInterpolation();
else
m_colorInterpolation = CI_SRGB;
}
@@ -163,8 +163,8 @@ void SVGStylableImpl::processStyle()
m_strokeWidth->ref();
SVGAnimatedLengthImpl *strokeWidth = 0;
- if(tqparentStyle)
- strokeWidth = tqparentStyle->getStrokeWidth();
+ if(parentStyle)
+ strokeWidth = parentStyle->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(tqparentStyle)
- m_strokeMiterlimit = tqparentStyle->getStrokeMiterlimit();
+ if(parentStyle)
+ m_strokeMiterlimit = parentStyle->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(tqparentStyle)
- m_capStyle = tqparentStyle->getCapStyle();
+ if(parentStyle)
+ m_capStyle = parentStyle->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(tqparentStyle)
- m_joinStyle = tqparentStyle->getJoinStyle();
+ if(parentStyle)
+ m_joinStyle = parentStyle->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(tqparentStyle)
- m_cursor = tqparentStyle->getCursor();
+ if(parentStyle)
+ m_cursor = parentStyle->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(tqparentStyle)
- m_pointerEvents = tqparentStyle->getPointerEvents();
+ if(parentStyle)
+ m_pointerEvents = parentStyle->getPointerEvents();
else
m_pointerEvents = PE_VISIBLE_PAINTED;
}
@@ -224,8 +224,8 @@ void SVGStylableImpl::processStyle()
m_dashOffset->ref();
SVGAnimatedLengthImpl *dashOffset = 0;
- if(tqparentStyle)
- dashOffset = tqparentStyle->getDashOffset();
+ if(parentStyle)
+ dashOffset = parentStyle->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(tqparentStyle)
- dashArray = tqparentStyle->getDashArray();
+ if(parentStyle)
+ dashArray = parentStyle->getDashArray();
if(dashArray)
{
@@ -256,16 +256,16 @@ void SVGStylableImpl::processStyle()
// Spec: default "1" -> 1 == Not opaque
if(~m_flags & SVG_STYLE_FLAG_FILL_OPACITY)
{
- if(tqparentStyle)
- m_fillOpacity = tqparentStyle->getFillOpacity();
+ if(parentStyle)
+ m_fillOpacity = parentStyle->getFillOpacity();
else
m_fillOpacity = 1;
}
if(~m_flags & SVG_STYLE_FLAG_STROKE_OPACITY)
{
- if(tqparentStyle)
- m_strokeOpacity = tqparentStyle->getStrokeOpacity();
+ if(parentStyle)
+ m_strokeOpacity = parentStyle->getStrokeOpacity();
else
m_strokeOpacity = 1;
}
@@ -273,14 +273,14 @@ void SVGStylableImpl::processStyle()
// Fake group opacity by multiplying by our tqparent's group opacity
if(~m_flags & SVG_STYLE_FLAG_OPACITY)
{
- if(tqparentStyle)
- m_opacity = tqparentStyle->getOpacity();
+ if(parentStyle)
+ m_opacity = parentStyle->getOpacity();
else
m_opacity = 1;
}
else
- if(tqparentStyle)
- m_opacity *= tqparentStyle->getOpacity();
+ if(parentStyle)
+ m_opacity *= parentStyle->getOpacity();
if(~m_flags & SVG_STYLE_FLAG_CLIP_PATH)
m_clipPath = "";
@@ -291,16 +291,16 @@ void SVGStylableImpl::processStyle()
// Spec: default "nonzero"
if(~m_flags & SVG_STYLE_FLAG_FILL_RULE)
{
- if(tqparentStyle)
- m_fillRule = tqparentStyle->getFillRule();
+ if(parentStyle)
+ m_fillRule = parentStyle->getFillRule();
else
m_fillRule = RULE_NONZERO;
}
if(~m_flags & SVG_STYLE_FLAG_CLIP_RULE)
{
- if(tqparentStyle)
- m_clipRule = tqparentStyle->getClipRule();
+ if(parentStyle)
+ m_clipRule = parentStyle->getClipRule();
else
m_clipRule = RULE_NONZERO;
}
@@ -308,8 +308,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "hidden"
if(~m_flags & SVG_STYLE_FLAG_OVERFLOW)
{
- if(tqparentStyle)
- m_overflow = tqparentStyle->getOverflow();
+ if(parentStyle)
+ m_overflow = parentStyle->getOverflow();
else
m_overflow = false;
}
@@ -322,8 +322,8 @@ void SVGStylableImpl::processStyle()
if(~m_flags & SVG_STYLE_FLAG_VISIBILITY)
{
- if(tqparentStyle)
- m_visible = tqparentStyle->getVisible();
+ if(parentStyle)
+ m_visible = parentStyle->getVisible();
else
m_visible = true;
}
@@ -331,8 +331,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "medium"
if(~m_flags & SVG_STYLE_FLAG_FONT_SIZE)
{
- if(tqparentStyle)
- m_fontSize = tqparentStyle->getFontSize();
+ if(parentStyle)
+ m_fontSize = parentStyle->getFontSize();
else
m_fontSize = fontSizeForText("medium");
}
@@ -347,8 +347,8 @@ void SVGStylableImpl::processStyle()
}
SVGStringListImpl *fontFamily = 0;
- if(tqparentStyle)
- fontFamily = tqparentStyle->getFontFamily();
+ if(parentStyle)
+ fontFamily = parentStyle->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(tqparentStyle)
- m_fontStyle = tqparentStyle->getFontStyle();
+ if(parentStyle)
+ m_fontStyle = parentStyle->getFontStyle();
else
m_fontStyle = FSNORMAL;
}
@@ -373,8 +373,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_FONT_WEIGHT)
{
- if(tqparentStyle)
- m_fontWeight = tqparentStyle->getFontWeight();
+ if(parentStyle)
+ m_fontWeight = parentStyle->getFontWeight();
else
m_fontWeight = "normal";
}
@@ -382,8 +382,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "start"
if(~m_flags & SVG_STYLE_FLAG_TEXT_ANCHOR)
{
- if(tqparentStyle)
- m_textAnchor = tqparentStyle->getTextAnchor();
+ if(parentStyle)
+ m_textAnchor = parentStyle->getTextAnchor();
else
m_textAnchor = TASTART;
}
@@ -391,8 +391,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "LTR"
if(~m_flags & SVG_STYLE_FLAG_TEXT_DIRECTION)
{
- if(tqparentStyle)
- m_textDirection = tqparentStyle->getTextDirection();
+ if(parentStyle)
+ m_textDirection = parentStyle->getTextDirection();
else
m_textDirection = LTR;
}
@@ -400,8 +400,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_TEXT_DECORATION)
{
- if(tqparentStyle)
- m_textDecoration = tqparentStyle->getTextDecoration();
+ if(parentStyle)
+ m_textDecoration = parentStyle->getTextDecoration();
else
m_textDecoration = TDNONE;
}
@@ -409,8 +409,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "baseline"
if(~m_flags & SVG_STYLE_FLAG_BASELINE_SHIFT)
{
- if(tqparentStyle)
- m_baselineShift = tqparentStyle->getBaselineShift();
+ if(parentStyle)
+ m_baselineShift = parentStyle->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(tqparentStyle)
- m_textWritingMode = tqparentStyle->getTextWritingMode();
+ if(parentStyle)
+ m_textWritingMode = parentStyle->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(tqparentStyle)
- m_textUnicodeBidi = tqparentStyle->getTextUnicodeBidi();
+ if(parentStyle)
+ m_textUnicodeBidi = parentStyle->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(tqparentStyle)
- m_glyphOrientationVertical = tqparentStyle->getGlyphOrientationVertical();
+ if(parentStyle)
+ m_glyphOrientationVertical = parentStyle->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(tqparentStyle)
- m_glyphOrientationHorizontal = tqparentStyle->getGlyphOrientationHorizontal();
+ if(parentStyle)
+ m_glyphOrientationHorizontal = parentStyle->getGlyphOrientationHorizontal();
else
m_glyphOrientationHorizontal = "auto";
}
@@ -454,8 +454,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_LETTER_SPACING)
{
- if(tqparentStyle)
- m_letterSpacing = tqparentStyle->getLetterSpacing();
+ if(parentStyle)
+ m_letterSpacing = parentStyle->getLetterSpacing();
else
m_letterSpacing = "normal";
}
@@ -463,8 +463,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "normal"
if(~m_flags & SVG_STYLE_FLAG_WORD_SPACING)
{
- if(tqparentStyle)
- m_wordSpacing = tqparentStyle->getWordSpacing();
+ if(parentStyle)
+ m_wordSpacing = parentStyle->getWordSpacing();
else
m_wordSpacing = "normal";
}
@@ -481,8 +481,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_START)
{
- if(tqparentStyle)
- m_startMarker = tqparentStyle->getStartMarker();
+ if(parentStyle)
+ m_startMarker = parentStyle->getStartMarker();
else
m_startMarker = TQString();
}
@@ -490,8 +490,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_MID)
{
- if(tqparentStyle)
- m_midMarker = tqparentStyle->getMidMarker();
+ if(parentStyle)
+ m_midMarker = parentStyle->getMidMarker();
else
m_midMarker = TQString();
}
@@ -499,8 +499,8 @@ void SVGStylableImpl::processStyle()
// Spec: default "none"
if(~m_flags & SVG_STYLE_FLAG_MARKER_END)
{
- if(tqparentStyle)
- m_endMarker = tqparentStyle->getEndMarker();
+ if(parentStyle)
+ m_endMarker = parentStyle->getEndMarker();
else
m_endMarker = TQString();
}
diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cc
index 63157883..302b54b7 100644
--- a/ksvg/impl/SVGTextContentElementImpl.cc
+++ b/ksvg/impl/SVGTextContentElementImpl.cc
@@ -95,7 +95,7 @@ TQString SVGTextContentElementImpl::textDirectionAwareText()
return text;
}
-T2P::GlyphLayoutParams *SVGTextContentElementImpl::tqlayoutParams() const
+T2P::GlyphLayoutParams *SVGTextContentElementImpl::layoutParams() const
{
SVGStylableImpl *style = const_cast<SVGTextContentElementImpl *>(this);
diff --git a/ksvg/impl/SVGTextContentElementImpl.h b/ksvg/impl/SVGTextContentElementImpl.h
index 85999cb9..bd962037 100644
--- a/ksvg/impl/SVGTextContentElementImpl.h
+++ b/ksvg/impl/SVGTextContentElementImpl.h
@@ -52,7 +52,7 @@ public:
TQString textDirectionAwareText();
- virtual T2P::GlyphLayoutParams *tqlayoutParams() const;
+ virtual T2P::GlyphLayoutParams *layoutParams() const;
SVGAnimatedLengthImpl *textLength() const;
SVGAnimatedEnumerationImpl *lengthAdjust() const;
diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cc
index 6ef8d545..78c272f8 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::tqlayoutParams() const
+T2P::GlyphLayoutParams *SVGTextPathElementImpl::layoutParams() const
{
- T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::tqlayoutParams();
+ T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::layoutParams();
params->setTextPathStartOffset(startOffset()->baseVal()->value());
return params;
}
diff --git a/ksvg/impl/SVGTextPathElementImpl.h b/ksvg/impl/SVGTextPathElementImpl.h
index e1776815..98a88d33 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 *tqlayoutParams() const;
+ virtual T2P::GlyphLayoutParams *layoutParams() const;
private:
SVGAnimatedLengthImpl *m_startOffset;
diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cc
index ce69aa83..4776c679 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 tqparentNde = element->parentNode();
+ DOM::Node parentNde = element->parentNode();
- if(!tqparentNde.isNull() && tqparentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
+ if(!parentNde.isNull() && parentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
{
- SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNde.handle());
+ SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNde.handle());
SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
if(locatableParent)
{
- SVGMatrixImpl *tqparentCTM = locatableParent->getCTM();
- ctm->multiply(tqparentCTM);
- tqparentCTM->deref();
+ SVGMatrixImpl *parentCTM = locatableParent->getCTM();
+ ctm->multiply(parentCTM);
+ parentCTM->deref();
}
}
@@ -124,7 +124,7 @@ void SVGTransformableImpl::updateLocalMatrix()
}
}
- tqinvalidateCachedMatrices();
+ invalidateCachedMatrices();
}
// Ecma stuff
diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c
index 6645fe2d..bcf9ec46 100644
--- a/ksvg/impl/libs/art_support/art_misc.c
+++ b/ksvg/impl/libs/art_support/art_misc.c
@@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y,
}
static
-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],
+void ksvg_art_rgb_affine_clip_mask_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;
@@ -662,7 +662,7 @@ void ksvg_art_rgb_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, in
}
static void
-ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgb_affine_clip_mask_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_tqmask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *tqmaskbuf;
+ const art_u8 *maskbuf;
linebuf = data->dst;
x0 = data->x0;
x1 = data->x1;
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+ maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -689,7 +689,7 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
for(k = 0; k < n_steps - 1; k++)
@@ -701,7 +701,7 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
running_sum += steps[k].delta;
@@ -709,14 +709,14 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
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_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_affine_clip_mask_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;
@@ -930,7 +930,7 @@ void ksvg_art_rgba_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, i
}
static void
-ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgba_affine_clip_mask_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_tqmask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *tqmaskbuf;
+ const art_u8 *maskbuf;
linebuf = data->dst;
x0 = data->x0;
x1 = data->x1;
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+ maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -957,7 +957,7 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
for(k = 0; k < n_steps - 1; k++)
@@ -969,7 +969,7 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
running_sum += steps[k].delta;
@@ -977,14 +977,14 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
data->dst += data->dst_rowstride;
@@ -1064,14 +1064,14 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
if(dst_channels == 3)
{
if(tqmask)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_tqmask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data);
else
art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data);
}
else
{
if(tqmask)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_tqmask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_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_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_texture_mask_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;
@@ -1322,7 +1322,7 @@ void ksvg_art_rgb_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0
}
static void
-ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgb_texture_mask_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_tqmask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *tqmaskbuf;
+ const art_u8 *maskbuf;
linebuf = data->dst;
x0 = data->x0;
@@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+ maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -1350,7 +1350,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
for(k = 0; k < n_steps - 1; k++)
@@ -1362,7 +1362,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
running_sum += steps[k].delta;
@@ -1370,14 +1370,14 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
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_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_texture_mask_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;
@@ -1651,7 +1651,7 @@ void ksvg_art_rgba_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x
}
static void
-ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgba_texture_mask_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_tqmask_callback (void *callback_data, int y,
int k;
int *alphatab;
int alpha;
- const art_u8 *tqmaskbuf;
+ const art_u8 *maskbuf;
linebuf = data->dst;
x0 = data->x0;
@@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+ maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
if(n_steps > 0)
{
@@ -1679,7 +1679,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
for(k = 0; k < n_steps - 1; k++)
@@ -1691,7 +1691,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
running_sum += steps[k].delta;
@@ -1699,14 +1699,14 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
}
else
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- 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);
+ 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);
}
data->dst += data->dst_rowstride;
@@ -1796,9 +1796,9 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
if(tqmask)
{
if(dst_channels == 3)
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_tqmask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data);
else
- art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_tqmask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_mask_callback, &data);
}
else
{
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c
index ea2c1476..0c552c42 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.c
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.c
@@ -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_tqmask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgba_mask_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;
@@ -330,7 +330,7 @@ art_ksvg_rgba_svp_alpha_opaque_callback(void *callback_data, int y,
}
static void
-art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
+art_ksvg_rgba_svp_alpha_mask_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_tqmask_callback(void *callback_data, int y,
art_u8 r, g, b;
int *alphatab;
int alpha;
- art_u8 *tqmaskbuf;
+ art_u8 *maskbuf;
linebuf = data->buf;
x0 = data->x0;
@@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
b = data->b;
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+ maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
if(n_steps > 0)
{
@@ -362,7 +362,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf,
+ art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf,
r, g, b, alphatab[alpha],
run_x1 - x0);
}
@@ -376,7 +376,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0),
+ art_ksvg_rgba_mask_run_alpha (linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0),
r, g, b, alphatab[alpha],
run_x1 - run_x0);
}
@@ -386,7 +386,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0) ,
+ art_ksvg_rgba_mask_run_alpha (linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0) ,
r, g, b, alphatab[alpha],
x1 - run_x1);
}
@@ -395,7 +395,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf,
+ art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf,
r, g, b, alphatab[alpha],
x1 - x0);
}
@@ -472,7 +472,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
data.y0 = y0;
if(tqmask)
- art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_tqmask_callback, &data);
+ art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_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_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgb_mask_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;
@@ -515,7 +515,7 @@ art_ksvg_rgb_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, a
}
static void
-art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
+art_ksvg_rgb_svp_alpha_mask_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_tqmask_callback(void *callback_data, int y,
art_u8 r, g, b;
int *alphatab;
int alpha;
- art_u8 *tqmaskbuf;
+ art_u8 *maskbuf;
linebuf = data->buf;
x0 = data->x0;
@@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
b = data->b;
alphatab = data->alphatab;
- tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+ maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
if(n_steps > 0)
{
@@ -547,7 +547,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf,
+ art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf,
r, g, b, alphatab[alpha],
run_x1 - x0);
}
@@ -561,7 +561,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0),
+ art_ksvg_rgb_mask_run_alpha (linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0),
r, g, b, alphatab[alpha],
run_x1 - run_x0);
}
@@ -571,7 +571,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0) ,
+ art_ksvg_rgb_mask_run_alpha (linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0) ,
r, g, b, alphatab[alpha],
x1 - run_x1);
}
@@ -580,7 +580,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
{
alpha = (running_sum >> 16) & 0xff;
if(alpha)
- art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf,
+ art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf,
r, g, b, alphatab[alpha],
x1 - x0);
}
@@ -654,6 +654,6 @@ art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
data.x1 = x1;
data.y0 = y0;
- art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_tqmask_callback, &data);
+ art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_mask_callback, &data);
}
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 16aef608..2085e003 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -162,7 +162,7 @@ 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 tqlayouts when rendering
+ // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering
// a latin glyph because it needs to be rotated...
if(params->tqlayout()->tb())
{
@@ -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 tqlayouts! (Niko)
+ // vertical layouts! (Niko)
if(!params->tb())
{
if(bpath)
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h
index 73951b47..8dcbe599 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.h
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.h
@@ -185,7 +185,7 @@ namespace T2P
private:
Font *m_font;
- const GlyphLayoutParams *m_layout; // Glyph tqlayouting params
+ const GlyphLayoutParams *m_layout; // Glyph layouting params
unsigned int m_glyphIndex; // 'character' index in font
unsigned int m_lastGlyph; // Kerning
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
index 696cfec3..3f2fe30d 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 *)
-// aptqparently EDG 2.38 also doesn't accept it
+// apparently 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.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
index 7848f8d3..7d359b61 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
@@ -63,7 +63,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
Pixmap *pixmap_return,
- Pixmap *tqmask_return,
+ Pixmap *mask_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 95a6c722..eb7e4cdf 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 aptqparently, image_info->bpp is actually
+ /* ok, so apparently, image_info->bpp is actually
BYTES per pixel. What fun! */
switch (static_image[0]->bits_per_pixel) {
case 1:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 14:17:00 +0000