summaryrefslogtreecommitdiffstats
path: root/khtml/xml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/xml')
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp32
-rw-r--r--khtml/xml/dom_docimpl.cpp30
-rw-r--r--khtml/xml/dom_docimpl.h4
-rw-r--r--khtml/xml/dom_elementimpl.cpp2
-rw-r--r--khtml/xml/dom_nodeimpl.cpp4
-rw-r--r--khtml/xml/dom_nodeimpl.h20
-rw-r--r--khtml/xml/dom_restyler.cpp6
-rw-r--r--khtml/xml/dom_stringimpl.cpp16
-rw-r--r--khtml/xml/dom_stringimpl.h2
-rw-r--r--khtml/xml/dom_xmlimpl.h2
-rw-r--r--khtml/xml/xml_tokenizer.cpp16
-rw-r--r--khtml/xml/xml_tokenizer.h8
12 files changed, 71 insertions, 71 deletions
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index bcc2fca3a..c648ed63e 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -48,7 +48,7 @@ EventImpl::EventImpl()
m_currentTarget = 0;
m_eventPhase = 0;
m_target = 0;
- m_createTime = TQDateTime::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
m_defaultHandled = false;
}
@@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg)
m_currentTarget = 0;
m_eventPhase = 0;
m_target = 0;
- m_createTime = TQDateTime::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
m_defaultHandled = false;
}
@@ -499,14 +499,14 @@ public:
}
L toLeft(R r) {
- TQMapIterator<R,L> i( m_rToL.find(r) );
+ TQMapIterator<R,L> i( m_rToL.tqfind(r) );
if (i != m_rToL.end())
return *i;
return L();
}
R toRight(L l) {
- TQMapIterator<L,R> i = m_lToR.find(l);
+ TQMapIterator<L,R> i = m_lToR.tqfind(l);
if (i != m_lToR.end())
return *i;
return R();
@@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
m_keyVal = key->ascii();
m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key());
- // m_keyVal should contain the unicode value
+ // m_keyVal should contain the tqunicode value
// of the pressed key if available.
if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
- m_keyVal = key->text().unicode()[0];
+ m_keyVal = key->text().tqunicode()[0];
// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
m_modifier = key->state();
@@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const
{
if (unsigned special = virtKeyVal())
if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
- return TQString::fromLatin1(id);
+ return TQString::tqfromLatin1(id);
- if (unsigned unicode = keyVal())
- return TQString(TQChar(unicode));
+ if (unsigned tqunicode = keyVal())
+ return TQString(TQChar(tqunicode));
return "Unidentified";
}
@@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
//Figure out the code information from the key identifier.
if (keyIdentifierArg.length() == 1) {
- //Likely to be normal unicode id, unless it's one of the few
+ //Likely to be normal tqunicode id, unless it's one of the few
//special values.
- unsigned short code = keyIdentifierArg.unicode()[0];
+ unsigned short code = keyIdentifierArg.tqunicode()[0];
if (code > 0x20 && code != 0x7F)
keyVal = code;
}
@@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const
if (m_virtKeyVal != DOM_VK_UNDEFINED)
return m_virtKeyVal;
else
- return TQChar((unsigned short)m_keyVal).upper().unicode();
+ return TQChar((unsigned short)m_keyVal).upper().tqunicode();
}
int KeyboardEventImpl::charCode() const
@@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg,
//See whether we can get a key out of this.
unsigned keyCode = 0;
if (text.length() == 1)
- keyCode = text.unicode()[0].unicode();
+ keyCode = text.tqunicode()[0].tqunicode();
initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg,
keyCode, 0, 0);
}
int TextEventImpl::keyCode() const
{
- //Mozilla returns 0 here unless this is a non-unicode key.
+ //Mozilla returns 0 here unless this is a non-tqunicode key.
//IE stuffs everything here, and so we try to match it..
if (m_keyVal)
return m_keyVal;
@@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const
int TextEventImpl::charCode() const
{
- //On text events, in Mozilla charCode is 0 for non-unicode keys,
- //and the unicode key otherwise... IE doesn't support this.
+ //On text events, in Mozilla charCode is 0 for non-tqunicode keys,
+ //and the tqunicode key otherwise... IE doesn't support this.
if (m_virtKeyVal)
return 0;
return m_keyVal;
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 36570d69a..347adb510 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
- ItemInfo* info = m_dict.find(id);
+ ItemInfo* info = m_dict.tqfind(id);
if (info)
{
info->ref++;
@@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
- ItemInfo* info = m_dict.find(id);
+ ItemInfo* info = m_dict.tqfind(id);
info->nd = nd;
}
@@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
- ItemInfo* info = m_dict.find(id);
+ ItemInfo* info = m_dict.tqfind(id);
info->ref--;
if (info->ref == 0)
{
@@ -276,13 +276,13 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
bool ElementMappingCache::contains(const TQString& id)
{
if (id.isEmpty()) return false;
- return m_dict.find(id);
+ return m_dict.tqfind(id);
}
ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
{
if (id.isEmpty()) return 0;
- return m_dict.find(id);
+ return m_dict.tqfind(id);
}
static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
@@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
m_namespaceMap = new IdNameMapping(1);
TQString xhtml(XHTML_NAMESPACE);
m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl(""));
- m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length()));
+ m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length()));
m_namespaceMap->names[emptyNamespace]->ref();
m_namespaceMap->names[xhtmlNamespace]->ref();
m_namespaceMap->count+=2;
@@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text )
if (m_view)
m_view->part()->resetFromScript();
m_tokenizer->setAutoClose();
- write(TQString::fromLatin1("<html>"));
+ write(TQString::tqfromLatin1("<html>"));
}
m_tokenizer->write(text, false);
}
@@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
{
// get delay and url
TQString str = content.string().stripWhiteSpace();
- int pos = str.find(TQRegExp("[;,]"));
+ int pos = str.tqfind(TQRegExp("[;,]"));
if ( pos == -1 )
- pos = str.find(TQRegExp("[ \t]"));
+ pos = str.tqfind(TQRegExp("[ \t]"));
bool ok = false;
int delay = kMax( 0, content.implementation()->toInt(&ok) );
@@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
pos++;
while(pos < (int)str.length() && str[pos].isSpace()) pos++;
str = str.mid(pos);
- if(str.find("url", 0, false ) == 0) str = str.mid(3);
+ if(str.tqfind("url", 0, false ) == 0) str = str.mid(3);
str = str.stripWhiteSpace();
if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
while(str.length() &&
@@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
TQString name = cs ? n.string() : n.string().upper();
if (!_nsURI) {
- id = (NodeImpl::Id)(long) map->ids.find( name );
+ id = (NodeImpl::Id)(long) map->ids.tqfind( name );
if (!id && _type != NodeImpl::NamespaceId) {
- id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name );
+ id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name );
}
} else {
- id = (NodeImpl::Id)(long) map->ids.find( name );
+ id = (NodeImpl::Id)(long) map->ids.tqfind( name );
if (!readonly && id && _prefix && _prefix->l) {
// we were called in registration mode... check if the alias exists
TQConstString px( _prefix->s, _prefix->l );
TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
- if (!map->ids.find( qn )) {
+ if (!map->ids.tqfind( qn )) {
map->ids.insert( qn, (void*)id );
}
}
@@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
//Check to see if we have this sort of item cached.
NodeListImpl::Cache* cached =
- (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash());
+ (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash());
if (cached) {
if (cached->key == key) {
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index 5e50c09a4..a4aec9223 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -198,7 +198,7 @@ public:
DocumentFragmentImpl *createDocumentFragment ();
TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); }
TextImpl *createTextNode ( const TQString& data )
- { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); }
+ { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); }
CommentImpl *createComment ( DOMStringImpl* data );
CDATASectionImpl *createCDATASection ( DOMStringImpl* data );
ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data );
@@ -616,7 +616,7 @@ protected:
TQConstString px( _prefix->s, _prefix->l );
TQString name = cs ? n.string() : n.string().upper();
TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
- if (!ids.find( qn )) {
+ if (!ids.tqfind( qn )) {
ids.insert( qn, (void*)id );
}
}
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index c41bef3dc..f4506c8ba 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
- result += TQConstString(kid.unicode(), kid.length()).string();
+ result += TQConstString(kid.tqunicode(), kid.length()).string();
}
result += "</";
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index 137928c81..f38be728a 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
Event ev = evt;
// removeEventListener (e.g. called from a JS event listener) might
- // invalidate the item after the current iterator (which "it" is pointing to).
+ // tqinvalidate the item after the current iterator (which "it" is pointing to).
// So we make a copy of the list.
TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
TQValueList<RegisteredEventListener>::iterator it;
@@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const
delete kidText;
}
}
- return new DOMStringImpl(out.unicode(), out.length());
+ return new DOMStringImpl(out.tqunicode(), out.length());
}
//-------------------------------------------------------------------------
diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h
index 1e53edf19..275452d69 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/khtml/xml/dom_nodeimpl.h
@@ -86,17 +86,17 @@ private:
#define NodeImpl_IdNSMask 0xffff0000
#define NodeImpl_IdLocalMask 0x0000ffff
-const Q_UINT16 defaultNamespace = 0;
-const Q_UINT16 xhtmlNamespace = 1;
-const Q_UINT16 emptyNamespace = 2;
-const Q_UINT16 anyNamespace = 0xffff;
-const Q_UINT16 anyLocalName = 0xffff;
+const TQ_UINT16 defaultNamespace = 0;
+const TQ_UINT16 xhtmlNamespace = 1;
+const TQ_UINT16 emptyNamespace = 2;
+const TQ_UINT16 anyNamespace = 0xffff;
+const TQ_UINT16 anyLocalName = 0xffff;
-inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; }
-inline Q_UINT16 namespacePart(Q_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
-inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; }
+inline TQ_UINT16 localNamePart(TQ_UINT32 id) { return id & NodeImpl_IdLocalMask; }
+inline TQ_UINT16 namespacePart(TQ_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
+inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; }
-const Q_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
+const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
class NodeImpl : public khtml::TreeShared<NodeImpl>
{
@@ -155,7 +155,7 @@ public:
// appendChild(), and returns the node into which will be parsed next.
virtual NodeImpl *addChild(NodeImpl *newChild);
- typedef Q_UINT32 Id;
+ typedef TQ_UINT32 Id;
// id() is used to easily and exactly identify a node. It
// is optimized for quick comparison and low memory consumption.
// its value depends on the owner document of the node and is
diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp
index 0050c4a03..699a5ab59 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/khtml/xml/dom_restyler.cpp
@@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep
void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
{
- KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
if (!my_dependencies) return;
@@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe
void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
{
- KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
+ KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject);
if (!my_dependencies) return;
@@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
{
assert(type < LastStructuralDependency);
- KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency);
+ KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency);
if (!dep) return;
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index bb1a728e9..d4e568408 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -61,8 +61,8 @@ bool DOMStringImpl::containsOnlyWhitespace() const
for (uint i = 0; i < l; i++) {
TQChar c = s[i];
- if (c.unicode() <= 0x7F) {
- if (c.unicode() > ' ')
+ if (c.tqunicode() <= 0x7F) {
+ if (c.tqunicode() > ' ')
return false;
} else {
if (c.direction() != TQChar::DirWS)
@@ -293,11 +293,11 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
int pos = 0;
int pos2;
- while((pos2 = str.find(' ', pos)) != -1) {
- r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+ while((pos2 = str.tqfind(' ', pos)) != -1) {
+ r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
pos = pos2+1;
}
- r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
return r;
}
@@ -319,14 +319,14 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
int pos = 0;
int pos2;
- while((pos2 = str.find(',', pos)) != -1) {
- r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+ while((pos2 = str.tqfind(',', pos)) != -1) {
+ r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
pos = pos2+1;
}
/* IE Quirk: If the last comma is the last char skip it and reduce len by one */
if (str.length()-pos > 0)
- r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
else
len--;
diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h
index cd7128967..edac46755 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/khtml/xml/dom_stringimpl.h
@@ -92,7 +92,7 @@ public:
DOMStringImpl *capitalize(bool noFirstCap=false) const;
DOMStringImpl *escapeHTML();
- TQChar *unicode() const { return s; }
+ TQChar *tqunicode() const { return s; }
uint length() const { return l; }
TQString string() const;
diff --git a/khtml/xml/dom_xmlimpl.h b/khtml/xml/dom_xmlimpl.h
index a394579d2..d88dc041f 100644
--- a/khtml/xml/dom_xmlimpl.h
+++ b/khtml/xml/dom_xmlimpl.h
@@ -163,7 +163,7 @@ protected:
CSSStyleSheetImpl *m_sheet;
};
-class XMLAttributeReader : public QXmlDefaultHandler
+class XMLAttributeReader : public TQXmlDefaultHandler
{
public:
XMLAttributeReader(const TQString& _attrString);
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 7c043815a..a0f3f665c 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -42,7 +42,7 @@ using namespace DOM;
using namespace khtml;
XMLIncrementalSource::XMLIncrementalSource()
- : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
+ : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ),
m_finished( false )
{
}
@@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next()
else if ( m_data.length() <= m_pos )
return TQXmlInputSource::EndOfData;
else
- return m_unicode[m_pos++];
+ return m_tqunicode[m_pos++];
}
void XMLIncrementalSource::setData( const TQString& str )
{
m_data = str;
- m_unicode = m_data.unicode();
+ m_tqunicode = m_data.tqunicode();
m_pos = 0;
if ( !str.isEmpty() )
m_finished = false;
@@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data )
void XMLIncrementalSource::appendXML( const TQString& str )
{
m_data += str;
- m_unicode = m_data.unicode();
+ m_tqunicode = m_data.tqunicode();
}
TQString XMLIncrementalSource::data()
@@ -152,7 +152,7 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname)
{
/* QXml does not resolve the namespaces of attributes in the same
tag that preceed the xmlns declaration. This fixes up that case */
- if (uri.isEmpty() && qname.find(':') != -1) {
+ if (uri.isEmpty() && qname.tqfind(':') != -1) {
TQXmlNamespaceSupport ns;
TQString localName, prefix;
ns.splitName(qname, prefix, localName);
@@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch)
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
// ### handle exceptions
- currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length())));
+ currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length())));
return true;
}
@@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d
exitText();
// ### handle exceptions
ProcessingInstructionImpl *pi =
- m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length()));
+ m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length()));
currentNode()->addChild(pi);
pi->checkStyleSheet();
return true;
@@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value)
{
EntityImpl *e = new EntityImpl(m_doc,name);
// ### further parse entities inside the value and add them as separate nodes (or entityreferences)?
- e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length())));
+ e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length())));
if (m_doc->doctype())
static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e);
return true;
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index cbf5cd5dd..d2910472e 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -48,7 +48,7 @@ namespace DOM {
namespace khtml {
-class XMLHandler : public QXmlDefaultHandler
+class XMLHandler : public TQXmlDefaultHandler
{
public:
XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view);
@@ -116,7 +116,7 @@ private:
State state;
};
-class Tokenizer : public QObject
+class Tokenizer : public TQObject
{
Q_OBJECT
public:
@@ -139,7 +139,7 @@ signals:
};
-class XMLIncrementalSource : public QXmlInputSource
+class XMLIncrementalSource : public TQXmlInputSource
{
public:
XMLIncrementalSource();
@@ -155,7 +155,7 @@ public:
private:
TQString m_data;
uint m_pos;
- const TQChar *m_unicode;
+ const TQChar *m_tqunicode;
bool m_finished;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-22 04:11:28 +0000