diff options
Diffstat (limited to 'khtml/dom')
-rw-r--r-- | khtml/dom/css_value.cpp | 2 | ||||
-rw-r--r-- | khtml/dom/css_value.h | 4 | ||||
-rw-r--r-- | khtml/dom/dom2_events.cpp | 6 | ||||
-rw-r--r-- | khtml/dom/dom_doc.cpp | 4 | ||||
-rw-r--r-- | khtml/dom/dom_element.cpp | 4 | ||||
-rw-r--r-- | khtml/dom/dom_node.cpp | 8 | ||||
-rw-r--r-- | khtml/dom/dom_node.h | 6 | ||||
-rw-r--r-- | khtml/dom/dom_string.cpp | 34 | ||||
-rw-r--r-- | khtml/dom/dom_string.h | 20 | ||||
-rw-r--r-- | khtml/dom/html_block.cpp | 6 | ||||
-rw-r--r-- | khtml/dom/html_form.cpp | 10 | ||||
-rw-r--r-- | khtml/dom/html_image.cpp | 12 | ||||
-rw-r--r-- | khtml/dom/html_inline.cpp | 2 | ||||
-rw-r--r-- | khtml/dom/html_list.cpp | 4 | ||||
-rw-r--r-- | khtml/dom/html_misc.cpp | 2 | ||||
-rw-r--r-- | khtml/dom/html_object.cpp | 10 | ||||
-rw-r--r-- | khtml/dom/html_table.cpp | 6 |
17 files changed, 70 insertions, 70 deletions
diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp index 5a678768c..de450e861 100644 --- a/khtml/dom/css_value.cpp +++ b/khtml/dom/css_value.cpp @@ -125,7 +125,7 @@ void CSSStyleDeclaration::setProperty( const DOMString &propName, const DOMStrin int id = getPropertyID(propName.string().lower().ascii(), propName.length()); if (!id) return; bool important = false; - QString str = priority.string(); + TQString str = priority.string(); if (str.find("important", 0, false) != -1) important = true; diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index be8239d7e..5d4a043c7 100644 --- a/khtml/dom/css_value.h +++ b/khtml/dom/css_value.h @@ -29,7 +29,7 @@ #include <dom/dom_string.h> -#include <qcolor.h> +#include <tqcolor.h> #include <kdemacros.h> @@ -595,7 +595,7 @@ public: /** * @deprecated */ - RGBColor(const QColor& c) { m_color = c.rgb(); } + RGBColor(const TQColor& c) { m_color = c.rgb(); } RGBColor(QRgb color); RGBColor(const RGBColor &other); diff --git a/khtml/dom/dom2_events.cpp b/khtml/dom/dom2_events.cpp index 9da1d8a73..898a73bc3 100644 --- a/khtml/dom/dom2_events.cpp +++ b/khtml/dom/dom2_events.cpp @@ -542,9 +542,9 @@ void TextEvent::initTextEvent(const DOMString &typeArg, if (impl->isTextInputEvent()) { //Initialize based on the outputStringArg or virtKeyValArg. - QString text = outputStringArg.string(); + TQString text = outputStringArg.string(); if (outputStringArg.length() == 0 && virtKeyValArg) { - text += QChar((unsigned short)virtKeyValArg); + text += TQChar((unsigned short)virtKeyValArg); } TextEventImpl* tImpl = static_cast<TextEventImpl*>(impl); @@ -575,7 +575,7 @@ DOMString TextEvent::outputString() const return static_cast<TextEventImpl*>(ke)->data(); else { if (ke->keyVal()) - return QString(QChar((ushort)ke->keyVal())); + return TQString(TQChar((ushort)ke->keyVal())); else return DOMString(); } diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp index e5ff84e3d..0ff123444 100644 --- a/khtml/dom/dom_doc.cpp +++ b/khtml/dom/dom_doc.cpp @@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title ) r->open(); - r->write(QString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() + - QString::fromLatin1("</TITLE></HEAD>")); + r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() + + TQString::fromLatin1("</TITLE></HEAD>")); return r; } diff --git a/khtml/dom/dom_element.cpp b/khtml/dom/dom_element.cpp index 77a9b9e4b..54c322e25 100644 --- a/khtml/dom/dom_element.cpp +++ b/khtml/dom/dom_element.cpp @@ -369,7 +369,7 @@ bool Element::khtmlValidAttrName(const DOMString &name) // Check if name is valid // http://www.w3.org/TR/2000/REC-xml-20001006#NT-Name DOMStringImpl* _name = name.implementation(); - QChar ch = _name->s[0]; + TQChar ch = _name->s[0]; if ( !ch.isLetter() && ch != '_' && ch != ':' ) return false; // first char isn't valid for ( uint i = 0; i < _name->l; ++i ) @@ -377,7 +377,7 @@ bool Element::khtmlValidAttrName(const DOMString &name) ch = _name->s[i]; if ( !ch.isLetter() && !ch.isDigit() && ch != '.' && ch != '-' && ch != '_' && ch != ':' - && ch.category() != QChar::Mark_SpacingCombining + && ch.category() != TQChar::Mark_SpacingCombining /* no idea what "extender is" */ ) return false; } diff --git a/khtml/dom/dom_node.cpp b/khtml/dom/dom_node.cpp index 066a73adc..9971bdb00 100644 --- a/khtml/dom/dom_node.cpp +++ b/khtml/dom/dom_node.cpp @@ -27,7 +27,7 @@ #include "xml/dom_elementimpl.h" #include "xml/dom2_eventsimpl.h" -#include <qrect.h> +#include <tqrect.h> using namespace DOM; @@ -407,9 +407,9 @@ unsigned long Node::index() const return impl->nodeIndex(); } -QString Node::toHTML() +TQString Node::toHTML() { - if (!impl) return QString::null; + if (!impl) return TQString::null; return impl->toString().string(); } @@ -426,7 +426,7 @@ void Node::getCursor(int offset, int &_x, int &_y, int &height) impl->getCaret(offset, false, _x, _y, dummy, height); } -QRect Node::getRect() +TQRect Node::getRect() { if (!impl) throw DOMException(DOMException::NOT_FOUND_ERR); return impl->getRect(); diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h index 666d89d4a..abdcd8d4d 100644 --- a/khtml/dom/dom_node.h +++ b/khtml/dom/dom_node.h @@ -33,7 +33,7 @@ #ifndef _DOM_Node_h_ #define _DOM_Node_h_ -#include <qstring.h> +#include <tqstring.h> #include <kdelibs_export.h> class QRect; @@ -900,7 +900,7 @@ public: * @internal returns the index of a node */ unsigned long index() const; - QString toHTML() KDE_DEPRECATED; + TQString toHTML() KDE_DEPRECATED; void applyChanges(); /** * @deprecated without substitution since 3.2 @@ -910,7 +910,7 @@ public: * not part of the DOM. * @returns the exact coordinates and size of this element. */ - QRect getRect(); + TQRect getRect(); protected: NodeImpl *impl; diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp index 2319194e9..14bdc2613 100644 --- a/khtml/dom/dom_string.cpp +++ b/khtml/dom/dom_string.cpp @@ -26,13 +26,13 @@ using namespace DOM; -DOMString::DOMString(const QChar *str, uint len) +DOMString::DOMString(const TQChar *str, uint len) { impl = new DOMStringImpl( str, len ); impl->ref(); } -DOMString::DOMString(const QString &str) +DOMString::DOMString(const TQString &str) { if (str.isNull()) { impl = 0; @@ -127,16 +127,16 @@ void DOMString::insert(DOMString str, uint pos) } -const QChar &DOMString::operator [](unsigned int i) const +const TQChar &DOMString::operator [](unsigned int i) const { - static const QChar nullChar = 0; + static const TQChar nullChar = 0; if(!impl || i >= impl->l ) return nullChar; return *(impl->s+i); } -int DOMString::find(const QChar c, int start) const +int DOMString::find(const TQChar c, int start) const { unsigned int l = start; if(!impl || l >= impl->l ) return -1; @@ -186,22 +186,22 @@ bool DOMString::percentage(int &_percentage) const { if(!impl || !impl->l) return false; - if ( *(impl->s+impl->l-1) != QChar('%')) + if ( *(impl->s+impl->l-1) != TQChar('%')) return false; - _percentage = QConstString(impl->s, impl->l-1).string().toInt(); + _percentage = TQConstString(impl->s, impl->l-1).string().toInt(); return true; } -QChar *DOMString::unicode() const +TQChar *DOMString::unicode() const { if(!impl) return 0; return impl->unicode(); } -QString DOMString::string() const +TQString DOMString::string() const { - if(!impl) return QString::null; + if(!impl) return TQString::null; return impl->string(); } @@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) { if ( as.length() != bs.length() ) return true; - const QChar *a = as.unicode(); - const QChar *b = bs.unicode(); + const TQChar *a = as.unicode(); + const TQChar *b = bs.unicode(); if ( a == b ) return false; if ( !( a && b ) ) return true; int l = as.length(); @@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) bool DOM::strcasecmp( const DOMString &as, const char* bs ) { - const QChar *a = as.unicode(); + const TQChar *a = as.unicode(); int l = as.length(); if ( !bs ) return ( l != 0 ); while ( l-- ) { @@ -265,18 +265,18 @@ bool DOM::operator==( const DOMString &a, const DOMString &b ) if( l != b.length() ) return false; - if(!memcmp(a.unicode(), b.unicode(), l*sizeof(QChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } -bool DOM::operator==( const DOMString &a, const QString &b ) +bool DOM::operator==( const DOMString &a, const TQString &b ) { unsigned int l = a.length(); if( l != b.length() ) return false; - if(!memcmp(a.unicode(), b.unicode(), l*sizeof(QChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } @@ -288,7 +288,7 @@ bool DOM::operator==( const DOMString &a, const char *b ) if ( aimpl ) { int alen = aimpl->l; - const QChar *aptr = aimpl->s; + const TQChar *aptr = aimpl->s; while ( alen-- ) { unsigned char c = *b++; if ( !c || ( *aptr++ ).unicode() != c ) diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h index f14a2aea9..3fe725f68 100644 --- a/khtml/dom/dom_string.h +++ b/khtml/dom/dom_string.h @@ -23,7 +23,7 @@ #define _DOM_DOMString_h_ #include <kdebug.h> -#include <qstring.h> +#include <tqstring.h> #include <kdelibs_export.h> @@ -33,7 +33,7 @@ class DOMStringImpl; /** * This class implements the basic string we use in the DOM. We do not use - * QString for 2 reasons: Memory overhead, and the missing explicit sharing + * TQString for 2 reasons: Memory overhead, and the missing explicit sharing * of strings we need for the DOM. * * All DOMStrings are explicitly shared (they behave like pointers), meaning @@ -50,8 +50,8 @@ public: */ DOMString() : impl(0) {} - DOMString(const QChar *str, uint len); - DOMString(const QString &); + DOMString(const TQChar *str, uint len); + DOMString(const TQString &); DOMString(const char *str); DOMString(DOMStringImpl *i); @@ -76,9 +76,9 @@ public: * The character at position i of the DOMString. If i >= length(), the * character returned will be 0. */ - const QChar &operator [](unsigned int i) const; + const TQChar &operator [](unsigned int i) const; - int find(const QChar c, int start = 0) const; + int find(const TQChar c, int start = 0) const; uint length() const; void truncate( unsigned int len ); @@ -97,8 +97,8 @@ public: */ DOMString upper() const; - QChar *unicode() const; - QString string() const; + TQChar *unicode() const; + TQString string() const; int toInt() const; bool percentage(int &_percentage) const; @@ -129,10 +129,10 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) { #endif KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b ); -KHTML_EXPORT bool operator==( const DOMString &a, const QString &b ); +KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b ); KHTML_EXPORT bool operator==( const DOMString &a, const char *b ); inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==b); } -inline bool operator!=( const DOMString &a, const QString &b ) { return !(a==b); } +inline bool operator!=( const DOMString &a, const TQString &b ) { return !(a==b); } inline bool operator!=( const DOMString &a, const char *b ) { return !(a==b); } inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; } diff --git a/khtml/dom/html_block.cpp b/khtml/dom/html_block.cpp index 2dd9abe56..9e499adb0 100644 --- a/khtml/dom/html_block.cpp +++ b/khtml/dom/html_block.cpp @@ -342,7 +342,7 @@ void HTMLPreElement::setWidth( long _width ) { if(!impl) return; - QString aStr; + TQString aStr; aStr.sprintf("%ld", _width); DOMString value(aStr); ((ElementImpl *)impl)->setAttribute(ATTR_WIDTH, value); @@ -391,7 +391,7 @@ void HTMLLayerElement::setTop( long _top ) { if(!impl) return; - QString aStr; + TQString aStr; aStr.sprintf("%ld", _top); DOMString value(aStr); ((ElementImpl *)impl)->setAttribute(ATTR_TOP, value); @@ -408,7 +408,7 @@ void HTMLLayerElement::setLeft( long _left ) { if(!impl) return; - QString aStr; + TQString aStr; aStr.sprintf("%ld", _left); DOMString value(aStr); ((ElementImpl *)impl)->setAttribute(ATTR_LEFT, value); diff --git a/khtml/dom/html_form.cpp b/khtml/dom/html_form.cpp index e1c94e6bf..5d9aec633 100644 --- a/khtml/dom/html_form.cpp +++ b/khtml/dom/html_form.cpp @@ -447,7 +447,7 @@ long HTMLInputElement::maxLength() const void HTMLInputElement::setMaxLength( long _maxLength ) { if(impl) { - DOMString value(QString::number(_maxLength)); + DOMString value(TQString::number(_maxLength)); ((ElementImpl *)impl)->setAttribute(ATTR_MAXLENGTH,value); } } @@ -495,7 +495,7 @@ long HTMLInputElement::getSize() const void HTMLInputElement::setSize( long value ) { - if(impl) static_cast<ElementImpl*>(impl)->setAttribute(ATTR_SIZE, QString::number(value)); + if(impl) static_cast<ElementImpl*>(impl)->setAttribute(ATTR_SIZE, TQString::number(value)); } DOMString HTMLInputElement::src() const @@ -897,7 +897,7 @@ void HTMLSelectElement::setSize( long _size ) { if(impl) { - DOMString value(QString::number(_size)); + DOMString value(TQString::number(_size)); static_cast<ElementImpl*>(impl)->setAttribute(ATTR_SIZE,value); } } @@ -1009,7 +1009,7 @@ void HTMLTextAreaElement::setCols( long _cols ) { if(impl) { - DOMString value(QString::number(_cols)); + DOMString value(TQString::number(_cols)); static_cast<ElementImpl*>(impl)->setAttribute(ATTR_COLS,value); } } @@ -1057,7 +1057,7 @@ void HTMLTextAreaElement::setRows( long _rows ) { if(impl) { - DOMString value(QString::number(_rows)); + DOMString value(TQString::number(_rows)); static_cast<ElementImpl*>(impl)->setAttribute(ATTR_ROWS,value); } } diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp index 75077e54b..f7c9dac26 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -142,7 +142,7 @@ long HTMLAreaElement::tabIndex() const void HTMLAreaElement::setTabIndex( long _tabIndex ) { if(impl) { - DOMString value(QString::number(_tabIndex)); + DOMString value(TQString::number(_tabIndex)); ((ElementImpl *)impl)->setAttribute(ATTR_TABINDEX,value); } } @@ -230,7 +230,7 @@ long HTMLImageElement::border() const void HTMLImageElement::setBorder( long value ) { - if (impl) static_cast<HTMLImageElementImpl*>(impl)->setAttribute(ATTR_BORDER, QString::number(value)); + if (impl) static_cast<HTMLImageElementImpl*>(impl)->setAttribute(ATTR_BORDER, TQString::number(value)); } DOMString HTMLImageElement::getBorder() const @@ -253,7 +253,7 @@ long HTMLImageElement::height() const void HTMLImageElement::setHeight( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HEIGHT, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HEIGHT, TQString::number(value)); } long HTMLImageElement::hspace() const @@ -265,7 +265,7 @@ long HTMLImageElement::hspace() const void HTMLImageElement::setHspace( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, TQString::number(value)); } bool HTMLImageElement::isMap() const @@ -328,7 +328,7 @@ long HTMLImageElement::vspace() const void HTMLImageElement::setVspace( long value ) { - if(impl) static_cast<ElementImpl*>(impl)->setAttribute(ATTR_VSPACE, QString::number(value)); + if(impl) static_cast<ElementImpl*>(impl)->setAttribute(ATTR_VSPACE, TQString::number(value)); } long HTMLImageElement::width() const @@ -339,7 +339,7 @@ long HTMLImageElement::width() const void HTMLImageElement::setWidth( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_WIDTH, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_WIDTH, TQString::number(value)); } long HTMLImageElement::x() const diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 1f3d0b47e..568761685 100644 --- a/khtml/dom/html_inline.cpp +++ b/khtml/dom/html_inline.cpp @@ -168,7 +168,7 @@ long HTMLAnchorElement::tabIndex() const void HTMLAnchorElement::setTabIndex( long _tabIndex ) { if(impl) { - DOMString value(QString::number(_tabIndex)); + DOMString value(TQString::number(_tabIndex)); ((ElementImpl *)impl)->setAttribute(ATTR_TABINDEX,value); } } diff --git a/khtml/dom/html_list.cpp b/khtml/dom/html_list.cpp index 4b6be0962..8d66fe3fc 100644 --- a/khtml/dom/html_list.cpp +++ b/khtml/dom/html_list.cpp @@ -169,7 +169,7 @@ long HTMLLIElement::value() const void HTMLLIElement::setValue( long _value ) { if(impl) { - DOMString value(QString::number(_value)); + DOMString value(TQString::number(_value)); ((ElementImpl *)impl)->setAttribute(ATTR_VALUE,value); } } @@ -278,7 +278,7 @@ void HTMLOListElement::setStart( long _start ) { if(impl) { - DOMString value(QString::number(_start)); + DOMString value(TQString::number(_start)); ((ElementImpl *)impl)->setAttribute(ATTR_START,value); } } diff --git a/khtml/dom/html_misc.cpp b/khtml/dom/html_misc.cpp index ff3ad9aa9..fb975b7cf 100644 --- a/khtml/dom/html_misc.cpp +++ b/khtml/dom/html_misc.cpp @@ -98,7 +98,7 @@ void HTMLBaseFontElement::setSize( long _value ) { if ( impl ) { - DOMString value( QString::number( _value ) ); + DOMString value( TQString::number( _value ) ); ((ElementImpl *)impl)->setAttribute(ATTR_SIZE, value); } } diff --git a/khtml/dom/html_object.cpp b/khtml/dom/html_object.cpp index 0648f081c..65ec2f34e 100644 --- a/khtml/dom/html_object.cpp +++ b/khtml/dom/html_object.cpp @@ -140,7 +140,7 @@ long HTMLAppletElement::getHspace() const void HTMLAppletElement::setHspace( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, TQString::number(value)); } DOMString HTMLAppletElement::name() const @@ -184,7 +184,7 @@ long HTMLAppletElement::getVspace() const void HTMLAppletElement::setVspace( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, TQString::number(value)); } @@ -359,7 +359,7 @@ long HTMLObjectElement::getHspace() const void HTMLObjectElement::setHspace( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_HSPACE, TQString::number(value)); } DOMString HTMLObjectElement::name() const @@ -393,7 +393,7 @@ long HTMLObjectElement::tabIndex() const void HTMLObjectElement::setTabIndex( long _tabIndex ) { if(impl) { - DOMString value(QString::number(_tabIndex)); + DOMString value(TQString::number(_tabIndex)); ((ElementImpl *)impl)->setAttribute(ATTR_TABINDEX,value); } } @@ -439,7 +439,7 @@ long HTMLObjectElement::getVspace() const void HTMLObjectElement::setVspace( long value ) { - if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, QString::number(value)); + if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_VSPACE, TQString::number(value)); } DOMString HTMLObjectElement::width() const diff --git a/khtml/dom/html_table.cpp b/khtml/dom/html_table.cpp index f89c4a899..b42c4fcd1 100644 --- a/khtml/dom/html_table.cpp +++ b/khtml/dom/html_table.cpp @@ -193,7 +193,7 @@ long HTMLTableCellElement::colSpan() const void HTMLTableCellElement::setColSpan( long _colSpan ) { if(impl) { - DOMString value(QString::number(_colSpan)); + DOMString value(TQString::number(_colSpan)); ((ElementImpl *)impl)->setAttribute(ATTR_COLSPAN,value); } } @@ -241,7 +241,7 @@ long HTMLTableCellElement::rowSpan() const void HTMLTableCellElement::setRowSpan( long _rowSpan ) { if(impl) { - DOMString value(QString::number(_rowSpan)); + DOMString value(TQString::number(_rowSpan)); ((ElementImpl *)impl)->setAttribute(ATTR_ROWSPAN,value); } } @@ -358,7 +358,7 @@ long HTMLTableColElement::span() const void HTMLTableColElement::setSpan( long _span ) { if(impl) { - DOMString value(QString::number(_span)); + DOMString value(TQString::number(_span)); ((ElementImpl *)impl)->setAttribute(ATTR_SPAN,value); } } |