summaryrefslogtreecommitdiffstats
path: root/khtml/xml
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
commitffe8a83e053396df448e9413828527613ca3bd46 (patch)
treea73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /khtml/xml
parent682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff)
downloadtdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz
tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/xml')
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp52
-rw-r--r--khtml/xml/dom2_eventsimpl.h18
-rw-r--r--khtml/xml/dom_docimpl.cpp132
-rw-r--r--khtml/xml/dom_docimpl.h138
-rw-r--r--khtml/xml/dom_elementimpl.cpp12
-rw-r--r--khtml/xml/dom_elementimpl.h6
-rw-r--r--khtml/xml/dom_nodeimpl.cpp56
-rw-r--r--khtml/xml/dom_nodeimpl.h16
-rw-r--r--khtml/xml/dom_stringimpl.cpp66
-rw-r--r--khtml/xml/dom_stringimpl.h18
-rw-r--r--khtml/xml/dom_xmlimpl.cpp16
-rw-r--r--khtml/xml/dom_xmlimpl.h12
-rw-r--r--khtml/xml/xml_tokenizer.cpp80
-rw-r--r--khtml/xml/xml_tokenizer.h68
14 files changed, 345 insertions, 345 deletions
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index db8b17b6f..bcc2fca3a 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 = QDateTime::currentDateTime();
+ m_createTime = TQDateTime::currentDateTime();
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 = QDateTime::currentDateTime();
+ m_createTime = TQDateTime::currentDateTime();
m_defaultHandled = false;
}
@@ -90,7 +90,7 @@ void EventImpl::setTarget(NodeImpl *_target)
DOMTimeStamp EventImpl::timeStamp()
{
- QDateTime epoch(QDate(1970,1,1),QTime(0,0));
+ TQDateTime epoch(TQDate(1970,1,1),TQTime(0,0));
// ### kjs does not yet support long long (?) so the value wraps around
return epoch.secsTo(m_createTime)*1000+m_createTime.time().msec();
}
@@ -373,7 +373,7 @@ MouseEventImpl::MouseEventImpl(EventId _id,
bool metaKeyArg,
unsigned short buttonArg,
NodeImpl *relatedTargetArg,
- QMouseEvent *qe,
+ TQMouseEvent *qe,
bool isDoubleClick)
: UIEventImpl(_id,canBubbleArg,cancelableArg,viewArg,detailArg)
{
@@ -499,22 +499,22 @@ public:
}
L toLeft(R r) {
- QMapIterator<R,L> i( m_rToL.find(r) );
+ TQMapIterator<R,L> i( m_rToL.find(r) );
if (i != m_rToL.end())
return *i;
return L();
}
R toRight(L l) {
- QMapIterator<L,R> i = m_lToR.find(l);
+ TQMapIterator<L,R> i = m_lToR.find(l);
if (i != m_lToR.end())
return *i;
return R();
}
private:
- QMap<L, R> m_lToR;
- QMap<R, L> m_rToL;
+ TQMap<L, R> m_lToR;
+ TQMap<R, L> m_rToL;
};
#define MAKE_TRANSLATOR(name,L,R,MR,table) static IDTranslator<L,R,MR>* s_##name; \
@@ -578,13 +578,13 @@ IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
MAKE_TRANSLATOR(virtKeyToQtKey, unsigned, unsigned, unsigned, virtKeyToQtKeyTable)
KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelableArg, AbstractViewImpl *viewArg,
- QKeyEvent *key) :
+ TQKeyEvent *key) :
UIEventImpl(id, canBubbleArg, cancelableArg, viewArg, 0)
{
m_synthetic = false;
//Here, we need to map Qt's internal info to browser-style info.
- m_keyEvent = new QKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count() );
+ m_keyEvent = new TQKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count() );
m_detail = key->count();
m_keyVal = key->ascii();
@@ -647,27 +647,27 @@ void KeyEventBaseImpl::buildQKeyEvent() const
int key = 0;
int ascii = 0;
- QString text;
+ TQString text;
if (m_virtKeyVal)
key = virtKeyToQtKey()->toRight(m_virtKeyVal);
if (!key) {
ascii = m_keyVal; //###?
key = m_keyVal;
- text = QChar(key);
+ text = TQChar(key);
}
//Neuter F keys as well.
if (key >= Qt::Key_F1 && key <= Qt::Key_F35)
key = Qt::Key_ScrollLock;
- m_keyEvent = new QKeyEvent(id() == KEYUP_EVENT ? QEvent::KeyRelease : QEvent::KeyPress,
+ m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress,
key, ascii, modifiers, text);
}
//------------------------------------------------------------------------------
-static const IDTranslator<QCString, unsigned, const char*>::Info keyIdentifiersToVirtKeysTable[] = {
+static const IDTranslator<TQCString, unsigned, const char*>::Info keyIdentifiersToVirtKeysTable[] = {
{"Alt", KeyEventBaseImpl::DOM_VK_LEFT_ALT},
{"Control", KeyEventBaseImpl::DOM_VK_LEFT_CONTROL},
{"Shift", KeyEventBaseImpl::DOM_VK_LEFT_SHIFT},
@@ -719,10 +719,10 @@ static const IDTranslator<QCString, unsigned, const char*>::Info keyIdentifiersT
{0, 0}
};
-MAKE_TRANSLATOR(keyIdentifiersToVirtKeys, QCString, unsigned, const char*, keyIdentifiersToVirtKeysTable)
+MAKE_TRANSLATOR(keyIdentifiersToVirtKeys, TQCString, unsigned, const char*, keyIdentifiersToVirtKeysTable)
/** These are the modifiers we currently support */
-static const IDTranslator<QCString, unsigned, const char*>::Info keyModifiersToCodeTable[] = {
+static const IDTranslator<TQCString, unsigned, const char*>::Info keyModifiersToCodeTable[] = {
{"Alt", Qt::AltButton},
{"Control", Qt::ControlButton},
{"Shift", Qt::ShiftButton},
@@ -730,7 +730,7 @@ static const IDTranslator<QCString, unsigned, const char*>::Info keyModifiersToC
{0, 0}
};
-MAKE_TRANSLATOR(keyModifiersToCode, QCString, unsigned, const char*, keyModifiersToCodeTable)
+MAKE_TRANSLATOR(keyModifiersToCode, TQCString, unsigned, const char*, keyModifiersToCodeTable)
KeyboardEventImpl::KeyboardEventImpl() : m_keyLocation(DOM_KEY_LOCATION_STANDARD)
{}
@@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const
{
if (unsigned special = virtKeyVal())
if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
- return QString::fromLatin1(id);
+ return TQString::fromLatin1(id);
if (unsigned unicode = keyVal())
- return QString(QChar(unicode));
+ return TQString(TQChar(unicode));
return "Unidentified";
}
@@ -784,12 +784,12 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
virtKeyVal = keyIdentifiersToVirtKeys()->toRight(keyIdentifierArg.string().latin1());
//Process modifier list.
- QStringList mods =
- QStringList::split(' ',
+ TQStringList mods =
+ TQStringList::split(' ',
modifiersList.string().stripWhiteSpace().simplifyWhiteSpace());
unsigned modifiers = 0;
- for (QStringList::Iterator i = mods.begin(); i != mods.end(); ++i)
+ for (TQStringList::Iterator i = mods.begin(); i != mods.end(); ++i)
if (unsigned mask = keyModifiersToCode()->toRight((*i).latin1()))
modifiers |= mask;
@@ -797,8 +797,8 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
keyVal, virtKeyVal, modifiers);
}
-KeyboardEventImpl::KeyboardEventImpl(QKeyEvent* key, DOM::AbstractViewImpl* view) :
- KeyEventBaseImpl(key->type() == QEvent::KeyRelease ? KEYUP_EVENT : KEYDOWN_EVENT, true, true, view, key)
+KeyboardEventImpl::KeyboardEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view) :
+ KeyEventBaseImpl(key->type() == TQEvent::KeyRelease ? KEYUP_EVENT : KEYDOWN_EVENT, true, true, view, key)
{
//Try to put something reasonable in location...
//we don't know direction, so guess left
@@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const
if (m_virtKeyVal != DOM_VK_UNDEFINED)
return m_virtKeyVal;
else
- return QChar((unsigned short)m_keyVal).upper().unicode();
+ return TQChar((unsigned short)m_keyVal).upper().unicode();
}
int KeyboardEventImpl::charCode() const
@@ -839,7 +839,7 @@ bool TextEventImpl::isTextInputEvent() const
return true;
}
-TextEventImpl::TextEventImpl(QKeyEvent* key, DOM::AbstractViewImpl* view) :
+TextEventImpl::TextEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view) :
KeyEventBaseImpl(KEYPRESS_EVENT, true, true, view, key)
{
m_outputString = key->text();
diff --git a/khtml/xml/dom2_eventsimpl.h b/khtml/xml/dom2_eventsimpl.h
index 2f2034088..7318035d2 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/khtml/xml/dom2_eventsimpl.h
@@ -141,7 +141,7 @@ protected:
unsigned short m_eventPhase : 2;
NodeImpl *m_currentTarget; // ref > 0 maintained externally
NodeImpl *m_target;
- QDateTime m_createTime;
+ TQDateTime m_createTime;
DOMString m_message;
};
@@ -193,7 +193,7 @@ public:
bool metaKeyArg,
unsigned short buttonArg,
NodeImpl *relatedTargetArg,
- QMouseEvent *qe = 0,
+ TQMouseEvent *qe = 0,
bool isDoubleClick = false);
virtual ~MouseEventImpl();
long screenX() const { return m_screenX; }
@@ -231,7 +231,7 @@ public:
const Node &relatedTargetArg);
virtual bool isMouseEvent() const;
- QMouseEvent *qEvent() const { return m_qevent; }
+ TQMouseEvent *qEvent() const { return m_qevent; }
protected:
long m_screenX;
long m_screenY;
@@ -248,7 +248,7 @@ protected:
bool m_isDoubleClick : 1;
unsigned short m_button;
NodeImpl *m_relatedTarget;
- QMouseEvent *m_qevent;
+ TQMouseEvent *m_qevent;
};
@@ -326,7 +326,7 @@ public:
unsigned long keyVal() const { return m_keyVal; }
unsigned long virtKeyVal() const { return m_virtKeyVal; }
- QKeyEvent *qKeyEvent() const { if (!m_keyEvent) buildQKeyEvent(); return m_keyEvent; }
+ TQKeyEvent *qKeyEvent() const { if (!m_keyEvent) buildQKeyEvent(); return m_keyEvent; }
//Legacy key stuff...
virtual int keyCode() const = 0;
@@ -348,10 +348,10 @@ protected:
bool canBubbleArg,
bool cancelableArg,
AbstractViewImpl *viewArg,
- QKeyEvent *key);
+ TQKeyEvent *key);
- mutable QKeyEvent *m_keyEvent;
+ mutable TQKeyEvent *m_keyEvent;
unsigned long m_keyVal; //Unicode key value
unsigned long m_virtKeyVal; //Virtual key value for keys like arrows, Fn, etc.
@@ -367,7 +367,7 @@ class TextEventImpl : public KeyEventBaseImpl {
public:
TextEventImpl();
- TextEventImpl(QKeyEvent* key, DOM::AbstractViewImpl* view);
+ TextEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view);
void initTextEvent(const DOMString &typeArg,
bool canBubbleArg,
@@ -389,7 +389,7 @@ private:
class KeyboardEventImpl : public KeyEventBaseImpl {
public:
KeyboardEventImpl();
- KeyboardEventImpl(QKeyEvent* key, DOM::AbstractViewImpl* view);
+ KeyboardEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view);
virtual bool isKeyboardEvent() const;
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index f6cc0fa64..36570d69a 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -43,8 +43,8 @@
#include "ecma/kjs_proxy.h"
#include "ecma/kjs_binding.h"
-#include <qptrstack.h>
-#include <qpaintdevicemetrics.h>
+#include <tqptrstack.h>
+#include <tqpaintdevicemetrics.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstaticdeleter.h>
@@ -101,7 +101,7 @@ DOMImplementationImpl::~DOMImplementationImpl()
bool DOMImplementationImpl::hasFeature ( const DOMString &feature, const DOMString &version )
{
// ### update when we (fully) support the relevant features
- QString lower = feature.string().lower();
+ TQString lower = feature.string().lower();
if ((lower == "html" || lower == "xml") &&
(version.isEmpty() || version == "1.0" || version == "2.0" || version == "null"))
return true;
@@ -228,7 +228,7 @@ ElementMappingCache::ElementMappingCache():m_dict(257)
m_dict.setAutoDelete(true);
}
-void ElementMappingCache::add(const QString& id, ElementImpl* nd)
+void ElementMappingCache::add(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
@@ -247,7 +247,7 @@ void ElementMappingCache::add(const QString& id, ElementImpl* nd)
}
}
-void ElementMappingCache::set(const QString& id, ElementImpl* nd)
+void ElementMappingCache::set(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
@@ -255,7 +255,7 @@ void ElementMappingCache::set(const QString& id, ElementImpl* nd)
info->nd = nd;
}
-void ElementMappingCache::remove(const QString& id, ElementImpl* nd)
+void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
{
if (id.isEmpty()) return;
@@ -273,20 +273,20 @@ void ElementMappingCache::remove(const QString& id, ElementImpl* nd)
}
}
-bool ElementMappingCache::contains(const QString& id)
+bool ElementMappingCache::contains(const TQString& id)
{
if (id.isEmpty()) return false;
return m_dict.find(id);
}
-ElementMappingCache::ItemInfo* ElementMappingCache::get(const QString& id)
+ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
{
if (id.isEmpty()) return 0;
return m_dict.find(id);
}
-static KStaticDeleter< QPtrList<DocumentImpl> > s_changedDocumentsDeleter;
-QPtrList<DocumentImpl> * DocumentImpl::changedDocuments;
+static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
+TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments;
// KHTMLView might be 0
DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
@@ -335,7 +335,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
m_attrMap = new IdNameMapping(ATTR_LAST_ATTR+1);
m_elementMap = new IdNameMapping(ID_LAST_TAG+1);
m_namespaceMap = new IdNameMapping(1);
- QString xhtml(XHTML_NAMESPACE);
+ 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[emptyNamespace]->ref();
@@ -423,7 +423,7 @@ DocumentImpl::~DocumentImpl()
//you may also have to fix removedLastRef() above - M.O.
assert( !m_render );
- QIntDictIterator<NodeListImpl::Cache> it(m_nodeListCache);
+ TQIntDictIterator<NodeListImpl::Cache> it(m_nodeListCache);
for (; it.current(); ++it)
it.current()->deref();
@@ -674,7 +674,7 @@ AttrImpl *DocumentImpl::createAttributeNS( const DOMString &_namespaceURI,
ElementImpl *DocumentImpl::getElementById( const DOMString &elementId ) const
{
- QString stringKey = elementId.string();
+ TQString stringKey = elementId.string();
ElementMappingCache::ItemInfo* info = m_getElementByIdCache.get(stringKey);
@@ -686,7 +686,7 @@ ElementImpl *DocumentImpl::getElementById( const DOMString &elementId ) const
return info->nd;
//Now we actually have to walk.
- QPtrStack<NodeImpl> nodeStack;
+ TQPtrStack<NodeImpl> nodeStack;
NodeImpl *current = _first;
while(1)
@@ -734,7 +734,7 @@ void DocumentImpl::setTitle(const DOMString& _title)
m_title = _title;
- QString titleStr = m_title.string();
+ TQString titleStr = m_title.string();
for (unsigned int i = 0; i < titleStr.length(); ++i)
if (titleStr[i] < ' ')
titleStr[i] = ' ';
@@ -744,8 +744,8 @@ void DocumentImpl::setTitle(const DOMString& _title)
if (titleStr.isNull() || titleStr.isEmpty()) {
// empty title... set window caption as the URL
KURL url = m_url;
- url.setRef(QString::null);
- url.setQuery(QString::null);
+ url.setRef(TQString::null);
+ url.setQuery(TQString::null);
titleStr = url.prettyURL();
}
@@ -1037,9 +1037,9 @@ ElementImpl *DocumentImpl::createHTMLElement( const DOMString &name )
return n;
}
-QString DocumentImpl::nextState()
+TQString DocumentImpl::nextState()
{
- QString state;
+ TQString state;
if (!m_state.isEmpty())
{
state = m_state.first();
@@ -1048,10 +1048,10 @@ QString DocumentImpl::nextState()
return state;
}
-QStringList DocumentImpl::docState()
+TQStringList DocumentImpl::docState()
{
- QStringList s;
- for (QPtrListIterator<NodeImpl> it(m_maintainsState); it.current(); ++it)
+ TQStringList s;
+ for (TQPtrListIterator<NodeImpl> it(m_maintainsState); it.current(); ++it)
s.append(it.current()->state());
return s;
@@ -1059,7 +1059,7 @@ QStringList DocumentImpl::docState()
bool DocumentImpl::unsubmittedFormChanges()
{
- for (QPtrListIterator<NodeImpl> it(m_maintainsState); it.current(); ++it)
+ for (TQPtrListIterator<NodeImpl> it(m_maintainsState); it.current(); ++it)
if (it.current()->state().right(1)=="M")
return true;
@@ -1097,7 +1097,7 @@ TreeWalkerImpl *DocumentImpl::createTreeWalker(NodeImpl *root, unsigned long wha
void DocumentImpl::setDocumentChanged(bool b)
{
if (!changedDocuments)
- changedDocuments = s_changedDocumentsDeleter.setObject( changedDocuments, new QPtrList<DocumentImpl>() );
+ changedDocuments = s_changedDocumentsDeleter.setObject( changedDocuments, new TQPtrList<DocumentImpl>() );
if (b && !m_docChanged)
changedDocuments->append(this);
@@ -1109,7 +1109,7 @@ void DocumentImpl::setDocumentChanged(bool b)
void DocumentImpl::recalcStyle( StyleChange change )
{
// qDebug("recalcStyle(%p)", this);
-// QTime qt;
+// TQTime qt;
// qt.start();
if (m_inStyleRecalc)
return; // Guard against re-entrancy. -dwh
@@ -1127,13 +1127,13 @@ void DocumentImpl::recalcStyle( StyleChange change )
// ### make the font stuff _really_ work!!!!
khtml::FontDef fontDef;
- QFont f = KGlobalSettings::generalFont();
+ TQFont f = KGlobalSettings::generalFont();
fontDef.family = f.family();
fontDef.italic = f.italic();
fontDef.weight = f.weight();
if (m_view) {
const KHTMLSettings *settings = m_view->part()->settings();
- QString stdfont = settings->stdFontName();
+ TQString stdfont = settings->stdFontName();
if ( !stdfont.isEmpty() )
fontDef.family = stdfont;
@@ -1179,7 +1179,7 @@ void DocumentImpl::updateRendering()
{
if (!hasChangedChild()) return;
-// QTime time;
+// TQTime time;
// time.start();
// kdDebug() << "UPDATERENDERING: "<<endl;
@@ -1298,12 +1298,12 @@ khtml::Tokenizer *DocumentImpl::createTokenizer()
return new khtml::XMLTokenizer(docPtr(),m_view);
}
-void DocumentImpl::setPaintDevice( QPaintDevice *dev )
+void DocumentImpl::setPaintDevice( TQPaintDevice *dev )
{
if (m_paintDevice != dev) {
m_paintDevice = dev;
delete m_paintDeviceMetrics;
- m_paintDeviceMetrics = new QPaintDeviceMetrics( dev );
+ m_paintDeviceMetrics = new TQPaintDeviceMetrics( dev );
}
}
@@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners )
m_tokenizer = createTokenizer();
m_decoderMibEnum = 0;
- connect(m_tokenizer,SIGNAL(finishedParsing()),this,SIGNAL(finishedParsing()));
+ connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing()));
m_tokenizer->begin();
}
@@ -1380,14 +1380,14 @@ void DocumentImpl::write( const DOMString &text )
write(text.string());
}
-void DocumentImpl::write( const QString &text )
+void DocumentImpl::write( const TQString &text )
{
if (!m_tokenizer) {
open();
if (m_view)
m_view->part()->resetFromScript();
m_tokenizer->setAutoClose();
- write(QString::fromLatin1("<html>"));
+ write(TQString::fromLatin1("<html>"));
}
m_tokenizer->write(text, false);
}
@@ -1404,7 +1404,7 @@ void DocumentImpl::finishParsing ( )
m_tokenizer->finish();
}
-void DocumentImpl::setUserStyleSheet( const QString& sheet )
+void DocumentImpl::setUserStyleSheet( const TQString& sheet )
{
if ( m_usersheet != sheet ) {
m_usersheet = sheet;
@@ -1421,7 +1421,7 @@ CSSStyleSheetImpl* DocumentImpl::elementSheet()
return m_elemSheet;
}
-void DocumentImpl::determineParseMode( const QString &/*str*/ )
+void DocumentImpl::determineParseMode( const TQString &/*str*/ )
{
// For XML documents, use strict parse mode
pMode = Strict;
@@ -1622,7 +1622,7 @@ NodeImpl *DocumentImpl::previousFocusNode(NodeImpl *fromNode)
}
}
-ElementImpl* DocumentImpl::findAccessKeyElement(QChar c)
+ElementImpl* DocumentImpl::findAccessKeyElement(TQChar c)
{
c = c.upper();
for( NodeImpl* n = this;
@@ -1667,10 +1667,10 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
if(strcasecmp(equiv, "refresh") == 0 && v && v->part()->metaRefreshEnabled())
{
// get delay and url
- QString str = content.string().stripWhiteSpace();
- int pos = str.find(QRegExp("[;,]"));
+ TQString str = content.string().stripWhiteSpace();
+ int pos = str.find(TQRegExp("[;,]"));
if ( pos == -1 )
- pos = str.find(QRegExp("[ \t]"));
+ pos = str.find(TQRegExp("[ \t]"));
bool ok = false;
int delay = kMax( 0, content.implementation()->toInt(&ok) );
@@ -1692,7 +1692,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
(str[str.length()-1] == ';' || str[str.length()-1] == ','))
str.setLength(str.length()-1);
str = parseURL( DOMString(str) ).string();
- QString newURL = getDocument()->completeURL( str );
+ TQString newURL = getDocument()->completeURL( str );
if ( ok )
v->part()->scheduleRedirection(delay, getDocument()->completeURL( str ), delay < 2 || newURL == URL().url());
}
@@ -1700,7 +1700,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
else if(strcasecmp(equiv, "expires") == 0)
{
bool relative = false;
- QString str = content.string().stripWhiteSpace();
+ TQString str = content.string().stripWhiteSpace();
time_t expire_date = KRFCDate::parseDate(str);
if (!expire_date)
{
@@ -1714,7 +1714,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
}
else if(v && (strcasecmp(equiv, "pragma") == 0 || strcasecmp(equiv, "cache-control") == 0))
{
- QString str = content.string().lower().stripWhiteSpace();
+ TQString str = content.string().lower().stripWhiteSpace();
KURL url = v->part()->url();
if ((str == "no-cache") && url.protocol().startsWith("http"))
{
@@ -1853,7 +1853,7 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
if (_name->l == 0) return 0;
NodeImpl::Id id, nsid = 0;
- QConstString n(_name->s, _name->l);
+ TQConstString n(_name->s, _name->l);
bool cs = true; // case sensitive
if (_type != NodeImpl::NamespaceId) {
if (_nsURI)
@@ -1878,7 +1878,7 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
// Look in the names array for the name
// compatibility mode has to lookup upper case
- QString name = cs ? n.string() : n.string().upper();
+ TQString name = cs ? n.string() : n.string().upper();
if (!_nsURI) {
id = (NodeImpl::Id)(long) map->ids.find( name );
@@ -1889,8 +1889,8 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
id = (NodeImpl::Id)(long) map->ids.find( name );
if (!readonly && id && _prefix && _prefix->l) {
// we were called in registration mode... check if the alias exists
- QConstString px( _prefix->s, _prefix->l );
- QString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
+ TQConstString px( _prefix->s, _prefix->l );
+ TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
if (!map->ids.find( qn )) {
map->ids.insert( qn, (void*)id );
}
@@ -2065,9 +2065,9 @@ void DocumentImpl::recalcStyleSelector()
assert(m_pendingStylesheets==0);
- QPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
+ TQPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
m_styleSheets->styleSheets.clear();
- QString sheetUsed = view() ? view()->part()->d->m_sheetUsed.replace("&&", "&") : QString();
+ TQString sheetUsed = view() ? view()->part()->d->m_sheetUsed.replace("&&", "&") : TQString();
bool autoselect = sheetUsed.isEmpty();
if (autoselect && !m_preferredStylesheetSet.isEmpty())
sheetUsed = m_preferredStylesheetSet.string();
@@ -2109,7 +2109,7 @@ void DocumentImpl::recalcStyleSelector()
}
else if (n->isHTMLElement() && ( n->id() == ID_LINK || n->id() == ID_STYLE) ) {
- QString title;
+ TQString title;
if ( n->id() == ID_LINK ) {
HTMLLinkElementImpl* l = static_cast<HTMLLinkElementImpl*>(n);
if (l->isCSSStyleSheet()) {
@@ -2177,17 +2177,17 @@ void DocumentImpl::recalcStyleSelector()
// the alternative sheet we used doesn't exist anymore
// so try from scratch again
if (view())
- view()->part()->d->m_sheetUsed = QString::null;
+ view()->part()->d->m_sheetUsed = TQString::null;
if (!m_preferredStylesheetSet.isEmpty() && !(sheetUsed == m_preferredStylesheetSet))
sheetUsed = m_preferredStylesheetSet.string();
else
- sheetUsed = QString::null;
+ sheetUsed = TQString::null;
autoselect = true;
}
// Include programmatically added style sheets
if (m_addedStyleSheets) {
- QPtrListIterator<StyleSheetImpl> it = m_addedStyleSheets->styleSheets;
+ TQPtrListIterator<StyleSheetImpl> it = m_addedStyleSheets->styleSheets;
for (; *it; ++it) {
if ((*it)->isCSSStyleSheet() && !(*it)->disabled())
m_styleSheets->add(*it);
@@ -2195,7 +2195,7 @@ void DocumentImpl::recalcStyleSelector()
}
// De-reference all the stylesheets in the old list
- QPtrListIterator<StyleSheetImpl> it(oldStyleSheets);
+ TQPtrListIterator<StyleSheetImpl> it(oldStyleSheets);
for (; it.current(); ++it)
it.current()->deref();
@@ -2206,7 +2206,7 @@ void DocumentImpl::rebuildStyleSelector()
{
// Create a new style selector
delete m_styleSelector;
- QString usersheet = m_usersheet;
+ TQString usersheet = m_usersheet;
if ( m_view && m_view->mediaType() == "print" )
usersheet += m_printSheet;
m_styleSelector = new CSSStyleSelector( this, usersheet, m_styleSheets, m_url,
@@ -2329,17 +2329,17 @@ void DocumentImpl::detachNodeIterator(NodeIteratorImpl *ni)
void DocumentImpl::notifyBeforeNodeRemoval(NodeImpl *n)
{
- QPtrListIterator<NodeIteratorImpl> it(m_nodeIterators);
+ TQPtrListIterator<NodeIteratorImpl> it(m_nodeIterators);
for (; it.current(); ++it)
it.current()->notifyBeforeNodeRemoval(n);
}
-bool DocumentImpl::isURLAllowed(const QString& url) const
+bool DocumentImpl::isURLAllowed(const TQString& url) const
{
KHTMLPart *thisPart = part();
KURL newURL(completeURL(url));
- newURL.setRef(QString::null);
+ newURL.setRef(TQString::null);
if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
return false;
@@ -2357,7 +2357,7 @@ bool DocumentImpl::isURLAllowed(const QString& url) const
bool foundSelfReference = false;
for (KHTMLPart *part = thisPart; part; part = part->parentPart()) {
KURL partURL = part->url();
- partURL.setRef(QString::null);
+ partURL.setRef(TQString::null);
if (partURL == newURL) {
if (foundSelfReference)
return false;
@@ -2436,7 +2436,7 @@ void DocumentImpl::load(const DOMString &uri)
// of the data retrieved from the server based on the character set, as happens with
// HTML files. Need to look into a way of using the decoder in CachedCSSStyleSheet.
m_docLoading = true;
- m_loadingXMLDoc = m_docLoader->requestStyleSheet(uri.string(),QString(),"text/xml");
+ m_loadingXMLDoc = m_docLoader->requestStyleSheet(uri.string(),TQString(),"text/xml");
if (!m_loadingXMLDoc) {
m_docLoading = false;
@@ -2478,7 +2478,7 @@ void DocumentImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DOMString
m_loadingXMLDoc = 0;
}
-void DocumentImpl::error(int err, const QString &text)
+void DocumentImpl::error(int err, const TQString &text)
{
m_docLoading = false;
if (m_inSyncLoad) {
@@ -2509,10 +2509,10 @@ void DocumentImpl::defaultEventHandler(EventImpl *evt)
if (!m_windowEventListeners.listeners || evt->propagationStopped())
return;
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
//Grab a copy in case of clear
- QValueList<RegisteredEventListener> listeners = *m_windowEventListeners.listeners;
+ TQValueList<RegisteredEventListener> listeners = *m_windowEventListeners.listeners;
Event ev(evt);
for (it = listeners.begin(); it != listeners.end(); ++it) {
//Check to make sure it didn't get removed. KDE4: use Java-style iterators
@@ -2554,7 +2554,7 @@ bool DocumentImpl::hasWindowEventListener(int id)
return m_windowEventListeners.hasEventListener(id);
}
-EventListener *DocumentImpl::createHTMLEventListener(const QString& code, const QString& name, NodeImpl* node)
+EventListener *DocumentImpl::createHTMLEventListener(const TQString& code, const TQString& name, NodeImpl* node)
{
return part() ? part()->createHTMLEventListener(code, name, node) : 0;
}
@@ -2595,7 +2595,7 @@ void DocumentImpl::dispatchImageLoadEventsNow()
m_imageLoadEventDispatchingList = m_imageLoadEventDispatchSoonList;
m_imageLoadEventDispatchSoonList.clear();
- for (QPtrListIterator<HTMLImageElementImpl> it(m_imageLoadEventDispatchingList); it.current(); ) {
+ for (TQPtrListIterator<HTMLImageElementImpl> it(m_imageLoadEventDispatchingList); it.current(); ) {
HTMLImageElementImpl* image = it.current();
// Must advance iterator *before* dispatching call.
// Otherwise, it might be advanced automatically if dispatching the call had a side effect
@@ -2607,12 +2607,12 @@ void DocumentImpl::dispatchImageLoadEventsNow()
m_imageLoadEventDispatchingList.clear();
}
-void DocumentImpl::timerEvent(QTimerEvent *)
+void DocumentImpl::timerEvent(TQTimerEvent *)
{
dispatchImageLoadEventsNow();
}
-void DocumentImpl::setDecoderCodec(const QTextCodec *codec)
+void DocumentImpl::setDecoderCodec(const TQTextCodec *codec)
{
m_decoderMibEnum = codec->mibEnum();
}
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index 51d762325..e32a88414 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -34,13 +34,13 @@
#include "misc/loader.h"
#include "misc/seed.h"
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qintcache.h>
-#include <qintdict.h>
-#include <qdict.h>
-#include <qmap.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqintcache.h>
+#include <tqintdict.h>
+#include <tqdict.h>
+#include <tqmap.h>
#include <kurl.h>
@@ -151,36 +151,36 @@ public:
/**
Add a pointer as just one of candidates, not neccesserily the proper one
*/
- void add(const QString& id, ElementImpl* nd);
+ void add(const TQString& id, ElementImpl* nd);
/**
Set the pointer as the definite mapping; it must have already been added
*/
- void set(const QString& id, ElementImpl* nd);
+ void set(const TQString& id, ElementImpl* nd);
/**
Remove the item; it must have already been added.
*/
- void remove(const QString& id, ElementImpl* nd);
+ void remove(const TQString& id, ElementImpl* nd);
/**
Returns true if the item exists
*/
- bool contains(const QString& id);
+ bool contains(const TQString& id);
/**
Returns the information for the given ID
*/
- ItemInfo* get(const QString& id);
+ ItemInfo* get(const TQString& id);
private:
- QDict<ItemInfo> m_dict;
+ TQDict<ItemInfo> m_dict;
};
/**
* @internal
*/
-class DocumentImpl : public QObject, private khtml::CachedObjectClient, public NodeBaseImpl
+class DocumentImpl : public TQObject, private khtml::CachedObjectClient, public NodeBaseImpl
{
Q_OBJECT
public:
@@ -197,7 +197,7 @@ public:
virtual AttrImpl *createAttribute( const DOMString &tagName, int* pExceptioncode = 0 );
DocumentFragmentImpl *createDocumentFragment ();
TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); }
- TextImpl *createTextNode ( const QString& data )
+ TextImpl *createTextNode ( const TQString& data )
{ return createTextNode(new DOMStringImpl(data.unicode(), data.length())); }
CommentImpl *createComment ( DOMStringImpl* data );
CDATASectionImpl *createCDATASection ( DOMStringImpl* data );
@@ -270,16 +270,16 @@ public:
void recalcStyleSelector();
void rebuildStyleSelector();
- QString nextState();
+ TQString nextState();
// Query all registered elements for their state
- QStringList docState();
+ TQStringList docState();
bool unsubmittedFormChanges();
void registerMaintainsState(NodeImpl* e) { m_maintainsState.append(e); }
void deregisterMaintainsState(NodeImpl* e) { m_maintainsState.removeRef(e); }
// Set the state the document should restore to
- void setRestoreState( const QStringList &s) { m_state = s; }
+ void setRestoreState( const TQStringList &s) { m_state = s; }
KHTMLView *view() const { return m_view; }
KHTMLPart* part() const;
@@ -293,7 +293,7 @@ public:
bool entityReferenceExpansion, int &exceptioncode);
virtual void recalcStyle( StyleChange = NoChange );
- static QPtrList<DocumentImpl> * changedDocuments;
+ static TQPtrList<DocumentImpl> * changedDocuments;
virtual void updateRendering();
void updateLayout();
static void updateDocumentsRendering();
@@ -307,7 +307,7 @@ public:
// to get visually ordered hebrew and arabic pages right
void setVisuallyOrdered();
// to get URL decoding right
- void setDecoderCodec(const QTextCodec *codec);
+ void setDecoderCodec(const TQTextCodec *codec);
void setSelection(NodeImpl* s, int sp, NodeImpl* e, int ep);
void clearSelection();
@@ -315,34 +315,34 @@ public:
void open ( bool clearEventListeners = true );
virtual void close ( );
void write ( const DOMString &text );
- void write ( const QString &text );
+ void write ( const TQString &text );
void writeln ( const DOMString &text );
void finishParsing ( );
KURL URL() const { return m_url; }
- void setURL(const QString& url) { m_url = url; }
+ void setURL(const TQString& url) { m_url = url; }
KURL baseURL() const { return m_baseURL.isEmpty() ? m_url : m_baseURL; }
void setBaseURL(const KURL& baseURL) { m_baseURL = baseURL; }
- QString baseTarget() const { return m_baseTarget; }
- void setBaseTarget(const QString& baseTarget) { m_baseTarget = baseTarget; }
+ TQString baseTarget() const { return m_baseTarget; }
+ void setBaseTarget(const TQString& baseTarget) { m_baseTarget = baseTarget; }
- QString completeURL(const QString& url) const { return KURL(baseURL(),url,m_decoderMibEnum).url(); };
+ TQString completeURL(const TQString& url) const { return KURL(baseURL(),url,m_decoderMibEnum).url(); };
DOMString canonURL(const DOMString& url) const { return url.isEmpty() ? url : completeURL(url.string()); }
- void setUserStyleSheet(const QString& sheet);
- QString userStyleSheet() const { return m_usersheet; }
- void setPrintStyleSheet(const QString& sheet) { m_printSheet = sheet; }
- QString printStyleSheet() const { return m_printSheet; }
+ void setUserStyleSheet(const TQString& sheet);
+ TQString userStyleSheet() const { return m_usersheet; }
+ void setPrintStyleSheet(const TQString& sheet) { m_printSheet = sheet; }
+ TQString printStyleSheet() const { return m_printSheet; }
CSSStyleSheetImpl* elementSheet();
virtual khtml::Tokenizer *createTokenizer();
khtml::Tokenizer *tokenizer() { return m_tokenizer; }
- QPaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
- QPaintDevice *paintDevice() const { return m_paintDevice; }
- void setPaintDevice( QPaintDevice *dev );
+ TQPaintDeviceMetrics *paintDeviceMetrics() { return m_paintDeviceMetrics; }
+ TQPaintDevice *paintDevice() const { return m_paintDevice; }
+ void setPaintDevice( TQPaintDevice *dev );
enum HTMLMode {
Html3 = 0,
@@ -356,7 +356,7 @@ public:
Transitional,
Strict
};
- virtual void determineParseMode( const QString &str );
+ virtual void determineParseMode( const TQString &str );
void setParseMode( ParseMode m ) { pMode = m; }
ParseMode parseMode() const { return pMode; }
@@ -370,8 +370,8 @@ public:
void setParsing(bool b) { m_bParsing = b; }
bool parsing() const { return m_bParsing; }
- void setTextColor( QColor color ) { m_textColor = color; }
- QColor textColor() const { return m_textColor; }
+ void setTextColor( TQColor color ) { m_textColor = color; }
+ TQColor textColor() const { return m_textColor; }
void setDesignMode(bool b);
bool designMode() const;
@@ -398,7 +398,7 @@ public:
void addStyleSheet(StyleSheetImpl *, int *exceptioncode = 0);
void removeStyleSheet(StyleSheetImpl *, int *exceptioncode = 0);
- QStringList availableStyleSheets() const { return m_availableSheets; }
+ TQStringList availableStyleSheets() const { return m_availableSheets; }
NodeImpl* hoverNode() const { return m_hoverNode; }
void setHoverNode(NodeImpl *newHoverNode);
@@ -443,21 +443,21 @@ public:
void loadXML(const DOMString &source);
// from cachedObjectClient
void setStyleSheet(const DOM::DOMString &url, const DOM::DOMString &sheet, const DOM::DOMString &charset);
- void error(int err, const QString &text);
+ void error(int err, const TQString &text);
- typedef QMap<QString, ProcessingInstructionImpl*> LocalStyleRefs;
+ typedef TQMap<TQString, ProcessingInstructionImpl*> LocalStyleRefs;
LocalStyleRefs* localStyleRefs() { return &m_localStyleRefs; }
virtual void defaultEventHandler(EventImpl *evt);
virtual void setHTMLWindowEventListener(int id, EventListener *listener);
EventListener *getHTMLWindowEventListener(int id);
- EventListener *createHTMLEventListener(const QString& code, const QString& name, NodeImpl* node);
+ EventListener *createHTMLEventListener(const TQString& code, const TQString& name, NodeImpl* node);
void addWindowEventListener(int id, EventListener *listener, const bool useCapture);
void removeWindowEventListener(int id, EventListener *listener, bool useCapture);
bool hasWindowEventListener(int id);
- EventListener *createHTMLEventListener(QString code);
+ EventListener *createHTMLEventListener(TQString code);
/**
* Searches through the document, starting from fromNode, for the next selectable element that comes after fromNode.
@@ -485,7 +485,7 @@ public:
*/
NodeImpl *previousFocusNode(NodeImpl *fromNode);
- ElementImpl* findAccessKeyElement(QChar c);
+ ElementImpl* findAccessKeyElement(TQChar c);
int nodeAbsIndex(NodeImpl *node);
NodeImpl *nodeWithAbsIndex(int absIndex);
@@ -504,7 +504,7 @@ public:
void dispatchImageLoadEventSoon(HTMLImageElementImpl *);
void dispatchImageLoadEventsNow();
void removeImage(HTMLImageElementImpl *);
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
// Returns the owning element in the parent document.
// Returns 0 if this is the top level document.
@@ -513,7 +513,7 @@ public:
DOMString domain() const;
void setDomain( const DOMString &newDomain ); // not part of the DOM
- bool isURLAllowed(const QString& url) const;
+ bool isURLAllowed(const TQString& url) const;
HTMLElementImpl* body();
@@ -522,8 +522,8 @@ public:
void incDOMTreeVersion() { ++m_domtree_version; }
unsigned int domTreeVersion() const { return m_domtree_version; }
- QDict<khtml::CounterNode>* counters(const khtml::RenderObject* o) { return m_counterDict[(void*)o]; }
- void setCounters(const khtml::RenderObject* o, QDict<khtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
+ TQDict<khtml::CounterNode>* counters(const khtml::RenderObject* o) { return m_counterDict[(void*)o]; }
+ void setCounters(const khtml::RenderObject* o, TQDict<khtml::CounterNode> *dict) { m_counterDict.insert((void*)o, dict);}
void removeCounters(const khtml::RenderObject* o) { m_counterDict.remove((void*)o); }
@@ -539,8 +539,8 @@ public:
return m_getElementByIdCache;
}
- QString contentLanguage() const { return m_contentLanguage; }
- void setContentLanguage(const QString& cl) { m_contentLanguage = cl; }
+ TQString contentLanguage() const { return m_contentLanguage; }
+ void setContentLanguage(const TQString& cl) { m_contentLanguage = cl; }
khtml::DynamicDomRestyler& dynamicDomRestyler() { return *m_dynamicDomRestyler; }
const khtml::DynamicDomRestyler& dynamicDomRestyler() const { return *m_dynamicDomRestyler; }
@@ -551,22 +551,22 @@ signals:
protected:
khtml::CSSStyleSelector *m_styleSelector;
KHTMLView *m_view;
- QStringList m_state;
+ TQStringList m_state;
khtml::DocLoader *m_docLoader;
khtml::Tokenizer *m_tokenizer;
KURL m_url;
KURL m_baseURL;
- QString m_baseTarget;
+ TQString m_baseTarget;
DocumentTypeImpl *m_doctype;
DOMImplementationImpl *m_implementation;
- QString m_usersheet;
- QString m_printSheet;
- QStringList m_availableSheets;
+ TQString m_usersheet;
+ TQString m_printSheet;
+ TQStringList m_availableSheets;
- QString m_contentLanguage;
+ TQString m_contentLanguage;
// Track the number of currently loading top-level stylesheets. Sheets
// loaded using the @import directive are not included in this count.
@@ -577,12 +577,12 @@ protected:
CSSStyleSheetImpl *m_elemSheet;
- QPaintDevice *m_paintDevice;
- QPaintDeviceMetrics *m_paintDeviceMetrics;
+ TQPaintDevice *m_paintDevice;
+ TQPaintDeviceMetrics *m_paintDeviceMetrics;
ParseMode pMode;
HTMLMode hMode;
- QColor m_textColor;
+ TQColor m_textColor;
NodeImpl *m_hoverNode;
NodeImpl *m_focusNode;
NodeImpl *m_activeNode;
@@ -594,14 +594,14 @@ protected:
IdNameMapping(unsigned short _start)
: idStart(_start), count(0) {}
~IdNameMapping() {
- QIntDictIterator<DOM::DOMStringImpl> it(names);
+ TQIntDictIterator<DOM::DOMStringImpl> it(names);
for (; it.current() ; ++it)
it.current()->deref();
}
unsigned short idStart;
unsigned short count;
- QIntDict<DOM::DOMStringImpl> names;
- QDict<void> ids;
+ TQIntDict<DOM::DOMStringImpl> names;
+ TQDict<void> ids;
void expandIfNeeded() {
if (ids.size() <= ids.count() && ids.size() != khtml_MaxSeed)
@@ -612,10 +612,10 @@ protected:
void addAlias(DOMStringImpl* _prefix, DOMStringImpl* _name, bool cs, NodeImpl::Id id) {
if(_prefix && _prefix->l) {
- QConstString n(_name->s, _name->l);
- QConstString px( _prefix->s, _prefix->l );
- QString name = cs ? n.string() : n.string().upper();
- QString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
+ TQConstString n(_name->s, _name->l);
+ 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 )) {
ids.insert( qn, (void*)id );
}
@@ -629,7 +629,7 @@ protected:
IdNameMapping *m_elementMap;
IdNameMapping *m_namespaceMap;
- QPtrList<NodeIteratorImpl> m_nodeIterators;
+ TQPtrList<NodeIteratorImpl> m_nodeIterators;
AbstractViewImpl *m_defaultView;
unsigned short m_listenerTypes;
@@ -637,10 +637,10 @@ protected:
StyleSheetListImpl *m_addedStyleSheets; // programmatically added style sheets
LocalStyleRefs m_localStyleRefs; // references to inlined style elements
RegisteredListenerList m_windowEventListeners;
- QPtrList<NodeImpl> m_maintainsState;
+ TQPtrList<NodeImpl> m_maintainsState;
// ### evaluate for placement in RenderStyle
- QPtrDict<QDict<khtml::CounterNode> > m_counterDict;
+ TQPtrDict<TQDict<khtml::CounterNode> > m_counterDict;
khtml::DynamicDomRestyler *m_dynamicDomRestyler;
@@ -664,10 +664,10 @@ protected:
ElementMappingCache m_underDocNamedCache;
//Cache for nodelists and collections.
- QIntDict<NodeListImpl::Cache> m_nodeListCache;
+ TQIntDict<NodeListImpl::Cache> m_nodeListCache;
- QPtrList<HTMLImageElementImpl> m_imageLoadEventDispatchSoonList;
- QPtrList<HTMLImageElementImpl> m_imageLoadEventDispatchingList;
+ TQPtrList<HTMLImageElementImpl> m_imageLoadEventDispatchSoonList;
+ TQPtrList<HTMLImageElementImpl> m_imageLoadEventDispatchingList;
int m_imageLoadEventTimer;
//Cache for getElementById
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index 5db497e7d..c41bef3dc 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -46,7 +46,7 @@
#include "css/cssproperties.h"
#include "xml/dom_xmlimpl.h"
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <stdlib.h>
@@ -746,12 +746,12 @@ void ElementImpl::updateId(DOMStringImpl* oldId, DOMStringImpl* newId)
addId(DOMString(newId).string());
}
-void ElementImpl::removeId(const QString& id)
+void ElementImpl::removeId(const TQString& id)
{
getDocument()->getElementByIdCache().remove(id, this);
}
-void ElementImpl::addId(const QString& id)
+void ElementImpl::addId(const TQString& id)
{
getDocument()->getElementByIdCache().add(id, this);
}
@@ -805,7 +805,7 @@ DOMString ElementImpl::openTagStartToString(bool expandurls) const
//We need to sanitize the urls - strip out the passwords.
//FIXME: are src= and href= the only places that might have a password and need to be sanitized?
KURL safeURL(getDocument()->completeURL(attribute->value().string()));
- safeURL.setPass(QString::null);
+ safeURL.setPass(TQString::null);
result += safeURL.htmlURL();
}
else {
@@ -848,14 +848,14 @@ DOMString ElementImpl::selectionToString(NodeImpl *selectionStart, NodeImpl *sel
DOMString ElementImpl::toString() const
{
- QString result = openTagStartToString().string(); //Accumulate in QString, since DOMString can't append well.
+ TQString result = openTagStartToString().string(); //Accumulate in TQString, since DOMString can't append well.
if (hasChildNodes()) {
result += ">";
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
- result += QConstString(kid.unicode(), kid.length()).string();
+ result += TQConstString(kid.unicode(), kid.length()).string();
}
result += "</";
diff --git a/khtml/xml/dom_elementimpl.h b/khtml/xml/dom_elementimpl.h
index 1bc5148d5..ee1be3e4a 100644
--- a/khtml/xml/dom_elementimpl.h
+++ b/khtml/xml/dom_elementimpl.h
@@ -188,7 +188,7 @@ public:
void setAttributeMap ( NamedAttrMapImpl* list );
// State of the element.
- virtual QString state() { return QString::null; }
+ virtual TQString state() { return TQString::null; }
virtual void attach();
virtual void close();
@@ -238,9 +238,9 @@ public:
void updateId(DOMStringImpl* oldId, DOMStringImpl* newId);
//Called when mapping from id to this node in document should be removed
- virtual void removeId(const QString& id);
+ virtual void removeId(const TQString& id);
//Called when mapping from id to this node in document should be added
- virtual void addId (const QString& id);
+ virtual void addId (const TQString& id);
protected:
void createAttributeMap() const;
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index 692ba4394..137928c81 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -233,7 +233,7 @@ kdDebug(6200) << "getCaret: node " << this << " " << nodeName().string() << " of
#endif
mapDOMPosToRenderPos(this, offset, r, r_ofs, outside, outsideEnd);
#if 0
-kdDebug(6200) << "getCaret: r " << r << " " << (r?r->renderName():QString::null) << " r_ofs: " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl;
+kdDebug(6200) << "getCaret: r " << r << " " << (r?r->renderName():TQString::null) << " r_ofs: " << r_ofs << " outside " << outside << " outsideEnd " << outsideEnd << endl;
#endif
if (r) {
r->caretPos(r_ofs, override*RenderObject::CFOverride
@@ -244,14 +244,14 @@ kdDebug(6200) << "getCaret: r " << r << " " << (r?r->renderName():QString::null)
} else _x = _y = height = -1, width = 1;
}
-QRect NodeImpl::getRect() const
+TQRect NodeImpl::getRect() const
{
int _x, _y;
if(m_render && m_render->absolutePosition(_x, _y))
- return QRect( _x + m_render->inlineXPos(), _y + m_render->inlineYPos(),
+ return TQRect( _x + m_render->inlineXPos(), _y + m_render->inlineYPos(),
m_render->width(), m_render->height() + renderer()->borderTopExtra() + renderer()->borderBottomExtra() );
- return QRect();
+ return TQRect();
}
void NodeImpl::setChanged(bool b)
@@ -353,7 +353,7 @@ void NodeImpl::dispatchGenericEvent( EventImpl *evt, int &/*exceptioncode */)
// ### check that type specified
// work out what nodes to send event to
- QPtrList<NodeImpl> nodeChain;
+ TQPtrList<NodeImpl> nodeChain;
NodeImpl *n;
for (n = this; n; n = n->parentNode()) {
n->ref();
@@ -362,7 +362,7 @@ void NodeImpl::dispatchGenericEvent( EventImpl *evt, int &/*exceptioncode */)
// trigger any capturing event handlers on our way down
evt->setEventPhase(Event::CAPTURING_PHASE);
- QPtrListIterator<NodeImpl> it(nodeChain);
+ TQPtrListIterator<NodeImpl> it(nodeChain);
for (; it.current() && it.current() != this && !evt->propagationStopped(); ++it) {
evt->setCurrentTarget(it.current());
it.current()->handleLocalEvents(evt,true);
@@ -463,7 +463,7 @@ void NodeImpl::dispatchWindowEvent(int _id, bool canBubbleArg, bool cancelableAr
evt->deref();
}
-void NodeImpl::dispatchMouseEvent(QMouseEvent *_mouse, int overrideId, int overrideDetail)
+void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int overrideDetail)
{
bool cancelable = true;
int detail = overrideDetail; // defaults to 0
@@ -473,17 +473,17 @@ void NodeImpl::dispatchMouseEvent(QMouseEvent *_mouse, int overrideId, int overr
}
else {
switch (_mouse->type()) {
- case QEvent::MouseButtonPress:
+ case TQEvent::MouseButtonPress:
evtId = EventImpl::MOUSEDOWN_EVENT;
break;
- case QEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonRelease:
evtId = EventImpl::MOUSEUP_EVENT;
break;
- case QEvent::MouseButtonDblClick:
+ case TQEvent::MouseButtonDblClick:
evtId = EventImpl::CLICK_EVENT;
detail = 1; // ### support for multiple double clicks
break;
- case QEvent::MouseMove:
+ case TQEvent::MouseMove:
evtId = EventImpl::MOUSEMOVE_EVENT;
cancelable = false;
break;
@@ -565,7 +565,7 @@ void NodeImpl::dispatchSubtreeModifiedEvent()
evt->deref();
}
-bool NodeImpl::dispatchKeyEvent(QKeyEvent *key, bool keypress)
+bool NodeImpl::dispatchKeyEvent(TQKeyEvent *key, bool keypress)
{
int exceptioncode = 0;
//kdDebug(6010) << "DOM::NodeImpl: dispatching keyboard event" << endl;
@@ -590,8 +590,8 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
// removeEventListener (e.g. called from a JS event listener) might
// invalidate the item after the current iterator (which "it" is pointing to).
// So we make a copy of the list.
- QValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
+ TQValueList<RegisteredEventListener>::iterator it;
for (it = listeners.begin(); it != listeners.end(); ++it) {
//Check whether this got removed...KDE4: use Java-style iterators
if (!m_regdListeners.stillContainsListener(*it))
@@ -860,12 +860,12 @@ bool NodeImpl::maintainsState()
return false;
}
-QString NodeImpl::state()
+TQString NodeImpl::state()
{
- return QString::null;
+ return TQString::null;
}
-void NodeImpl::restoreState(const QString &/*state*/)
+void NodeImpl::restoreState(const TQString &/*state*/)
{
}
@@ -979,13 +979,13 @@ long NodeImpl::maxOffset() const
DOMStringImpl* NodeImpl::textContent() const
{
- QString out;
+ TQString out;
for (NodeImpl *child = firstChild(); child != 0; child = child->nextSibling()) {
short type = child->nodeType();
if (type != Node::COMMENT_NODE && type != Node::PROCESSING_INSTRUCTION_NODE) {
DOMStringImpl* kidText = child->textContent();
if (kidText)
- out += QConstString(kidText->s, kidText->l).string();
+ out += TQConstString(kidText->s, kidText->l).string();
delete kidText;
}
}
@@ -1883,7 +1883,7 @@ GenericRONamedNodeMapImpl::GenericRONamedNodeMapImpl(DocumentImpl* doc)
: NamedNodeMapImpl()
{
m_doc = doc;
- m_contents = new QPtrList<NodeImpl>;
+ m_contents = new TQPtrList<NodeImpl>;
}
GenericRONamedNodeMapImpl::~GenericRONamedNodeMapImpl()
@@ -1897,7 +1897,7 @@ GenericRONamedNodeMapImpl::~GenericRONamedNodeMapImpl()
NodeImpl *GenericRONamedNodeMapImpl::getNamedItem ( NodeImpl::Id id, bool /*nsAware*/, DOMStringImpl* /*qName*/ ) const
{
// ## do we need namespace support in this class?
- QPtrListIterator<NodeImpl> it(*m_contents);
+ TQPtrListIterator<NodeImpl> it(*m_contents);
for (; it.current(); ++it)
if (it.current()->id() == id)
return it.current();
@@ -1960,12 +1960,12 @@ void RegisteredListenerList::addEventListener(int id, EventListener *listener, c
{
RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
if (!listeners)
- listeners = new QValueList<RegisteredEventListener>;
+ listeners = new TQValueList<RegisteredEventListener>;
// if this id/listener/useCapture combination is already registered, do nothing.
// the DOM2 spec says that "duplicate instances are discarded", and this keeps
// the listener order intact.
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
for (it = listeners->begin(); it != listeners->end(); ++it)
if (*it == rl)
return;
@@ -1980,7 +1980,7 @@ void RegisteredListenerList::removeEventListener(int id, EventListener *listener
RegisteredEventListener rl(static_cast<EventImpl::EventId>(id),listener,useCapture);
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
for (it = listeners->begin(); it != listeners->end(); ++it)
if (*it == rl) {
listeners->remove(it);
@@ -1996,9 +1996,9 @@ bool RegisteredListenerList::isHTMLEventListener(EventListener* listener)
void RegisteredListenerList::setHTMLEventListener(int id, EventListener *listener)
{
if (!listeners)
- listeners = new QValueList<RegisteredEventListener>;
+ listeners = new TQValueList<RegisteredEventListener>;
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
if (!listener) {
for (it = listeners->begin(); it != listeners->end(); ++it) {
if ((*it).id == id && isHTMLEventListener((*it).listener)) {
@@ -2029,7 +2029,7 @@ EventListener *RegisteredListenerList::getHTMLEventListener(int id)
if (!listeners)
return 0;
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
for (it = listeners->begin(); it != listeners->end(); ++it)
if ((*it).id == id && isHTMLEventListener((*it).listener)) {
return (*it).listener;
@@ -2042,7 +2042,7 @@ bool RegisteredListenerList::hasEventListener(int id)
if (!listeners)
return false;
- QValueList<RegisteredEventListener>::iterator it;
+ TQValueList<RegisteredEventListener>::iterator it;
for (it = listeners->begin(); it != listeners->end(); ++it)
if ((*it).id == id)
return true;
diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h
index 1ff150f6a..31bbceda0 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/khtml/xml/dom_nodeimpl.h
@@ -76,7 +76,7 @@ struct RegisteredListenerList {
//### KDE4: should disappear
bool stillContainsListener(const RegisteredEventListener& listener);
- QValueList<RegisteredEventListener>* listeners;//The actual listener list - may be 0
+ TQValueList<RegisteredEventListener>* listeners;//The actual listener list - may be 0
private:
bool isHTMLEventListener(EventListener* listener);
};
@@ -257,7 +257,7 @@ public:
virtual bool isInline() const;
virtual void getCaret(int offset, bool override, int &_x, int &_y, int &width, int &height);
- virtual QRect getRect() const;
+ virtual TQRect getRect() const;
enum StyleChange { NoChange, NoInherit, Inherit, Detach, Force };
virtual void recalcStyle( StyleChange = NoChange ) {}
@@ -279,12 +279,12 @@ public:
// return true if event not prevented
bool dispatchHTMLEvent(int _id, bool canBubbleArg, bool cancelableArg);
void dispatchWindowEvent(int _id, bool canBubbleArg, bool cancelableArg);
- void dispatchMouseEvent(QMouseEvent *e, int overrideId = 0, int overrideDetail = 0);
+ void dispatchMouseEvent(TQMouseEvent *e, int overrideId = 0, int overrideDetail = 0);
void dispatchUIEvent(int _id, int detail = 0);
void dispatchSubtreeModifiedEvent();
// return true if defaultPrevented (i.e. event should be swallowed)
// this matches the logic in KHTMLView.
- bool dispatchKeyEvent(QKeyEvent *key, bool keypress);
+ bool dispatchKeyEvent(TQKeyEvent *key, bool keypress);
void handleLocalEvents(EventImpl *evt, bool useCapture);
@@ -392,7 +392,7 @@ public:
*
* @return State information about the node represented as a string
*/
- virtual QString state();
+ virtual TQString state();
/**
* Sets the state of the element based on a string previosuly returned by state(). This is used to initialize form
@@ -400,7 +400,7 @@ public:
*
* @param state A string representation of the node's previously-stored state
*/
- virtual void restoreState(const QString &state);
+ virtual void restoreState(const TQString &state);
// -----------------------------------------------------------------------------
// Notification of document stucture changes
@@ -584,7 +584,7 @@ public:
{
static Cache* make() { return new Cache; }
- CacheKey key;//### We must store this in here due to QCache in Qt3 sucking
+ CacheKey key;//### We must store this in here due to TQCache in Qt3 sucking
unsigned int version;
union
@@ -729,7 +729,7 @@ public:
protected:
DocumentImpl* m_doc;
- QPtrList<NodeImpl> *m_contents;
+ TQPtrList<NodeImpl> *m_contents;
};
} //namespace
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index cb32f5903..bb1a728e9 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <string.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
using namespace DOM;
using namespace khtml;
@@ -41,14 +41,14 @@ DOMStringImpl::DOMStringImpl(const char *str)
l = strlen(str);
s = QT_ALLOC_QCHAR_VEC( l );
int i = l;
- QChar* ptr = s;
+ TQChar* ptr = s;
while( i-- )
*ptr++ = *str++;
}
else
{
s = QT_ALLOC_QCHAR_VEC( 1 ); // crash protection
- s[0] = 0x0; // == QChar::null;
+ s[0] = 0x0; // == TQChar::null;
l = 0;
}
}
@@ -60,12 +60,12 @@ bool DOMStringImpl::containsOnlyWhitespace() const
return true;
for (uint i = 0; i < l; i++) {
- QChar c = s[i];
+ TQChar c = s[i];
if (c.unicode() <= 0x7F) {
if (c.unicode() > ' ')
return false;
} else {
- if (c.direction() != QChar::DirWS)
+ if (c.direction() != TQChar::DirWS)
return false;
}
}
@@ -78,9 +78,9 @@ void DOMStringImpl::append(DOMStringImpl *str)
if(str && str->l != 0)
{
int newlen = l+str->l;
- QChar *c = QT_ALLOC_QCHAR_VEC(newlen);
- memcpy(c, s, l*sizeof(QChar));
- memcpy(c+l, str->s, str->l*sizeof(QChar));
+ TQChar *c = QT_ALLOC_QCHAR_VEC(newlen);
+ memcpy(c, s, l*sizeof(TQChar));
+ memcpy(c+l, str->s, str->l*sizeof(TQChar));
if(s) QT_DELETE_QCHAR_VEC(s);
s = c;
l = newlen;
@@ -97,10 +97,10 @@ void DOMStringImpl::insert(DOMStringImpl *str, unsigned int pos)
if(str && str->l != 0)
{
int newlen = l+str->l;
- QChar *c = QT_ALLOC_QCHAR_VEC(newlen);
- memcpy(c, s, pos*sizeof(QChar));
- memcpy(c+pos, str->s, str->l*sizeof(QChar));
- memcpy(c+pos+str->l, s+pos, (l-pos)*sizeof(QChar));
+ TQChar *c = QT_ALLOC_QCHAR_VEC(newlen);
+ memcpy(c, s, pos*sizeof(TQChar));
+ memcpy(c+pos, str->s, str->l*sizeof(TQChar));
+ memcpy(c+pos+str->l, s+pos, (l-pos)*sizeof(TQChar));
if(s) QT_DELETE_QCHAR_VEC(s);
s = c;
l = newlen;
@@ -112,8 +112,8 @@ void DOMStringImpl::truncate(int len)
if(len > (int)l) return;
int nl = len < 1 ? 1 : len;
- QChar *c = QT_ALLOC_QCHAR_VEC(nl);
- memcpy(c, s, nl*sizeof(QChar));
+ TQChar *c = QT_ALLOC_QCHAR_VEC(nl);
+ memcpy(c, s, nl*sizeof(TQChar));
if(s) QT_DELETE_QCHAR_VEC(s);
s = c;
l = len;
@@ -126,9 +126,9 @@ void DOMStringImpl::remove(unsigned int pos, int len)
len = l - pos;
uint newLen = l-len;
- QChar *c = QT_ALLOC_QCHAR_VEC(newLen);
- memcpy(c, s, pos*sizeof(QChar));
- memcpy(c+pos, s+pos+len, (l-len-pos)*sizeof(QChar));
+ TQChar *c = QT_ALLOC_QCHAR_VEC(newLen);
+ memcpy(c, s, pos*sizeof(TQChar));
+ memcpy(c+pos, s+pos+len, (l-len-pos)*sizeof(TQChar));
if(s) QT_DELETE_QCHAR_VEC(s);
s = c;
l = newLen;
@@ -159,14 +159,14 @@ DOMStringImpl *DOMStringImpl::collapseWhiteSpace(bool preserveLF, bool preserveW
if (preserveLF && preserveWS) return this;
// Notice we are likely allocating more space than needed (worst case)
- QChar *n = QT_ALLOC_QCHAR_VEC(l);
+ TQChar *n = QT_ALLOC_QCHAR_VEC(l);
unsigned int pos = 0;
bool collapsing = false; // collapsing white-space
bool collapsingLF = false; // collapsing around linefeed
bool changedLF = false;
for(unsigned int i=0; i<l; i++) {
- QChar ch = s[i];
+ TQChar ch = s[i];
// We act on \r as we would on \n because CSS uses it to indicate new-line
if (ch == '\r') ch = '\n';
@@ -224,7 +224,7 @@ DOMStringImpl *DOMStringImpl::collapseWhiteSpace(bool preserveLF, bool preserveW
}
}
-static Length parseLength(const QChar *s, unsigned int l)
+static Length parseLength(const TQChar *s, unsigned int l)
{
if (l == 0) {
return Length(1, Relative);
@@ -239,7 +239,7 @@ static Length parseLength(const QChar *s, unsigned int l)
++i;
bool ok;
- int r = QConstString(s, i).string().toInt(&ok);
+ int r = TQConstString(s, i).string().toInt(&ok);
/* Skip over any remaining digits, we are not that accurate (5.5% => 5%) */
while (i < l && (s[i].isDigit() || s[i] == '.'))
@@ -253,7 +253,7 @@ static Length parseLength(const QChar *s, unsigned int l)
if (i == l) {
return Length(r, Fixed);
} else {
- const QChar* next = s+i;
+ const TQChar* next = s+i;
if (*next == '%')
return Length(r, Percent);
@@ -264,7 +264,7 @@ static Length parseLength(const QChar *s, unsigned int l)
return Length(r, Fixed);
} else {
if (i < l) {
- const QChar* next = s+i;
+ const TQChar* next = s+i;
if (*next == '*')
return Length(1, Relative);
@@ -278,9 +278,9 @@ static Length parseLength(const QChar *s, unsigned int l)
khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
{
- QString str(s, l);
+ TQString str(s, l);
for(unsigned int i=0; i < l; i++) {
- QChar cc = s[i];
+ TQChar cc = s[i];
if (cc > '9' || (cc < '0' && cc != '-' && cc != '*' && cc != '.'))
str[i] = ' ';
}
@@ -294,17 +294,17 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
int pos2;
while((pos2 = str.find(' ', pos)) != -1) {
- r[i++] = parseLength((QChar *) str.unicode()+pos, pos2-pos);
+ r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
pos = pos2+1;
}
- r[i] = parseLength((QChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
return r;
}
khtml::Length* DOMStringImpl::toLengthArray(int& len) const
{
- QString str(s, l);
+ TQString str(s, l);
str = str.simplifyWhiteSpace();
len = str.contains(',') + 1;
@@ -320,13 +320,13 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
int pos2;
while((pos2 = str.find(',', pos)) != -1) {
- r[i++] = parseLength((QChar *) str.unicode()+pos, pos2-pos);
+ r[i++] = parseLength((TQChar *) str.unicode()+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((QChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
else
len--;
@@ -397,9 +397,9 @@ DOMStringImpl *DOMStringImpl::capitalize(bool noFirstCap) const
return c;
}
-QString DOMStringImpl::string() const
+TQString DOMStringImpl::string() const
{
- return QString(s, l);
+ return TQString(s, l);
}
int DOMStringImpl::toInt(bool* ok) const
@@ -413,7 +413,7 @@ int DOMStringImpl::toInt(bool* ok) const
while (i < l && s[i].isDigit())
++i;
- return QConstString(s, i).string().toInt(ok);
+ return TQConstString(s, i).string().toInt(ok);
}
static const unsigned short amp[] = {'&', 'a', 'm', 'p', ';'};
diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h
index b1430bc89..cd7128967 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/khtml/xml/dom_stringimpl.h
@@ -23,13 +23,13 @@
#ifndef _DOM_DOMStringImpl_h_
#define _DOM_DOMStringImpl_h_
-#include <qstring.h>
+#include <tqstring.h>
#include "dom/dom_misc.h"
#include "misc/khtmllayout.h"
#include "misc/shared.h"
-#define QT_ALLOC_QCHAR_VEC( N ) (QChar*) new char[ sizeof(QChar)*( N ) ]
+#define QT_ALLOC_QCHAR_VEC( N ) (TQChar*) new char[ sizeof(TQChar)*( N ) ]
#define QT_DELETE_QCHAR_VEC( P ) delete[] ((char*)( P ))
namespace DOM {
@@ -42,11 +42,11 @@ private:
protected:
DOMStringImpl() { s = 0, l = 0; }
public:
- DOMStringImpl(const QChar *str, unsigned int len) {
+ DOMStringImpl(const TQChar *str, unsigned int len) {
bool havestr = str && len;
s = QT_ALLOC_QCHAR_VEC( havestr ? len : 1 );
if(str && len) {
- memcpy( s, str, len * sizeof(QChar) );
+ memcpy( s, str, len * sizeof(TQChar) );
l = len;
} else {
// crash protection
@@ -56,7 +56,7 @@ public:
}
explicit DOMStringImpl(const char *str);
- explicit DOMStringImpl(const QChar &ch) {
+ explicit DOMStringImpl(const TQChar &ch) {
s = QT_ALLOC_QCHAR_VEC( 1 );
s[0] = ch;
l = 1;
@@ -78,7 +78,7 @@ public:
DOMStringImpl *substring(unsigned int pos, unsigned int len);
DOMStringImpl *collapseWhiteSpace(bool preserveLF, bool preserveWS);
- const QChar &operator [] (int pos) { return s[pos]; }
+ const TQChar &operator [] (int pos) { return s[pos]; }
bool containsOnlyWhitespace() const;
// ignores trailing garbage, unlike QString
@@ -92,12 +92,12 @@ public:
DOMStringImpl *capitalize(bool noFirstCap=false) const;
DOMStringImpl *escapeHTML();
- QChar *unicode() const { return s; }
+ TQChar *unicode() const { return s; }
uint length() const { return l; }
- QString string() const;
+ TQString string() const;
unsigned int l;
- QChar *s;
+ TQChar *s;
};
}
diff --git a/khtml/xml/dom_xmlimpl.cpp b/khtml/xml/dom_xmlimpl.cpp
index 90ec2b352..121ad436a 100644
--- a/khtml/xml/dom_xmlimpl.cpp
+++ b/khtml/xml/dom_xmlimpl.cpp
@@ -391,7 +391,7 @@ void ProcessingInstructionImpl::checkStyleSheet()
// ### make sure this gets called when adding from javascript
XMLAttributeReader attrReader(DOMString(m_data).string());
bool attrsOk;
- QXmlAttributes attrs = attrReader.readAttrs(attrsOk);
+ TQXmlAttributes attrs = attrReader.readAttrs(attrsOk);
if (!attrsOk)
return;
if (attrs.value("type") != "text/css" && !attrs.value("type").isEmpty())
@@ -414,7 +414,7 @@ void ProcessingInstructionImpl::checkStyleSheet()
// ### some validation on the URL?
// ### FIXME charset
if (m_cachedSheet) m_cachedSheet->deref(this);
- m_cachedSheet = getDocument()->docLoader()->requestStyleSheet(getDocument()->completeURL(href.string()), QString::null);
+ m_cachedSheet = getDocument()->docLoader()->requestStyleSheet(getDocument()->completeURL(href.string()), TQString::null);
if (m_cachedSheet) {
getDocument()->addPendingSheet(); //before ref, because during the ref it might load!
m_cachedSheet->ref( this );
@@ -466,7 +466,7 @@ DOMString ProcessingInstructionImpl::toString() const
// -------------------------------------------------------------------------
-XMLAttributeReader::XMLAttributeReader(const QString& _attrString)
+XMLAttributeReader::XMLAttributeReader(const TQString& _attrString)
{
m_attrString = _attrString;
}
@@ -475,19 +475,19 @@ XMLAttributeReader::~XMLAttributeReader()
{
}
-QXmlAttributes XMLAttributeReader::readAttrs(bool &ok)
+TQXmlAttributes XMLAttributeReader::readAttrs(bool &ok)
{
// parse xml file
- QXmlInputSource source;
+ TQXmlInputSource source;
source.setData("<?xml version=\"1.0\"?><attrs "+m_attrString+" />");
- QXmlSimpleReader reader;
+ TQXmlSimpleReader reader;
reader.setContentHandler( this );
ok = reader.parse( source );
return attrs;
}
-bool XMLAttributeReader::startElement(const QString& /*namespaceURI*/, const QString& localName,
- const QString& /*qName*/, const QXmlAttributes& atts)
+bool XMLAttributeReader::startElement(const TQString& /*namespaceURI*/, const TQString& localName,
+ const TQString& /*qName*/, const TQXmlAttributes& atts)
{
if (localName == "attrs") {
attrs = atts;
diff --git a/khtml/xml/dom_xmlimpl.h b/khtml/xml/dom_xmlimpl.h
index 6fa125af7..a394579d2 100644
--- a/khtml/xml/dom_xmlimpl.h
+++ b/khtml/xml/dom_xmlimpl.h
@@ -26,7 +26,7 @@
#include "xml/dom_nodeimpl.h"
#include "misc/loader_client.h"
-#include <qxml.h>
+#include <tqxml.h>
namespace khtml {
class CachedCSSStyleSheet;
@@ -166,14 +166,14 @@ protected:
class XMLAttributeReader : public QXmlDefaultHandler
{
public:
- XMLAttributeReader(const QString& _attrString);
+ XMLAttributeReader(const TQString& _attrString);
virtual ~XMLAttributeReader();
- QXmlAttributes readAttrs(bool &ok);
- bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts);
+ TQXmlAttributes readAttrs(bool &ok);
+ bool startElement(const TQString& namespaceURI, const TQString& localName, const TQString& qName, const TQXmlAttributes& atts);
protected:
- QXmlAttributes attrs;
- QString m_attrString;
+ TQXmlAttributes attrs;
+ TQString m_attrString;
};
} //namespace
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 5489b8c21..7c043815a 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -34,7 +34,7 @@
#include "khtmlview.h"
#include "khtml_part.h"
-#include <qvariant.h>
+#include <tqvariant.h>
#include <kdebug.h>
#include <klocale.h>
@@ -42,7 +42,7 @@ using namespace DOM;
using namespace khtml;
XMLIncrementalSource::XMLIncrementalSource()
- : QXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
+ : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
m_finished( false )
{
}
@@ -52,17 +52,17 @@ void XMLIncrementalSource::fetchData()
//just a dummy to overwrite default behavior
}
-QChar XMLIncrementalSource::next()
+TQChar XMLIncrementalSource::next()
{
if ( m_finished )
- return QXmlInputSource::EndOfDocument;
+ return TQXmlInputSource::EndOfDocument;
else if ( m_data.length() <= m_pos )
- return QXmlInputSource::EndOfData;
+ return TQXmlInputSource::EndOfData;
else
return m_unicode[m_pos++];
}
-void XMLIncrementalSource::setData( const QString& str )
+void XMLIncrementalSource::setData( const TQString& str )
{
m_data = str;
m_unicode = m_data.unicode();
@@ -70,18 +70,18 @@ void XMLIncrementalSource::setData( const QString& str )
if ( !str.isEmpty() )
m_finished = false;
}
-void XMLIncrementalSource::setData( const QByteArray& data )
+void XMLIncrementalSource::setData( const TQByteArray& data )
{
setData( fromRawData( data, true ) );
}
-void XMLIncrementalSource::appendXML( const QString& str )
+void XMLIncrementalSource::appendXML( const TQString& str )
{
m_data += str;
m_unicode = m_data.unicode();
}
-QString XMLIncrementalSource::data()
+TQString XMLIncrementalSource::data()
{
return m_data;
}
@@ -118,7 +118,7 @@ NodeImpl *XMLHandler::currentNode() const
return m_nodes.current();
}
-QString XMLHandler::errorProtocol()
+TQString XMLHandler::errorProtocol()
{
return errorProt;
}
@@ -133,28 +133,28 @@ bool XMLHandler::startDocument()
return true;
}
-bool XMLHandler::startPrefixMapping(const QString& prefix, const QString& uri)
+bool XMLHandler::startPrefixMapping(const TQString& prefix, const TQString& uri)
{
namespaceInfo[prefix].push(uri);
return true;
}
-bool XMLHandler::endPrefixMapping(const QString& prefix)
+bool XMLHandler::endPrefixMapping(const TQString& prefix)
{
- QValueStack<QString>& stack = namespaceInfo[prefix];
+ TQValueStack<TQString>& stack = namespaceInfo[prefix];
stack.pop();
if (stack.isEmpty())
namespaceInfo.remove(prefix);
return true;
}
-void XMLHandler::fixUpNSURI(QString& uri, const QString& qname)
+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) {
- QXmlNamespaceSupport ns;
- QString localName, prefix;
+ TQXmlNamespaceSupport ns;
+ TQString localName, prefix;
ns.splitName(qname, prefix, localName);
if (namespaceInfo.contains(prefix)) {
uri = namespaceInfo[prefix].top();
@@ -162,8 +162,8 @@ void XMLHandler::fixUpNSURI(QString& uri, const QString& qname)
}
}
-bool XMLHandler::startElement( const QString& namespaceURI, const QString& /*localName*/,
- const QString& qName, const QXmlAttributes& atts )
+bool XMLHandler::startElement( const TQString& namespaceURI, const TQString& /*localName*/,
+ const TQString& qName, const TQXmlAttributes& atts )
{
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
@@ -180,8 +180,8 @@ bool XMLHandler::startElement( const QString& namespaceURI, const QString& /*loc
int i;
for (i = 0; i < atts.length(); i++) {
int exceptioncode = 0;
- QString uriString = atts.uri(i);
- QString qnString = atts.qName(i);
+ TQString uriString = atts.uri(i);
+ TQString qnString = atts.qName(i);
fixUpNSURI(uriString, qnString);
DOMString uri(uriString);
DOMString qn(qnString);
@@ -221,7 +221,7 @@ bool XMLHandler::startElement( const QString& namespaceURI, const QString& /*loc
}
-bool XMLHandler::endElement( const QString& /*namespaceURI*/, const QString& /*localName*/, const QString& /*qName*/ )
+bool XMLHandler::endElement( const TQString& /*namespaceURI*/, const TQString& /*localName*/, const TQString& /*qName*/ )
{
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
@@ -264,7 +264,7 @@ bool XMLHandler::endCDATA()
return currentNode();
}
-bool XMLHandler::characters( const QString& ch )
+bool XMLHandler::characters( const TQString& ch )
{
if (currentNode()->nodeType() == Node::TEXT_NODE ||
currentNode()->nodeType() == Node::CDATA_SECTION_NODE ||
@@ -284,7 +284,7 @@ bool XMLHandler::characters( const QString& ch )
}
-bool XMLHandler::comment(const QString & ch)
+bool XMLHandler::comment(const TQString & ch)
{
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
@@ -293,7 +293,7 @@ bool XMLHandler::comment(const QString & ch)
return true;
}
-bool XMLHandler::processingInstruction(const QString &target, const QString &data)
+bool XMLHandler::processingInstruction(const TQString &target, const TQString &data)
{
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
@@ -306,14 +306,14 @@ bool XMLHandler::processingInstruction(const QString &target, const QString &dat
}
-QString XMLHandler::errorString()
+TQString XMLHandler::errorString()
{
// ### Make better error-messages
return i18n("the document is not in the correct file format");
}
-bool XMLHandler::fatalError( const QXmlParseException& exception )
+bool XMLHandler::fatalError( const TQXmlParseException& exception )
{
errorProt += i18n( "fatal parsing error: %1 in line %2, column %3" )
.arg( exception.message() )
@@ -346,21 +346,21 @@ void XMLHandler::exitText()
popNode();
}
-bool XMLHandler::attributeDecl(const QString &/*eName*/, const QString &/*aName*/, const QString &/*type*/,
- const QString &/*valueDefault*/, const QString &/*value*/)
+bool XMLHandler::attributeDecl(const TQString &/*eName*/, const TQString &/*aName*/, const TQString &/*type*/,
+ const TQString &/*valueDefault*/, const TQString &/*value*/)
{
// qt's xml parser (as of 2.2.3) does not currently give us values for type, valueDefault and
// value. When it does, we can store these somewhere and have default attributes on elements
return true;
}
-bool XMLHandler::externalEntityDecl(const QString &/*name*/, const QString &/*publicId*/, const QString &/*systemId*/)
+bool XMLHandler::externalEntityDecl(const TQString &/*name*/, const TQString &/*publicId*/, const TQString &/*systemId*/)
{
// ### insert these too - is there anything special we have to do here?
return true;
}
-bool XMLHandler::internalEntityDecl(const QString &name, const QString &value)
+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)?
@@ -370,7 +370,7 @@ bool XMLHandler::internalEntityDecl(const QString &name, const QString &value)
return true;
}
-bool XMLHandler::notationDecl(const QString &/*name*/, const QString &/*publicId*/, const QString &/*systemId*/)
+bool XMLHandler::notationDecl(const TQString &/*name*/, const TQString &/*publicId*/, const TQString &/*systemId*/)
{
// ### FIXME
// if (m_doc->document()->doctype()) {
@@ -380,8 +380,8 @@ bool XMLHandler::notationDecl(const QString &/*name*/, const QString &/*publicId
return true;
}
-bool XMLHandler::unparsedEntityDecl(const QString &/*name*/, const QString &/*publicId*/,
- const QString &/*systemId*/, const QString &/*notationName*/)
+bool XMLHandler::unparsedEntityDecl(const TQString &/*name*/, const TQString &/*publicId*/,
+ const TQString &/*systemId*/, const TQString &/*notationName*/)
{
// ###
return true;
@@ -456,10 +456,10 @@ void XMLTokenizer::finish()
while (m_doc->hasChildNodes())
static_cast<NodeImpl*>(m_doc)->removeChild(m_doc->firstChild(),exceptioncode);
- QString line, errorLocPtr;
+ TQString line, errorLocPtr;
if ( m_handler.errorLine ) {
- QString xmlCode = m_source.data();
- QTextIStream stream(&xmlCode);
+ TQString xmlCode = m_source.data();
+ TQTextIStream stream(&xmlCode);
for (unsigned long lineno = 0; lineno < m_handler.errorLine-1; lineno++)
stream.readLine();
line = stream.readLine();
@@ -517,7 +517,7 @@ void XMLTokenizer::finish()
// Parsing was successful. Now locate all html <script> tags in the document and execute them
// one by one
addScripts(m_doc);
- m_scriptsIt = new QPtrListIterator<HTMLScriptElementImpl>(m_scripts);
+ m_scriptsIt = new TQPtrListIterator<HTMLScriptElementImpl>(m_scripts);
executeScripts();
}
@@ -545,7 +545,7 @@ void XMLTokenizer::executeScripts()
// inside the tag
while (m_scriptsIt->current()) {
DOMString scriptSrc = m_scriptsIt->current()->getAttribute(ATTR_SRC);
- QString charset = m_scriptsIt->current()->getAttribute(ATTR_CHARSET).string();
+ TQString charset = m_scriptsIt->current()->getAttribute(ATTR_CHARSET).string();
if (!scriptSrc.isEmpty()) {
// we have a src attribute
@@ -558,12 +558,12 @@ void XMLTokenizer::executeScripts()
}
else {
// no src attribute - execute from contents of tag
- QString scriptCode = "";
+ TQString scriptCode = "";
NodeImpl *child;
for (child = m_scriptsIt->current()->firstChild(); child; child = child->nextSibling()) {
if ( ( child->nodeType() == Node::TEXT_NODE || child->nodeType() == Node::CDATA_SECTION_NODE) &&
static_cast<TextImpl*>(child)->string() )
- scriptCode += QConstString(static_cast<TextImpl*>(child)->string()->s,
+ scriptCode += TQConstString(static_cast<TextImpl*>(child)->string()->s,
static_cast<TextImpl*>(child)->string()->l).string();
}
// the script cannot do document.write until we support incremental parsing
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index 4042b905f..cbf5cd5dd 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -23,11 +23,11 @@
#ifndef _XML_Tokenizer_h_
#define _XML_Tokenizer_h_
-#include <qxml.h>
-#include <qptrlist.h>
-#include <qptrstack.h>
-#include <qvaluestack.h>
-#include <qobject.h>
+#include <tqxml.h>
+#include <tqptrlist.h>
+#include <tqptrstack.h>
+#include <tqvaluestack.h>
+#include <tqobject.h>
#include "misc/loader_client.h"
#include "misc/stringit.h"
@@ -55,41 +55,41 @@ public:
virtual ~XMLHandler();
// return the error protocol if parsing failed
- QString errorProtocol();
+ TQString errorProtocol();
// overloaded handler functions
bool startDocument();
- bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts);
- bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName);
+ bool startElement(const TQString& namespaceURI, const TQString& localName, const TQString& qName, const TQXmlAttributes& atts);
+ bool endElement(const TQString& namespaceURI, const TQString& localName, const TQString& qName);
bool startCDATA();
bool endCDATA();
- bool characters(const QString& ch);
- bool comment(const QString & ch);
- bool processingInstruction(const QString &target, const QString &data);
+ bool characters(const TQString& ch);
+ bool comment(const TQString & ch);
+ bool processingInstruction(const TQString &target, const TQString &data);
// namespace handling, to workaround problem in QXML where some attributes
// do not get the namespace resolved properly
- bool startPrefixMapping(const QString& prefix, const QString& uri);
- bool endPrefixMapping(const QString& prefix);
- void fixUpNSURI(QString& uri, const QString& qname);
- QMap<QString, QValueStack<QString> > namespaceInfo;
+ bool startPrefixMapping(const TQString& prefix, const TQString& uri);
+ bool endPrefixMapping(const TQString& prefix);
+ void fixUpNSURI(TQString& uri, const TQString& qname);
+ TQMap<TQString, TQValueStack<TQString> > namespaceInfo;
// from QXmlDeclHandler
- bool attributeDecl(const QString &eName, const QString &aName, const QString &type, const QString &valueDefault, const QString &value);
- bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId);
- bool internalEntityDecl(const QString &name, const QString &value);
+ bool attributeDecl(const TQString &eName, const TQString &aName, const TQString &type, const TQString &valueDefault, const TQString &value);
+ bool externalEntityDecl(const TQString &name, const TQString &publicId, const TQString &systemId);
+ bool internalEntityDecl(const TQString &name, const TQString &value);
// from QXmlDTDHandler
- bool notationDecl(const QString &name, const QString &publicId, const QString &systemId);
- bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString &notationName);
+ bool notationDecl(const TQString &name, const TQString &publicId, const TQString &systemId);
+ bool unparsedEntityDecl(const TQString &name, const TQString &publicId, const TQString &systemId, const TQString &notationName);
bool enterText();
void exitText();
- QString errorString();
+ TQString errorString();
- bool fatalError( const QXmlParseException& exception );
+ bool fatalError( const TQXmlParseException& exception );
unsigned long errorLine;
unsigned long errorCol;
@@ -99,10 +99,10 @@ private:
DOM::NodeImpl *popNode();
DOM::NodeImpl *currentNode() const;
private:
- QString errorProt;
+ TQString errorProt;
DOM::DocumentImpl *m_doc;
KHTMLView *m_view;
- QPtrStack<DOM::NodeImpl> m_nodes;
+ TQPtrStack<DOM::NodeImpl> m_nodes;
DOM::NodeImpl *m_rootNode;
enum State {
@@ -144,18 +144,18 @@ class XMLIncrementalSource : public QXmlInputSource
public:
XMLIncrementalSource();
virtual void fetchData();
- virtual QChar next();
- virtual void setData( const QString& str );
- virtual void setData( const QByteArray& data );
- virtual QString data();
+ virtual TQChar next();
+ virtual void setData( const TQString& str );
+ virtual void setData( const TQByteArray& data );
+ virtual TQString data();
- void appendXML( const QString& str );
+ void appendXML( const TQString& str );
void setFinished( bool );
private:
- QString m_data;
+ TQString m_data;
uint m_pos;
- const QChar *m_unicode;
+ const TQChar *m_unicode;
bool m_finished;
};
@@ -183,12 +183,12 @@ protected:
void executeScripts();
void addScripts(DOM::NodeImpl *n);
- QPtrList<DOM::HTMLScriptElementImpl> m_scripts;
- QPtrListIterator<DOM::HTMLScriptElementImpl> *m_scriptsIt;
+ TQPtrList<DOM::HTMLScriptElementImpl> m_scripts;
+ TQPtrListIterator<DOM::HTMLScriptElementImpl> *m_scriptsIt;
khtml::CachedScript *m_cachedScript;
XMLHandler m_handler;
- QXmlSimpleReader m_reader;
+ TQXmlSimpleReader m_reader;
XMLIncrementalSource m_source;
bool m_noErrors;
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-08-19 16:35:31 +0000