summaryrefslogtreecommitdiffstats
path: root/ksvg/impl
diff options
context:
space:
mode:
Diffstat (limited to 'ksvg/impl')
-rw-r--r--ksvg/impl/LRUCache.h12
-rw-r--r--ksvg/impl/SVGAnimateElementImpl.cc2
-rw-r--r--ksvg/impl/SVGAnimateTransformElementImpl.cc4
-rw-r--r--ksvg/impl/SVGAnimatedPointsImpl.cc8
-rw-r--r--ksvg/impl/SVGAnimationElementImpl.cc36
-rw-r--r--ksvg/impl/SVGColorImpl.cc2
-rw-r--r--ksvg/impl/SVGDocumentImpl.cc4
-rw-r--r--ksvg/impl/SVGEcma.cc10
-rw-r--r--ksvg/impl/SVGElementImpl.cc4
-rw-r--r--ksvg/impl/SVGFitToViewBoxImpl.cc2
-rw-r--r--ksvg/impl/SVGImageElementImpl.cc2
-rw-r--r--ksvg/impl/SVGLangSpaceImpl.cc12
-rw-r--r--ksvg/impl/SVGMaskElementImpl.cc2
-rw-r--r--ksvg/impl/SVGPatternElementImpl.cc2
-rw-r--r--ksvg/impl/SVGSVGElementImpl.cc4
-rw-r--r--ksvg/impl/SVGStylableImpl.cc24
-rw-r--r--ksvg/impl/SVGTextElementImpl.cc2
-rw-r--r--ksvg/impl/SVGTimeScheduler.cc2
-rw-r--r--ksvg/impl/SVGURIReferenceImpl.cc10
-rw-r--r--ksvg/impl/SVGUnitConverter.h2
-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.cpp4
-rw-r--r--ksvg/impl/svgpathparser.cc2
24 files changed, 79 insertions, 79 deletions
diff --git a/ksvg/impl/LRUCache.h b/ksvg/impl/LRUCache.h
index ef51e1d8..f9045262 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 tqfind(const keyType& key, valueType& result);
+ bool find(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 tqfind(const keyType& key);
+ typename CacheItemList::iterator find(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 = tqfind(key);
+ typename CacheItemList::iterator it = find(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>::tqfind(const keyType& key, valueType& result)
+bool MinOneLRUCache<keyType, valueType>::find(const keyType& key, valueType& result)
{
bool foundKey = false;
- typename CacheItemList::iterator it = tqfind(key);
+ typename CacheItemList::iterator it = find(key);
if(it != m_items.end())
{
@@ -115,7 +115,7 @@ bool MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key, valueType& r
}
template<class keyType, class valueType>
-typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key)
+typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::find(const keyType& key)
{
typename CacheItemList::iterator it;
diff --git a/ksvg/impl/SVGAnimateElementImpl.cc b/ksvg/impl/SVGAnimateElementImpl.cc
index 471d27bb..ccf8565d 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 == "tqreplace" && needCombine)
+ if(m_additive == "replace" && needCombine)
needCombine = false;
applyAttribute(m_attributeName, TQString::number(m_from), needCombine);
diff --git a/ksvg/impl/SVGAnimateTransformElementImpl.cc b/ksvg/impl/SVGAnimateTransformElementImpl.cc
index a3384c9d..cf3922f8 100644
--- a/ksvg/impl/SVGAnimateTransformElementImpl.cc
+++ b/ksvg/impl/SVGAnimateTransformElementImpl.cc
@@ -129,7 +129,7 @@ void SVGAnimateTransformElementImpl::setAttributes()
{
TQString test = _values.string();
- if(test.tqcontains(";"))
+ if(test.contains(";"))
{
SVGLengthImpl *temp = SVGSVGElementImpl::createSVGLength();
@@ -201,7 +201,7 @@ void SVGAnimateTransformElementImpl::handleTimerEvent(bool)
if(!m_lastTransform.isEmpty())
{
- int pos = trans.tqfind(m_lastTransform);
+ int pos = trans.find(m_lastTransform);
TQString extract;
extract += trans.mid(0, pos);
diff --git a/ksvg/impl/SVGAnimatedPointsImpl.cc b/ksvg/impl/SVGAnimatedPointsImpl.cc
index d3eb426d..852d90e0 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.tqcontains(",,") || _points.tqcontains(", ,"))
+ if(_points.contains(",,") || _points.contains(", ,"))
return;
- _points.tqreplace(',', ' ');
- _points.tqreplace('\r', TQString());
- _points.tqreplace('\n', TQString());
+ _points.replace(',', ' ');
+ _points.replace('\r', TQString());
+ _points.replace('\n', TQString());
_points = _points.simplifyWhiteSpace();
diff --git a/ksvg/impl/SVGAnimationElementImpl.cc b/ksvg/impl/SVGAnimationElementImpl.cc
index 3fd29d1e..9fbab696 100644
--- a/ksvg/impl/SVGAnimationElementImpl.cc
+++ b/ksvg/impl/SVGAnimationElementImpl.cc
@@ -84,8 +84,8 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
double result;
- int doublePointOne = parse.tqfind(':');
- int doublePointTwo = parse.tqfind(':', doublePointOne + 1);
+ int doublePointOne = parse.find(':');
+ int doublePointTwo = parse.find(':', 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.tqfind('.') != -1)
+ if(parse.find('.') != -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.tqfind('.') != -1)
+ if(parse.find('.') != -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.tqfind('.');
+ int dotPosition = parse.find('.');
if(parse.endsWith("h"))
{
@@ -304,34 +304,34 @@ void SVGAnimationElementImpl::putValueProperty(ExecState *exec, int token, const
}
else if(current.startsWith("wallclock"))
{
- int firstBrace = current.tqfind("(");
- int secondBrace = current.tqfind(")");
+ int firstBrace = current.find("(");
+ int secondBrace = current.find(")");
TQString wallclockValue = current.mid(firstBrace + 1, secondBrace - firstBrace - 2);
kdDebug() << "WALLCLOCK VALUE " << wallclockValue << endl;
}
- else if(current.tqcontains("."))
+ else if(current.contains("."))
{
- int dotPosition = current.tqfind(".");
+ int dotPosition = current.find(".");
TQString element = current.mid(0, dotPosition);
TQString clockValue;
- if(current.tqcontains("begin"))
+ if(current.contains("begin"))
clockValue = current.mid(dotPosition + 6);
- else if(current.tqcontains("end"))
+ else if(current.contains("end"))
clockValue = current.mid(dotPosition + 4);
- else if(current.tqcontains("repeat"))
+ else if(current.contains("repeat"))
clockValue = current.mid(dotPosition + 7);
else // DOM2 Event Reference
{
int plusMinusPosition = -1;
- if(current.tqcontains("+"))
- plusMinusPosition = current.tqfind("+");
- else if(current.tqcontains("-"))
- plusMinusPosition = current.tqfind("-");
+ if(current.contains("+"))
+ plusMinusPosition = current.find("+");
+ else if(current.contains("-"))
+ plusMinusPosition = current.find("-");
TQString event = current.mid(dotPosition + 1, plusMinusPosition - dotPosition - 1);
@@ -405,9 +405,9 @@ void SVGAnimationElementImpl::setAttributes()
{
SVGElementImpl::setAttributes();
- // Spec: Default value is "tqreplace"
+ // Spec: Default value is "replace"
if(KSVG_TOKEN_NOT_PARSED(Additive))
- KSVG_SET_ALT_ATTRIBUTE(Additive, "tqreplace")
+ KSVG_SET_ALT_ATTRIBUTE(Additive, "replace")
// Spec: Default value is "none"
if(KSVG_TOKEN_NOT_PARSED(Accumulate))
diff --git a/ksvg/impl/SVGColorImpl.cc b/ksvg/impl/SVGColorImpl.cc
index 3808fe90..6520e9d7 100644
--- a/ksvg/impl/SVGColorImpl.cc
+++ b/ksvg/impl/SVGColorImpl.cc
@@ -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.tqfind(','));
+ TQString iccTarget = content.mid(0, content.find(','));
TQStringList colors = TQStringList::split(',', content);
TQString r = colors[1];
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index 2b0383ec..4e541847 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cc
@@ -252,7 +252,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
args.getURLMode = false;
TQString url = m_baseURL.prettyURL();
- int pos = url.tqfind('#'); // url can become like this.svg#svgView(viewBox(63,226,74,74)), get part after '#'
+ int pos = url.find('#'); // 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.tqcontains(use))
+ if(!m_forwardReferencingUseElements.contains(use))
m_forwardReferencingUseElements.append(use);
}
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index c7105d41..0ab19f3a 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -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
- tqcontains SVGDOMNodeBridge::Contains DontDelete|Function 1
+ contains SVGDOMNodeBridge::Contains DontDelete|Function 1
getNodeName SVGDOMNodeBridge::GetNodeName DontDelete|Function 0
getNodeValue SVGDOMNodeBridge::GetNodeValue DontDelete|Function 0
getNodeType SVGDOMNodeBridge::GetNodeType DontDelete|Function 0
@@ -178,10 +178,10 @@ void removeItem(ExecState *exec, DOM::Node &node)
void correctHandles(SVGElementImpl *main, DOM::Node &node)
{
DOM::Element old(node.handle());
- DOM::Element *tqreplace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
+ DOM::Element *replace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
- if(tqreplace && node.nodeType() == DOM::Node::ELEMENT_NODE)
- *tqreplace = old;
+ if(replace && node.nodeType() == DOM::Node::ELEMENT_NODE)
+ *replace = old;
if(node.hasChildNodes())
{
@@ -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().tqfind(':');
+ int pos = attr.string().find(':');
if(pos > -1)
attr = attr.string().mid(pos + 1);
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index 099918f5..13fc9e46 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -328,7 +328,7 @@ TQDict<DOM::DOMString> &SVGElementImpl::attributes()
// khtml overrides
void SVGElementImpl::setAttribute(const DOM::DOMString &name, const DOM::DOMString &value)
{
- m_attributes.tqreplace(name.string(), new DOM::DOMString(value));
+ m_attributes.replace(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.tqfind(name.string()) != 0;
+ return m_attributes.find(name.string()) != 0;
}
bool SVGElementImpl::hasAttributes()
diff --git a/ksvg/impl/SVGFitToViewBoxImpl.cc b/ksvg/impl/SVGFitToViewBoxImpl.cc
index 7fc3856b..aaee3045 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.tqreplace(',', ' ').simplifyWhiteSpace());
+ TQStringList points = TQStringList::split(' ', viewbox.replace(',', ' ').simplifyWhiteSpace());
viewBox()->baseVal()->setX(points[0].toFloat());
viewBox()->baseVal()->setY(points[1].toFloat());
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 4a60d622..258ce95e 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -380,7 +380,7 @@ bool SVGImageElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &, S
if(test && m_item)
{
- if(m_item->bbox().tqcontains(p))
+ if(m_item->bbox().contains(p))
{
mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
return true;
diff --git a/ksvg/impl/SVGLangSpaceImpl.cc b/ksvg/impl/SVGLangSpaceImpl.cc
index 5a55ef15..edc35a4d 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.tqreplace("\n\r", TQString(" "));
- result.tqreplace("\r\n", TQString(" "));
- result.tqreplace('\t', ' ');
+ result.replace("\n\r", TQString(" "));
+ result.replace("\r\n", TQString(" "));
+ result.replace('\t', ' ');
}
else if(xmlspace() == "default")
{
// Spec: What to do here?
- // First, it will remove all newline characters (tqreplace)
+ // First, it will remove all newline characters (replace)
// 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.tqreplace('\n', TQString());
- result.tqreplace('\r', TQString());
+ result.replace('\n', TQString());
+ result.replace('\r', TQString());
result = result.stripWhiteSpace().simplifyWhiteSpace();
}
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index 8096c26d..afbc1e74 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -420,7 +420,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
{
CacheKey key(referencingElement, imageWidth, imageHeight);
- if(!m_maskCache.tqfind(key, tqmask))
+ if(!m_maskCache.find(key, tqmask))
{
tqmask = createMask(referencingElement, imageWidth, imageHeight);
m_maskCache.insert(key, tqmask, imageWidth * imageHeight);
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc
index 99c79ff6..672e62d3 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cc
@@ -486,7 +486,7 @@ SVGPatternElementImpl::Tile SVGPatternElementImpl::createTile(SVGShapeImpl *refe
TQSize size(imageWidth, imageHeight);
TQImage image;
- if(!m_tileCache.tqfind(size, image))
+ if(!m_tileCache.find(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 68bb7dd1..d72b488f 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cc
@@ -382,7 +382,7 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
{
// TODO : add the tqshape to list if the test succeeds
SVGRectImpl *current = tqshape->getBBox();
- if(rect->qrect().tqcontains(current->qrect(), true))
+ if(rect->qrect().contains(current->qrect(), true))
kdDebug() << "tqshape : " << element->nodeName().string() << " is fully enclosed" << endl;
current->deref();
@@ -412,7 +412,7 @@ bool SVGSVGElementImpl::checkEnclosure(SVGElementImpl *element, SVGRectImpl *rec
return false;
SVGRectImpl *current = tqshape->getBBox();
- bool result = rect->qrect().tqcontains(current->qrect());
+ bool result = rect->qrect().contains(current->qrect());
current->deref();
return result;
}
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 2bc64df7..32db8575 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -532,7 +532,7 @@ TQString SVGStylableImpl::extractUrlId(const TQString &url)
if(url.startsWith("url(#"))
{
- int idstart = url.tqfind("#") + 1;
+ int idstart = url.find("#") + 1;
id = url.mid(idstart, url.length() - idstart - 1);
}
else
@@ -552,7 +552,7 @@ void SVGStylableImpl::setStartMarker(const TQString &startMarker)
{
if(startMarker.startsWith("url(#"))
{
- int idstart = startMarker.tqfind("#") + 1;
+ int idstart = startMarker.find("#") + 1;
m_startMarker = startMarker.mid(idstart, startMarker.length() - idstart - 1);
}
else if(startMarker == "none")
@@ -563,7 +563,7 @@ void SVGStylableImpl::setMidMarker(const TQString &midMarker)
{
if(midMarker.startsWith("url(#"))
{
- int idstart = midMarker.tqfind("#") + 1;
+ int idstart = midMarker.find("#") + 1;
m_midMarker = midMarker.mid(idstart, midMarker.length() - idstart - 1);
}
else if(midMarker == "none")
@@ -574,7 +574,7 @@ void SVGStylableImpl::setEndMarker(const TQString &endMarker)
{
if(endMarker.startsWith("url(#"))
{
- int idstart = endMarker.tqfind("#") + 1;
+ int idstart = endMarker.find("#") + 1;
m_endMarker = endMarker.mid(idstart, endMarker.length() - idstart - 1);
}
else if(endMarker == "none")
@@ -600,7 +600,7 @@ void SVGStylableImpl::setColor(const TQString &param, SVGColorImpl *svgColor)
{
if(param.stripWhiteSpace().startsWith("#"))
{
- if(param.tqcontains("icc-color"))
+ if(param.contains("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.tqcontains("%"))
+ if(r.contains("%"))
{
r = r.left(r.length() - 1);
r = TQString::number(int((double(255 * r.toDouble()) / 100.0)));
}
- if(g.tqcontains("%"))
+ if(g.contains("%"))
{
g = g.left(g.length() - 1);
g = TQString::number(int((double(255 * g.toDouble()) / 100.0)));
}
- if(b.tqcontains("%"))
+ if(b.contains("%"))
{
b = b.left(b.length() - 1);
b = TQString::number(int((double(255 * b.toDouble()) / 100.0)));
@@ -946,12 +946,12 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
// Hacks
// #1 Replace "'" characters by ""
- param = param.tqreplace('\'', TQString());
+ param = param.replace('\'', TQString());
// #2 Replace "MS-Gothic" by "MS Gothic"
- param = param.tqreplace("MS-Gothic", "MS Gothic");
+ param = param.replace("MS-Gothic", "MS Gothic");
// #3 Replace "Helvetica" by "Arial"
- param = param.tqreplace("Helvetica", "Arial");
- param = param.tqreplace("helvetica", "Arial");
+ param = param.replace("Helvetica", "Arial");
+ param = param.replace("helvetica", "Arial");
if(!m_fontFamily)
{
diff --git a/ksvg/impl/SVGTextElementImpl.cc b/ksvg/impl/SVGTextElementImpl.cc
index 7603c622..82a53ea9 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().tqcontains(p))
+ if(m_item->bbox().contains(p))
{
mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
return true;
diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cc
index d2a10e5a..29862959 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.tqcontains(target))
+ if(!elements.contains(target))
elements.append(target);
}
}
diff --git a/ksvg/impl/SVGURIReferenceImpl.cc b/ksvg/impl/SVGURIReferenceImpl.cc
index 52db7a86..8a6fda76 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.tqfind("#");
+ int seperator = urireference.find("#");
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.tqfind("#") + 1;
- unsigned int end = url.tqfindRev(")");
+ unsigned int start = url.find("#") + 1;
+ unsigned int end = url.findRev(")");
return url.mid(start, end - start);
}
- else if(url.tqfind("#") > -1) // format is #target
+ else if(url.find("#") > -1) // format is #target
{
- unsigned int start = url.tqfind("#") + 1;
+ unsigned int start = url.find("#") + 1;
return url.mid(start, url.length() - start);
}
diff --git a/ksvg/impl/SVGUnitConverter.h b/ksvg/impl/SVGUnitConverter.h
index db85c42d..cb8bac04 100644
--- a/ksvg/impl/SVGUnitConverter.h
+++ b/ksvg/impl/SVGUnitConverter.h
@@ -48,7 +48,7 @@ public:
void modify(SVGAnimatedLengthImpl *obj, const TQString &value)
{
- UnitData *data = m_dict.tqfind(obj);
+ UnitData *data = m_dict.find(obj);
if(data)
data->valueAsString = value;
diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec
index 208de711..e0c217bd 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
-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
+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
%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 51d09f45..a85fdf92 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 tqfind(const std::string &key)
+ SharedT find(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 2085e003..11de3177 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.tqfind(cacheKey);
+ SharedFont cached = m_fontCache.find(cacheKey);
// If not available in cache, create new one and cache it :)
if(cached)
@@ -122,7 +122,7 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b
// needed to generate the cache lookup key
selectGlyph(params);
- SharedGlyph cached = m_glyphCache.tqfind(cacheGlyphKey(params));
+ SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params));
// If not available in cache, render new one and cache it :)
// If we're mixing ie. japanese and latin characters (TTB tqlayout),
diff --git a/ksvg/impl/svgpathparser.cc b/ksvg/impl/svgpathparser.cc
index e072b715..590ac2ba 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.tqreplace(',', ' ');
+ d = d.replace(',', ' ');
d = d.simplifyWhiteSpace();
const char *ptr = d.latin1();
const char *end = d.latin1() + d.length() + 1;