diff options
Diffstat (limited to 'khtml')
110 files changed, 674 insertions, 674 deletions
diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html index b6419c891..16484d4f1 100644 --- a/khtml/DESIGN.html +++ b/khtml/DESIGN.html @@ -291,7 +291,7 @@ that defines the DTD to use for HTML (used mainly in the parser). <dd>Java related stuff. <dt><a href="misc/">misc:</a> <dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the -decoder class that converts the incoming stream to tqunicode. +decoder class that converts the incoming stream to unicode. <dt><a href="rendering">rendering:</a> <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects. diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h index b38024bee..9a8774107 100644 --- a/khtml/css/css_base.h +++ b/khtml/css/css_base.h @@ -256,7 +256,7 @@ namespace DOM { virtual ~StyleListImpl(); unsigned long length() const { return m_lstChildren->count(); } - StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->tqat(num); } + StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); } void append(StyleBaseImpl *item) { m_lstChildren->append(item); } diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp index eef98f41e..daf607a9e 100644 --- a/khtml/css/css_renderstyledeclarationimpl.cpp +++ b/khtml/css/css_renderstyledeclarationimpl.cpp @@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) case CSS_PROP_TOP: return getPositionOffsetValue(renderer, CSS_PROP_TOP); case CSS_PROP_UNICODE_BIDI: - switch (style->tqunicodeBidi()) { + switch (style->unicodeBidi()) { case UBNormal: return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL); case Embed: diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h index d9928994d..2753fcf83 100644 --- a/khtml/css/css_ruleimpl.h +++ b/khtml/css/css_ruleimpl.h @@ -137,7 +137,7 @@ public: ~CSSRuleListImpl(); unsigned long length() const { return m_lstCSSRules.count(); } - CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.tqat( index ); } + CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); } /* not part of the DOM */ diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index 3fa38efe9..a6150c78b 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -281,7 +281,7 @@ void CSSStyleDeclarationImpl::removeCSSHints() return; for (int i = (int)m_lstValues->count()-1; i >= 0; i--) { - if (!m_lstValues->tqat(i)->nonCSSHint) + if (!m_lstValues->at(i)->nonCSSHint) m_lstValues->remove(i); } } @@ -358,8 +358,8 @@ unsigned long CSSStyleDeclarationImpl::length() const DOMString CSSStyleDeclarationImpl::item( unsigned long index ) const { - if(m_lstValues && index < m_lstValues->count() && m_lstValues->tqat(index)) - return getPropertyName(m_lstValues->tqat(index)->m_id); + if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index)) + return getPropertyName(m_lstValues->at(index)->m_id); return DOMString(); } diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h index 668c53d93..3566c00cb 100644 --- a/khtml/css/css_valueimpl.h +++ b/khtml/css/css_valueimpl.h @@ -136,7 +136,7 @@ public: virtual ~CSSValueListImpl(); unsigned long length() const { return m_values.count(); } - CSSValueImpl *item ( unsigned long index ) { return m_values.tqat(index); } + CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); } virtual bool isValueList() const { return true; } diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp index 96e184f2f..b388d2215 100644 --- a/khtml/css/csshelper.cpp +++ b/khtml/css/csshelper.cpp @@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url) int nl = 0; for(int k = o; k < o+l; k++) - if(i->s[k].tqunicode() > '\r') + if(i->s[k].unicode() > '\r') j->s[nl++] = i->s[k]; j->l = nl; diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index 474067cf0..6ca1a069b 100644 --- a/khtml/css/cssparser.cpp +++ b/khtml/css/cssparser.cpp @@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string ) int length = string.length() + 3; data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); - memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) ); #ifdef CSS_DEBUG kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl; @@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_rule); i++ ) data[i] = khtml_rule[i]; - memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) ); // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); data[length-4] = '}'; @@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id, data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_value); i++ ) data[i] = khtml_value[i]; - memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); @@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_decls); i++ ) data[i] = khtml_decls[i]; - memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; nonCSSHint = _nonCSSHint; @@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important ) valid_primitive = true; break; - case CSS_PROP_CLIP: // <tqshape> | auto | inherit + case CSS_PROP_CLIP: // <shape> | auto | inherit if ( id == CSS_VAL_AUTO ) valid_primitive = true; else if ( value->unit == Value::Function ) diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c index 894ab787f..c86f2d326 100644 --- a/khtml/css/cssproperties.c +++ b/khtml/css/cssproperties.c @@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len) #line 102 "cssproperties.gperf" {"text-align", CSS_PROP_TEXT_ALIGN}, #line 109 "cssproperties.gperf" - {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI}, + {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, #line 82 "cssproperties.gperf" {"outline-color", CSS_PROP_OUTLINE_COLOR}, #line 60 "cssproperties.gperf" @@ -632,7 +632,7 @@ static const char * const propertyList[] = { "text-shadow", "text-transform", "top", -"tqunicode-bidi", +"unicode-bidi", "vertical-align", "visibility", "white-space", diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 32391bb7f..35a5ff704 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::tqfromLatin1( file.data() ); + TQString style = TQString::fromLatin1( file.data() ); if(s) style += s->settingsToCSS(); DOMString str(style); @@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::tqfromLatin1( file.data() ); + TQString style = TQString::fromLatin1( file.data() ); DOMString str(style); s_quirksSheet = new DOM::CSSStyleSheetImpl(doc); @@ -742,7 +742,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e style->adjustBackgroundLayers(); // Only use slow repaints if we actually have a background image. - // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to + // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to // prevent the entire view from blitting on a scroll. if (style->hasFixedBackgroundImage() && view) view->useSlowRepaints(); @@ -786,7 +786,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, if (i == firstLen) values = addValues; - CSSProperty *prop = values->tqat(i >= firstLen ? i - firstLen : i); + CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i); Source source = Inline; if( prop->m_important ) source = InlineImportant; @@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded if( attr.isNull() ) { return PseudoNone; } - TQConstString cu(attr.tqunicode(), attr.length()); + TQConstString cu(attr.unicode(), attr.length()); TQString u = cu.string(); if ( !u.contains("://") ) { if ( u[0] == '/' ) @@ -1165,8 +1165,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm // else the value is longer and can be a list if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false; - TQChar* sel_uc = sel->value.tqunicode(); - TQChar* val_uc = value->tqunicode(); + TQChar* sel_uc = sel->value.unicode(); + TQChar* val_uc = value->unicode(); TQConstString sel_str(sel_uc, sel_len); TQConstString val_str(val_uc, val_len); @@ -1187,29 +1187,29 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm case CSSSelector::Contain: { //kdDebug( 6080 ) << "checking for contains match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); return val_str.string().contains(sel_str.string(), caseSensitive); } case CSSSelector::Begin: { //kdDebug( 6080 ) << "checking for beginswith match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); - return val_str.string().tqstartsWith(sel_str.string(), caseSensitive); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); + return val_str.string().startsWith(sel_str.string(), caseSensitive); } case CSSSelector::End: { //kdDebug( 6080 ) << "checking for endswith match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); - return val_str.string().tqendsWith(sel_str.string(), caseSensitive); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); + return val_str.string().endsWith(sel_str.string(), caseSensitive); } case CSSSelector::Hyphen: { //kdDebug( 6080 ) << "checking for hyphen match" << endl; - TQConstString val_str(value->tqunicode(), value->length()); - TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); + TQConstString val_str(value->unicode(), value->length()); + TQConstString sel_str(sel->value.unicode(), sel->value.length()); const TQString& str = val_str.string(); const TQString& selStr = sel_str.string(); if(str.length() < selStr.length()) return false; @@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, TQPtrList<CSSSelector> *s = r->selector(); for(int j = 0; j < (int)s->count(); j++) { - CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count()); + CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count()); TQPtrList<CSSOrderedRule>::append(rule); //kdDebug( 6080 ) << "appending StyleRule!" << endl; } @@ -1829,7 +1829,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, for( int j = 0; j < ( int ) s->count(); j++ ) { CSSOrderedRule *orderedRule = new CSSOrderedRule( - styleRule, s->tqat( j ), count() ); + styleRule, s->at( j ), count() ); TQPtrList<CSSOrderedRule>::append( orderedRule ); } } @@ -1891,7 +1891,7 @@ void CSSOrderedPropertyList::append(DOM::CSSStyleDeclarationImpl *decl, uint sel int len = values->count(); for(int i = 0; i < len; i++) { - CSSProperty *prop = values->tqat(i); + CSSProperty *prop = values->at(i); Source source = regular; if( prop->m_important ) source = important; @@ -2079,7 +2079,7 @@ static TQColor colorForCSSValue( int css_value ) KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support bckgrConfig.setGroup("Desktop0"); // Desktop background. - return bckgrConfig.readColorEntry("Color1", &tqApp->tqpalette().disabled().background()); + return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); } return TQColor(); } @@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } case CSS_PROP_UNICODE_BIDI: { - HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi) + HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi) if(!primitiveValue) break; switch (primitiveValue->getIdent()) { case CSS_VAL_NORMAL: diff --git a/khtml/css/html4.css b/khtml/css/html4.css index 575945464..c3fd1a347 100644 --- a/khtml/css/html4.css +++ b/khtml/css/html4.css @@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; } bdo[dir="ltr"] { direction: ltr; - tqunicode-bidi: bidi-override; + unicode-bidi: bidi-override; } bdo[dir="rtl"] { direction: rtl; - tqunicode-bidi: bidi-override; + unicode-bidi: bidi-override; } /* ### this selector seems to be still broken ... - *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed } - *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed } + *[dir="ltr"] { direction: ltr; unicode-bidi: embed } + *[dir="rtl"] { direction: rtl; unicode-bidi: embed } */ /* elements that are block-level in html4 */ -/* ### don't support tqunicode-bidi at the moment +/* ### don't support unicode-bidi at the moment address, blockquote, body, dd, div, dl, dt, fieldset, form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe, noscript, noframes, object, ol, p, ul, applet, center, dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot, col, colgroup, td, th, caption - { tqunicode-bidi: embed } + { unicode-bidi: embed } */ /* end bidi settings */ diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp index 01a47d5f1..23f7739dc 100644 --- a/khtml/dom/css_extensions.cpp +++ b/khtml/dom/css_extensions.cpp @@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute("top", value); } -DOMString CSS2Properties::tqunicodeBidi() const +DOMString CSS2Properties::unicodeBidi() const { if(!impl) return 0; - return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi"); + return ((ElementImpl *)impl)->getAttribute("unicodeBidi"); } void CSS2Properties::setUnicodeBidi( const DOMString &value ) { - if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value); + if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value); } DOMString CSS2Properties::verticalAlign() const diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h index bda2cfbbc..a6cdb2149 100644 --- a/khtml/dom/css_extensions.h +++ b/khtml/dom/css_extensions.h @@ -2515,14 +2515,14 @@ public: /** * See the <a - * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi"> - * tqunicode-bidi property definition </a> in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi"> + * unicode-bidi property definition </a> in CSS2. * */ - DOM::DOMString tqunicodeBidi() const; + DOM::DOMString unicodeBidi() const; /** - * see tqunicodeBidi + * see unicodeBidi */ void setUnicodeBidi( const DOM::DOMString & ); diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index 7523a2797..5d4a043c7 100644 --- a/khtml/dom/css_value.h +++ b/khtml/dom/css_value.h @@ -633,7 +633,7 @@ class RectImpl; /** * The \c Rect interface is used to represent any <a - * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape"> + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape"> * rect </a> value. This interface reflects the values in the * underlying style property. Hence, modifications made through this * interface modify the style property. diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp index 088a7a94a..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(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() + - TQString::tqfromLatin1("</TITLE></HEAD>")); + r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() + + TQString::fromLatin1("</TITLE></HEAD>")); return r; } diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp index f8487cf5a..14bdc2613 100644 --- a/khtml/dom/dom_string.cpp +++ b/khtml/dom/dom_string.cpp @@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str) return; } - impl = new DOMStringImpl( str.tqunicode(), str.length() ); + impl = new DOMStringImpl( str.unicode(), str.length() ); impl->ref(); } @@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const return true; } -TQChar *DOMString::tqunicode() const +TQChar *DOMString::unicode() const { if(!impl) return 0; - return impl->tqunicode(); + return impl->unicode(); } TQString DOMString::string() const @@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) { if ( as.length() != bs.length() ) return true; - const TQChar *a = as.tqunicode(); - const TQChar *b = bs.tqunicode(); + 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 TQChar *a = as.tqunicode(); + const TQChar *a = as.unicode(); int l = as.length(); if ( !bs ) return ( l != 0 ); while ( l-- ) { @@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b ) if( l != b.length() ) return false; - if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } @@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b ) if( l != b.length() ) return false; - if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) + if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) return true; return false; } @@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b ) const TQChar *aptr = aimpl->s; while ( alen-- ) { unsigned char c = *b++; - if ( !c || ( *aptr++ ).tqunicode() != c ) + if ( !c || ( *aptr++ ).unicode() != c ) return false; } } diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h index dec259882..3d4706b5a 100644 --- a/khtml/dom/dom_string.h +++ b/khtml/dom/dom_string.h @@ -97,7 +97,7 @@ public: */ DOMString upper() const; - TQChar *tqunicode() const; + TQChar *unicode() const; TQString string() const; int toInt() const; diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h index b318d8cb9..4283bafa2 100644 --- a/khtml/dom/html_block.h +++ b/khtml/dom/html_block.h @@ -105,7 +105,7 @@ public: ~HTMLDivElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text tqalignment. See the <a + * Horizontal text alignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h index ef318ba06..0623e421b 100644 --- a/khtml/dom/html_form.h +++ b/khtml/dom/html_form.h @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text tqalignment relative to \c FIELDSET . See the <a + * Text alignment relative to \c FIELDSET . See the <a * href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-align-LEGEND"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp index a5cdb3b71..f7c9dac26 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref ) } } -DOMString HTMLAreaElement::tqshape() const +DOMString HTMLAreaElement::shape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_image.h b/khtml/dom/html_image.h index 9b1334c83..9f30aaa14 100644 --- a/khtml/dom/html_image.h +++ b/khtml/dom/html_image.h @@ -90,7 +90,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * geometry. See also \c tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -131,16 +131,16 @@ public: void setNoHref( bool ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> - * tqshape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition </a> in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 9f40da2fb..568761685 100644 --- a/khtml/dom/html_inline.cpp +++ b/khtml/dom/html_inline.cpp @@ -148,7 +148,7 @@ void HTMLAnchorElement::setRev( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_REV, value); } -DOMString HTMLAnchorElement::tqshape() const +DOMString HTMLAnchorElement::shape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h index 041c43db0..f92ed6917 100644 --- a/khtml/dom/html_inline.h +++ b/khtml/dom/html_inline.h @@ -89,7 +89,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * geometry. See also \c tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -168,16 +168,16 @@ public: void setRev( const DOMString & ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> - * tqshape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition </a> in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h index 72e38d7fe..6b9a2d99d 100644 --- a/khtml/dom/html_table.h +++ b/khtml/dom/html_table.h @@ -63,7 +63,7 @@ public: ~HTMLTableCaptionElement(); /** - * Caption tqalignment with respect to the table. See the <a + * Caption alignment with respect to the table. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-CAPTION"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -134,7 +134,7 @@ public: void setAbbr( const DOMString & ); /** - * Horizontal tqalignment of data in cell. See the <a + * Horizontal alignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical tqalignment of data in cell. See the <a + * Vertical alignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal tqalignment of cell data in column. See the <a + * Horizontal alignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical tqalignment of cell data in column. See the <a + * Vertical alignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -790,7 +790,7 @@ public: void setCells( const HTMLCollection & ); /** - * Horizontal tqalignment of data within cells of this row. See the + * Horizontal alignment of data within cells of this row. See the * <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data within cells of this row. See the <a + * Vertical alignment of data within cells of this row. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -913,7 +913,7 @@ public: ~HTMLTableSectionElement(); /** - * Horizontal tqalignment of data in cells. See the \c align + * Horizontal alignment of data in cells. See the \c align * attribute for HTMLTheadElement for details. * */ @@ -938,7 +938,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the <a + * Offset of alignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -951,7 +951,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data in cells. See the \c valign + * Vertical alignment of data in cells. See the \c valign * attribute for HTMLTheadElement for details. * */ diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp index 4fa87e2ce..125401cae 100644 --- a/khtml/ecma/kjs_binding.cpp +++ b/khtml/ecma/kjs_binding.cpp @@ -261,7 +261,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } @@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.tqunicode(), len * sizeof(UChar)); + memcpy(dat, d.unicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index b3c2a41b1..c6fac2ab2 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -25,9 +25,9 @@ #include <assert.h> #include <stdlib.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlistbox.h> #include <tqmultilineedit.h> #include <tqapplication.h> @@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile) } TQString code = sourceFile->getCode(); - const TQChar *chars = code.tqunicode(); + const TQChar *chars = code.unicode(); uint len = code.length(); TQChar newLine('\n'); TQChar cr('\r'); @@ -182,7 +182,7 @@ void SourceDisplay::showEvent(TQShowEvent *) void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph) { if (!m_sourceFile) { - p->fillRect(clipx,clipy,clipw,cliph,tqpalette().active().base()); + p->fillRect(clipx,clipy,clipw,cliph,palette().active().base()); return; } @@ -207,26 +207,26 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, TQString linenoStr = TQString().sprintf("%d",lineno+1); - p->fillRect(0,height*lineno,linenoWidth,height,tqpalette().active().mid()); + p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid()); - p->setPen(tqpalette().active().text()); + p->setPen(palette().active().text()); p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr); TQColor bgColor; TQColor textColor; if (lineno == m_currentLine) { - bgColor = tqpalette().active().highlight(); - textColor = tqpalette().active().highlightedText(); + bgColor = palette().active().highlight(); + textColor = palette().active().highlightedText(); } else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) { - bgColor = tqpalette().active().text(); - textColor = tqpalette().active().base(); + bgColor = palette().active().text(); + textColor = palette().active().base(); p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon); } else { - bgColor = tqpalette().active().base(); - textColor = tqpalette().active().text(); + bgColor = palette().active().base(); + textColor = palette().active().text(); } p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor); @@ -236,10 +236,10 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, } int remainingTop = height*(lastLine+1); - p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,tqpalette().active().mid()); + p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid()); p->fillRect(linenoWidth,remainingTop, - right-linenoWidth,bottom-remainingTop,tqpalette().active().base()); + right-linenoWidth,bottom-remainingTop,palette().active().base()); } //------------------------------------------------------------------------- @@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno) if (m_sourceSel->currentItem() < 0) return; - SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem()); // Find the source fragment containing the selected line (if any) int sourceId = -1; @@ -592,14 +592,14 @@ void KJSDebugWin::slotSourceSelected(int sourceSelIndex) // A source file has been selected from the drop-down list - display the file if (sourceSelIndex < 0 || sourceSelIndex >= (int)m_sourceSel->count()) return; - SourceFile *sourceFile = m_sourceSelFiles.tqat(sourceSelIndex); + SourceFile *sourceFile = m_sourceSelFiles.at(sourceSelIndex); displaySourceFile(sourceFile,true); // If the currently selected context is in the current source file, then hilight // the line it's on. if (m_contextList->currentItem() >= 0) { Context ctx = m_execs[m_contextList->currentItem()]->context(); - if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.tqat(sourceSelIndex)) + if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(sourceSelIndex)) setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine()); } } @@ -614,7 +614,7 @@ void KJSDebugWin::slotEval() if (m_execStates.isEmpty()) { if (m_sourceSel->currentItem() < 0) return; - SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem()); if (!sourceFile->interpreter) return; exec = sourceFile->interpreter->globalExec(); @@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e) void KJSDebugWin::disableOtherWindows() { - TQWidgetList *widgets = TQApplication::tqallWidgets(); + TQWidgetList *widgets = TQApplication::allWidgets(); TQWidgetListIt it(*widgets); for (; it.current(); ++it) it.current()->installEventFilter(this); @@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows() void KJSDebugWin::enableOtherWindows() { - TQWidgetList *widgets = TQApplication::tqallWidgets(); + TQWidgetList *widgets = TQApplication::allWidgets(); TQWidgetListIt it(*widgets); for (; it.current(); ++it) it.current()->removeEventFilter(this); @@ -744,7 +744,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId, if (!sourceFile->interpreter) sourceFile->interpreter = exec->interpreter(); for (index = 0; index < m_sourceSel->count(); index++) { - if (m_sourceSelFiles.tqat(index) == sourceFile) + if (m_sourceSelFiles.at(index) == sourceFile) break; } assert(index < m_sourceSel->count()); @@ -782,7 +782,7 @@ bool KJSDebugWin::sourceUnused(KJS::ExecState *exec, int sourceId) SourceFile *sourceFile = fragment->sourceFile; if (sourceFile->hasOneRef()) { for (int i = 0; i < m_sourceSel->count(); i++) { - if (m_sourceSelFiles.tqat(i) == sourceFile) { + if (m_sourceSelFiles.at(i) == sourceFile) { m_sourceSel->removeItem(i); m_sourceSelFiles.remove(i); break; @@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch if (dontShowAgain) { KConfig *config = kapp->config(); - KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings")); + KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0)); config->sync(); TQByteArray data; @@ -930,7 +930,7 @@ void KJSDebugWin::setSourceLine(int sourceId, int lineno) SourceFile *sourceFile = source->sourceFile; if (m_curSourceFile != source->sourceFile) { for (int i = 0; i < m_sourceSel->count(); i++) - if (m_sourceSelFiles.tqat(i) == sourceFile) + if (m_sourceSelFiles.at(i) == sourceFile) m_sourceSel->setCurrentItem(i); displaySourceFile(sourceFile,false); } diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp index 3fdc35bb2..57762ffd3 100644 --- a/khtml/ecma/kjs_html.cpp +++ b/khtml/ecma/kjs_html.cpp @@ -896,7 +896,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const rel KJS::HTMLElement::AnchorRel DontDelete rev KJS::HTMLElement::AnchorRev DontDelete search KJS::HTMLElement::AnchorSearch DontDelete - tqshape KJS::HTMLElement::AnchorShape DontDelete + shape KJS::HTMLElement::AnchorShape DontDelete tabIndex KJS::HTMLElement::AnchorTabIndex DontDelete target KJS::HTMLElement::AnchorTarget DontDelete text KJS::HTMLElement::AnchorText DontDelete|ReadOnly @@ -981,7 +981,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const protocol KJS::HTMLElement::AreaProtocol DontDelete|ReadOnly search KJS::HTMLElement::AreaSearch DontDelete|ReadOnly noHref KJS::HTMLElement::AreaNoHref DontDelete - tqshape KJS::HTMLElement::AreaShape DontDelete + shape KJS::HTMLElement::AreaShape DontDelete tabIndex KJS::HTMLElement::AreaTabIndex DontDelete target KJS::HTMLElement::AreaTarget DontDelete @end @@ -1599,7 +1599,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const case AnchorName: return String(anchor.name()); case AnchorRel: return String(anchor.rel()); case AnchorRev: return String(anchor.rev()); - case AnchorShape: return String(anchor.tqshape()); + case AnchorShape: return String(anchor.shape()); case AnchorTabIndex: return Number(anchor.tabIndex()); case AnchorTarget: return String(anchor.target()); // Not specified in http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/a.asp @@ -1735,7 +1735,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const } } case AreaNoHref: return Boolean(area.noHref()); - case AreaShape: return String(area.tqshape()); + case AreaShape: return String(area.shape()); case AreaTabIndex: return Number(area.tabIndex()); case AreaTarget: return String(area.target()); } diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index 637b6a8e1..32f836ba7 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -188,14 +188,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Mozilla"); case AppName: // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::tqfromLatin1("compatible")) == -1) + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1) { //kdDebug() << "appName -> Mozilla" << endl; return String("Netscape"); } - if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { //kdDebug() << "appName -> IE" << endl; return String("Microsoft Internet Explorer"); @@ -207,14 +207,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String(userAgent.mid(userAgent.find('/') + 1)); case Product: // We are pretending to be Mozilla or Safari - if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::tqfromLatin1("compatible")) == -1) + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1) { return String("Gecko"); } // When spoofing as IE, we use Undefined(). - if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { return Undefined(); } @@ -223,7 +223,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const case ProductSub: { int ix = userAgent.find("Gecko"); - if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') && + if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') && userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6) { // We have Gecko/<productSub> in the UA string @@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String(userAgent); case Platform: // yet another evil hack, but necessary to spoof some sites... - if ( (userAgent.find(TQString::tqfromLatin1("Win"),0,false)>=0) ) - return String(TQString::tqfromLatin1("Win32")); - else if ( (userAgent.find(TQString::tqfromLatin1("Macintosh"),0,false)>=0) || - (userAgent.find(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) ) - return String(TQString::tqfromLatin1("MacPPC")); + if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) ) + return String(TQString::fromLatin1("Win32")); + else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) || + (userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) ) + return String(TQString::fromLatin1("MacPPC")); else { struct utsname name; int ret = uname(&name); if ( ret >= 0 ) - return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine))); + return String(TQString(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine))); else // can't happen - return String(TQString(TQString::tqfromLatin1("Unix X11"))); + return String(TQString(TQString::fromLatin1("Unix X11"))); } case CpuClass: { @@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const bool ok; unsigned int i = propertyName.toULong(&ok); if( ok && i<plugins->count() ) - return Value( new Plugin( exec, plugins->tqat(i) ) ); + return Value( new Plugin( exec, plugins->at(i) ) ); // plugin[name] Value val = pluginByName( exec, propertyName.qstring() ); @@ -439,7 +439,7 @@ Value PluginsFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i<base->plugins->count() ) - return Value( new Plugin( exec, base->plugins->tqat(i) ) ); + return Value( new Plugin( exec, base->plugins->at(i) ) ); return Undefined(); } case Plugins_NamedItem: @@ -479,7 +479,7 @@ Value MimeTypes::get(ExecState *exec, const Identifier &propertyName) const bool ok; unsigned int i = propertyName.toULong(&ok); if( ok && i<mimes->count() ) - return Value( new MimeType( exec, mimes->tqat(i) ) ); + return Value( new MimeType( exec, mimes->at(i) ) ); // mimeTypes[name] Value val = mimeTypeByName( exec, propertyName.qstring() ); @@ -522,7 +522,7 @@ Value MimeTypesFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i<base->mimes->count() ) - return Value( new MimeType( exec, base->mimes->tqat(i) ) ); + return Value( new MimeType( exec, base->mimes->at(i) ) ); return Undefined(); } case MimeTypes_NamedItem: @@ -562,8 +562,8 @@ Value Plugin::get(ExecState *exec, const Identifier &propertyName) const //kdDebug(6070) << "Plugin::get plugin[" << i << "]" << endl; if( ok && i<m_info->mimes.count() ) { - //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl; - return Value(new MimeType(exec, m_info->mimes.tqat(i))); + //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl; + return Value(new MimeType(exec, m_info->mimes.at(i))); } // plugin["name"] @@ -609,7 +609,7 @@ Value PluginFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) bool ok; unsigned int i = args[0].toString(exec).toArrayIndex(&ok); if( ok && i< plugin->pluginInfo()->mimes.count() ) - return Value( new MimeType( exec, plugin->pluginInfo()->mimes.tqat(i) ) ); + return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) ); return Undefined(); } case Plugin_NamedItem: diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp index 2469ac681..ca26c5a0b 100644 --- a/khtml/ecma/kjs_proxy.cpp +++ b/khtml/ecma/kjs_proxy.cpp @@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent() assert( m_script ); TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host(); TQString userAgent = KProtocolManager::userAgentForHost(host); - if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || + userAgent.find(TQString::fromLatin1("MSIE")) >= 0) { m_script->setCompatMode(Interpreter::IECompat); #ifdef KJS_VERBOSE @@ -353,9 +353,9 @@ void KJSProxyImpl::applyUserAgent() } else // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::tqfromLatin1("compatible")) == -1 && - userAgent.find(TQString::tqfromLatin1("KHTML")) == -1) + if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::fromLatin1("compatible")) == -1 && + userAgent.find(TQString::fromLatin1("KHTML")) == -1) { m_script->setCompatMode(Interpreter::NetscapeCompat); #ifdef KJS_VERBOSE diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index bed6b83c6..47d5ac810 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -31,7 +31,7 @@ #include "html/html_documentimpl.h" #include "rendering/render_frames.h" -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtimer.h> #include <tqpaintdevicemetrics.h> #include <tqapplication.h> @@ -864,7 +864,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const #if defined Q_WS_X11 && ! defined K_WS_QTONLY if (!part->widget()) return Number(0); - KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId()); + KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId()); return Number(entry->value == OuterHeight ? inf.geometry().height() : inf.geometry().width()); #else @@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const TQPtrList<KParts::ReadOnlyPart> frames = part->frames(); unsigned int len = frames.count(); if (i < len) { - KParts::ReadOnlyPart* frame = frames.tqat(i); + KParts::ReadOnlyPart* frame = frames.at(i); if (frame) return Window::retrieve(frame); } @@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) // check if we're allowed to inject javascript // SYNC check with khtml_part.cpp::slotRedirect! if ( isSafeScript(exec) || - dstUrl.find(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) + dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 ) part->scheduleRedirection(-1, dstUrl, lockHistory); @@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget()); + TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); if (key == "left" || key == "screenx") { winargs.x = (int)val.toFloat() + screen.x(); @@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (winargs.y < screen.y() || winargs.y > screen.bottom()) winargs.y = screen.y(); // only safe choice until size is determined } else if (key == "height") { - winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.height > screen.height()) // should actually check workspace winargs.height = screen.height(); if (winargs.height < 100) winargs.height = 100; } else if (key == "width") { - winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.width > screen.width()) // should actually check workspace winargs.width = screen.width(); if (winargs.width < 100) @@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KHTMLSettings::KJSWindowFocusPolicy policy = part->settings()->windowFocusPolicy(part->url().host()); if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) { - widget->tqtopLevelWidget()->raise(); - KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() ); + widget->topLevelWidget()->raise(); + KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); widget->setActiveWindow(); emit part->browserExtension()->requestFocus(part); } @@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) ); @@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() ); @@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); TQRect geom = tl->frameGeometry(); window->resizeTo( tl, geom.width() + args[0].toInt32(exec), @@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->tqtopLevelWidget(); + TQWidget * tl = widget->topLevelWidget(); window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) ); } return Undefined(); @@ -2412,7 +2412,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const bool ok; unsigned int i = p.toArrayIndex(&ok); if (ok && i < len) - frame = frames.tqat(i); + frame = frames.at(i); } // we are potentially fetching a reference to a another Window object here. @@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const return String(""); return String( url.path().isEmpty() ? TQString("/") : url.path() ); case Port: - return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") ); + return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") ); case Protocol: return String( url.protocol()+":" ); case Search: diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index 7b88477f0..08ba07519 100644 --- a/khtml/ecma/xmlhttprequest.cpp +++ b/khtml/ecma/xmlhttprequest.cpp @@ -487,7 +487,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val // Reject all banned headers. See BANNED_HTTP_HEADERS above. // kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl; TQStringList bannedHeaders = TQStringList::split(',', - TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); + TQString::fromLatin1(BANNED_HTTP_HEADERS)); if (bannedHeaders.contains(name)) return; // Denied diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index a5c78657c..e2ee3ba57 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -110,8 +110,8 @@ DOMString HTMLDocumentImpl::cookie() const long windowId = 0; KHTMLView *v = view (); - if ( v && v->tqtopLevelWidget() ) - windowId = v->tqtopLevelWidget()->winId(); + if ( v && v->topLevelWidget() ) + windowId = v->topLevelWidget()->winId(); TQCString replyType; TQByteArray params, reply; @@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value ) long windowId = 0; KHTMLView *v = view (); - if ( v && v->tqtopLevelWidget() ) - windowId = v->tqtopLevelWidget()->winId(); + if ( v && v->topLevelWidget() ) + windowId = v->topLevelWidget()->winId(); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -226,7 +226,7 @@ void HTMLDocumentImpl::slotHistoryChanged() return; recalcStyle( Force ); - m_render->tqrepaint(); + m_render->repaint(); } HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) @@ -235,7 +235,7 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) TQString s; int pos = url.find('#'); //kdDebug(0) << "map pos of #:" << pos << endl; - s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); + s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1); TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s); diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index 736b5a3b9..f635fcc3d 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_CLASS: if (attr->val()) { DOMString v = attr->value(); - const TQChar* s = v.tqunicode(); + const TQChar* s = v.unicode(); int l = v.length(); while( l && !s->isSpace() ) l--,s++; @@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) { static inline int toHex( const TQChar &c ) { return ( (c >= TQChar('0') && c <= TQChar('9')) - ? (c.tqunicode() - '0') + ? (c.unicode() - '0') : ( ( c >= TQChar('a') && c <= TQChar('f') ) - ? (c.tqunicode() - 'a' + 10) + ? (c.unicode() - 'a' + 10) : ( ( c >= TQChar('A') && c <= TQChar('F') ) - ? (c.tqunicode() - 'A' + 10) + ? (c.unicode() - 'A' + 10) : -1 ) ) ); } @@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const TQString result; //Use TQString to accumulate since DOMString is poor for appends for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.tqunicode(), kid.length()).string(); + result += TQConstString(kid.unicode(), kid.length()).string(); } return result; } @@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode ) appendChild( t, exceptioncode ); } -void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment ) +void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) { - //qDebug("tqalignment is %s", tqalignment.string().latin1() ); - // vertical tqalignment with respect to the current baseline of the text + //qDebug("alignment is %s", alignment.string().latin1() ); + // vertical alignment with respect to the current baseline of the text // right or left means floating images int propfloat = -1; int propvalign = -1; - if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) { + if ( strcasecmp( alignment, "absmiddle" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) { propvalign = CSS_VAL_BOTTOM; - } else if ( strcasecmp( tqalignment, "left" ) == 0 ) { + } else if ( strcasecmp( alignment, "left" ) == 0 ) { propfloat = CSS_VAL_LEFT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "right" ) == 0 ) { + } else if ( strcasecmp( alignment, "right" ) == 0 ) { propfloat = CSS_VAL_RIGHT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "top" ) == 0 ) { + } else if ( strcasecmp( alignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) { + } else if ( strcasecmp( alignment, "middle" ) == 0 ) { propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; - } else if ( strcasecmp( tqalignment, "center" ) == 0 ) { + } else if ( strcasecmp( alignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { propvalign = CSS_VAL_BASELINE; - } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) { + } else if ( strcasecmp ( alignment, "texttop") == 0 ) { propvalign = CSS_VAL_TEXT_TOP; } diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h index 83836f15d..f71ae9b23 100644 --- a/khtml/html/html_elementimpl.h +++ b/khtml/html/html_elementimpl.h @@ -68,7 +68,7 @@ public: protected: // for IMG, OBJECT and APPLET - void addHTMLAlignment( DOMString tqalignment ); + void addHTMLAlignment( DOMString alignment ); }; class HTMLGenericElementImpl : public HTMLElementImpl diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index 1512395e2..b456d5202 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -60,7 +60,7 @@ #include <kfileitem.h> #include <tqfile.h> #include <tqdir.h> -#include <tqtextcodec.h> +#include <textcodec.h> // for keygen #include <tqstring.h> @@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri enc_string.append(c); else { TQString ampersandEscape; - ampersandEscape.sprintf("&#%u;", c.tqunicode()); + ampersandEscape.sprintf("&#%u;", c.unicode()); enc_string.append(ampersandEscape); } } @@ -1322,10 +1322,10 @@ TQString HTMLInputElementImpl::state( ) { switch (m_type) { case PASSWORD: - return TQString::tqfromLatin1("."); // empty string, avoid restoring + return TQString::fromLatin1("."); // empty string, avoid restoring case CHECKBOX: case RADIO: - return TQString::tqfromLatin1(checked() ? "on" : "off"); + return TQString::fromLatin1(checked() ? "on" : "off"); case TEXT: if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view()) getDocument()->view()->addFormCompletionItem(name().string(), value().string()); @@ -1340,7 +1340,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state) switch (m_type) { case CHECKBOX: case RADIO: - setChecked((state == TQString::tqfromLatin1("on"))); + setChecked((state == TQString::fromLatin1("on"))); break; case FILE: m_value = DOMString(state.left(state.length()-1)); @@ -1566,12 +1566,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis if(m_clicked) { m_clicked = false; - TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x"); + TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x"); encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickX(), 0 )); encoding += fixUpfromUnicode(codec, astr); - astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y"; + astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y"; encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickY(), 0 ) ); encoding += fixUpfromUnicode(codec, astr); @@ -1618,7 +1618,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis KIO::UDSEntry filestat; // can't submit file in www-url-form encoded - TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget(); + TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget(); if (multipart) { TQCString filearray( "" ); if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) { @@ -2761,8 +2761,8 @@ static TQString expandLF(const TQString& s) unsigned pos2 = 0; for(unsigned pos = 0; pos < len; pos++) { - TQChar c = s.tqat(pos); - switch(c.tqunicode()) + TQChar c = s.at(pos); + switch(c.unicode()) { case '\n': r[pos2++] = '\r'; diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index 9ced3bf1b..be13e93c2 100644 --- a/khtml/html/html_imageimpl.cpp +++ b/khtml/html/html_imageimpl.cpp @@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_NAME: { DOMString s = attr->value(); - if(*s.tqunicode() == '#') - name = TQString(s.tqunicode()+1, s.length()-1).lower(); + if(*s.unicode() == '#') + name = TQString(s.unicode()+1, s.length()-1).lower(); else name = s.string().lower(); // ### make this work for XML documents, e.g. in case of <html:map...> @@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc) m_coords=0; m_coordsLen = 0; nohref = false; - tqshape = Unknown; + shape = Unknown; lasth = lastw = -1; } @@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr) { case ATTR_SHAPE: if ( strcasecmp( attr->value(), "default" ) == 0 ) - tqshape = Default; + shape = Default; else if ( strcasecmp( attr->value(), "circle" ) == 0 ) - tqshape = Circle; + shape = Circle; else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 ) - tqshape = Poly; + shape = Poly; else if ( strcasecmp( attr->value(), "rect" ) == 0 ) - tqshape = Rect; + shape = Rect; break; case ATTR_COORDS: delete [] m_coords; @@ -530,7 +530,7 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const // what the HTML author tried to tell us. // a Poly needs at least 3 points (6 coords), so this is correct - if ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) { + if ((shape==Poly || shape==Unknown) && m_coordsLen > 5) { // make sure its even int len = m_coordsLen >> 1; TQPointArray points(len); @@ -539,19 +539,19 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const m_coords[(i<<1)+1].minWidth(height_)); region = TQRegion(points); } - else if (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) { + else if (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) { int r = kMin(m_coords[2].minWidth(width_), m_coords[2].minWidth(height_)); region = TQRegion(m_coords[0].minWidth(width_)-r, m_coords[1].minWidth(height_)-r, 2*r, 2*r,TQRegion::Ellipse); } - else if (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) { + else if (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) { int x0 = m_coords[0].minWidth(width_); int y0 = m_coords[1].minWidth(height_); int x1 = m_coords[2].minWidth(width_); int y1 = m_coords[3].minWidth(height_); region = TQRegion(x0,y0,x1-x0,y1-y0); } - else if (tqshape==Default) + else if (shape==Default) region = TQRegion(0,0,width_,height_); // else // return null region diff --git a/khtml/html/html_imageimpl.h b/khtml/html/html_imageimpl.h index 1a389e895..6f26cd2df 100644 --- a/khtml/html/html_imageimpl.h +++ b/khtml/html/html_imageimpl.h @@ -102,7 +102,7 @@ public: virtual void parseAttribute(AttributeImpl *attr); - bool isDefault() const { return tqshape==Default; } + bool isDefault() const { return shape==Default; } bool mapMouseEvent(int x_, int y_, int width_, int height_, khtml::RenderObject::NodeInfo& info); @@ -117,7 +117,7 @@ protected: khtml::Length* m_coords; int m_coordsLen; int lastw, lasth; - Shape tqshape : 3; + Shape shape : 3; bool nohref : 1; }; diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index d5e812029..58804bff5 100644 --- a/khtml/html/html_miscimpl.cpp +++ b/khtml/html/html_miscimpl.cpp @@ -328,14 +328,14 @@ NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements; for (unsigned i = strt; i < l.count(); i++) { - if (l.tqat( i )->isEnumeratable()) + if (l.at( i )->isEnumeratable()) { if (dist == 0) { //Found it! m_cache->position = index; m_cache->current.index = i; - return l.tqat( i ); + return l.at( i ); } else --dist; @@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const unsigned length = 0; TQPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( start )->formElements; for ( unsigned i = 0; i < l.count(); i++ ) - if ( l.tqat( i )->isEnumeratable() ) + if ( l.at( i )->isEnumeratable() ) ++length; return length; } @@ -369,7 +369,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const //Go through the list, trying to find the appropriate named form element. for ( ; currentNamePos < l.count(); ++currentNamePos ) { - HTMLGenericFormElementImpl* el = l.tqat(currentNamePos); + HTMLGenericFormElementImpl* el = l.at(currentNamePos); if (el->isEnumeratable() && ((el->getAttribute(ATTR_ID) == name) || (el->getAttribute(ATTR_NAME) == name))) @@ -387,7 +387,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const TQPtrList<HTMLImageElementImpl>& il = static_cast<HTMLFormElementImpl*>( m_refNode )->imgElements; for ( ; currentNameImgPos < il.count(); ++currentNameImgPos ) { - HTMLImageElementImpl* el = il.tqat(currentNameImgPos); + HTMLImageElementImpl* el = il.at(currentNameImgPos); if ((el->getAttribute(ATTR_ID) == name) || (el->getAttribute(ATTR_NAME) == name)) { diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 0b9b5f34d..5da6edd14 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -89,7 +89,7 @@ static const char titleEnd [] = "</title"; #define fixUpChar(x) #else #define fixUpChar(x) \ - switch ((x).tqunicode()) \ + switch ((x).unicode()) \ { \ case 0x80: (x) = 0x20ac; break; \ case 0x82: (x) = 0x201a; break; \ @@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) if (strict) { - if (src->tqunicode() == '-') { + if (src->unicode() == '-') { delimiterCount++; if (delimiterCount == 2) { delimiterCount = 0; @@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) delimiterCount = 0; } - if ((!strict || canClose) && src->tqunicode() == '>') + if ((!strict || canClose) && src->unicode() == '>') { bool handleBrokenComments = brokenComments && !( script || style ); bool scriptEnd=false; @@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src) checkScriptBuffer(src.length()); while ( !src.isEmpty() ) { scriptCode[ scriptCodeSize++ ] = *src; - if (src->tqunicode() == '>' && + if (src->unicode() == '>' && scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') { ++src; server = false; @@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) while( !src.isEmpty() ) { - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); switch(Entity) { case NoEntity: return; @@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) case Hexadecimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin<uint>(src.length(), 8); while(ll--) { TQChar csrc(src->lower()); @@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case Decimal: { - int uc = EntityChar.tqunicode(); + int uc = EntityChar.unicode(); int ll = kMin(src.length(), 9-cBufferPos); while(ll--) { cc = src->cell(); @@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case SearchSemicolon: #ifdef TOKEN_DEBUG - kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl; + kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl; #endif fixUpChar(EntityChar); @@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) a = khtml::getAttrID(cBuffer, cBufferPos-1); } if (!a) - attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); } dest = buffer; @@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) } if ( cBufferPos == CBUFLEN ) { cBuffer[cBufferPos] = '\0'; - attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); dest = buffer; *dest++ = 0; tag = SearchEqual; @@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; bool atespace = false; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(curchar == '=') { #ifdef TOKEN_DEBUG @@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) { ushort curchar; while(!src.isEmpty()) { - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar > ' ') { if(( curchar == '\'' || curchar == '\"' )) { tquote = curchar == '\"' ? DoubleQuote : SingleQuote; @@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '\'' && !src.escaped()) { // ### attributes like '&{blaa....};' are supposed to be treated as jscript. if ( curchar == '&' ) @@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; while(!src.isEmpty()) { checkBuffer(); - curchar = src->tqunicode(); + curchar = src->unicode(); if(curchar <= '>' && !src.escaped()) { // parse Entities if ( curchar == '&' ) @@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData ) // do we need to enlarge the buffer? checkBuffer(); - ushort cc = src->tqunicode(); + ushort cc = src->unicode(); if (skipLF && (cc != '\n')) skipLF = false; diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h index 2197a5083..8e36353b0 100644 --- a/khtml/html/htmltokenizer.h +++ b/khtml/html/htmltokenizer.h @@ -76,8 +76,8 @@ namespace khtml { { DOMStringImpl *value = 0; NodeImpl::Id tid = 0; - if(buffer->tqunicode()) { - tid = buffer->tqunicode(); + if(buffer->unicode()) { + tid = buffer->unicode(); value = v.implementation(); } else if ( !attrName.isEmpty() && attrName != "/" ) { diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp index 776eb8a64..76914a5dc 100644 --- a/khtml/java/kjavaappletcontext.cpp +++ b/khtml/java/kjavaappletcontext.cpp @@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl; kdDebug(6100) << "arg count = " << arg.count() << endl; - if ( cmd == TQString::tqfromLatin1("showstatus") + if ( cmd == TQString::fromLatin1("showstatus") && !arg.empty() ) { TQString tmp = arg.first(); @@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg kdDebug(6100) << "status message = " << tmp << endl; emit showStatus( tmp ); } - else if ( cmd == TQString::tqfromLatin1( "showurlinframe" ) + else if ( cmd == TQString::fromLatin1( "showurlinframe" ) && arg.count() > 1 ) { kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl; emit showDocument( arg[0], arg[1] ); } - else if ( cmd == TQString::tqfromLatin1( "showdocument" ) + else if ( cmd == TQString::fromLatin1( "showdocument" ) && !arg.empty() ) { kdDebug(6100) << "url = " << arg.first() << endl; emit showDocument( arg.first(), "_top" ); } - else if ( cmd == TQString::tqfromLatin1( "resizeapplet" ) + else if ( cmd == TQString::fromLatin1( "resizeapplet" ) && arg.count() > 2 ) { //arg[1] should be appletID @@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg tmp->resizeAppletWidget( width, height ); } } - else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) { + else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) { kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl; } - else if ( cmd == TQString::tqfromLatin1( "JS_Event" ) + else if ( cmd == TQString::fromLatin1( "JS_Event" ) && arg.count() > 2 ) { bool ok; @@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg else kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl; } - else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) ) + else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); @@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg } else kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl; } - else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) { + else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); if (ok) diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 4eab56972..4852a5471 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -48,7 +48,7 @@ #include <tqlabel.h> #include <tqdialog.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <stdlib.h> @@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) switch( cmd_code ) { case KJAS_SHOW_DOCUMENT: - cmd = TQString::tqfromLatin1( "showdocument" ); + cmd = TQString::fromLatin1( "showdocument" ); break; case KJAS_SHOW_URLINFRAME: - cmd = TQString::tqfromLatin1( "showurlinframe" ); + cmd = TQString::fromLatin1( "showurlinframe" ); break; case KJAS_SHOW_STATUS: - cmd = TQString::tqfromLatin1( "showstatus" ); + cmd = TQString::fromLatin1( "showstatus" ); break; case KJAS_RESIZE_APPLET: - cmd = TQString::tqfromLatin1( "resizeapplet" ); + cmd = TQString::fromLatin1( "resizeapplet" ); break; case KJAS_GET_URLDATA: @@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl; return; case KJAS_JAVASCRIPT_EVENT: - cmd = TQString::tqfromLatin1( "JS_Event" ); + cmd = TQString::fromLatin1( "JS_Event" ); kdDebug(6100) << "Javascript request: "<< contextID << " code: " << args[0] << endl; break; @@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) return; } case KJAS_AUDIOCLIP_PLAY: - cmd = TQString::tqfromLatin1( "audioclip_play" ); + cmd = TQString::fromLatin1( "audioclip_play" ); kdDebug(6100) << "Audio Play: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_LOOP: - cmd = TQString::tqfromLatin1( "audioclip_loop" ); + cmd = TQString::fromLatin1( "audioclip_loop" ); kdDebug(6100) << "Audio Loop: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_STOP: - cmd = TQString::tqfromLatin1( "audioclip_stop" ); + cmd = TQString::fromLatin1( "audioclip_stop" ); kdDebug(6100) << "Audio Stop: url=" << args[0] << endl; break; case KJAS_APPLET_STATE: kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl; - cmd = TQString::tqfromLatin1( "AppletStateNotification" ); + cmd = TQString::fromLatin1( "AppletStateNotification" ); break; case KJAS_APPLET_FAILED: kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl; - cmd = TQString::tqfromLatin1( "AppletFailed" ); + cmd = TQString::fromLatin1( "AppletFailed" ); break; case KJAS_SECURITY_CONFIRM: { if (KSSL::doesSSLWork() && !d->kssl) diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index 9071fa5d5..e17e70110 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -234,7 +234,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); - if (value.tqat(0)=='\"') + if (value.at(0)=='\"') value = value.right (value.length () - 1); if (value.at (value.length () - 1) == '\"') value.truncate (value.length () - 1); @@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, baseurl = KURL (KURL (value), TQString (".")).url (); } else if (name == "__KHTML__CODEBASE") khtml_codebase = value; - else if (name_lower == TQString::tqfromLatin1("codebase") || - name_lower == TQString::tqfromLatin1("java_codebase")) { + else if (name_lower == TQString::fromLatin1("codebase") || + name_lower == TQString::fromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; } else if (name == "__KHTML__CLASSID") - //else if (name.lower()==TQString::tqfromLatin1("classid")) + //else if (name.lower()==TQString::fromLatin1("classid")) classid = value; - else if (name_lower == TQString::tqfromLatin1("code") || - name_lower == TQString::tqfromLatin1("java_code")) + else if (name_lower == TQString::fromLatin1("code") || + name_lower == TQString::fromLatin1("java_code")) classname = value; - else if (name_lower == TQString::tqfromLatin1("src")) + else if (name_lower == TQString::fromLatin1("src")) src_param = value; - else if (name_lower == TQString::tqfromLatin1("archive") || - name_lower == TQString::tqfromLatin1("java_archive") || + else if (name_lower == TQString::fromLatin1("archive") || + name_lower == TQString::fromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == TQString::tqfromLatin1("name")) + else if (name_lower == TQString::fromLatin1("name")) applet->setAppletName (value); - else if (name_lower == TQString::tqfromLatin1("width")) + else if (name_lower == TQString::fromLatin1("width")) width = value.toInt(); - else if (name_lower == TQString::tqfromLatin1("height")) + else if (name_lower == TQString::fromLatin1("height")) height = value.toInt(); if (!name.startsWith ("__KHTML__")) { applet->setParameter (name, value); @@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, info.verifyPath = true; TQDataStream stream(params, IO_WriteOnly); - stream << info << m_view->tqtopLevelWidget()->winId(); + stream << info << m_view->topLevelWidget()->winId(); if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; @@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, /* install event filter for close events */ if (wparent) - wparent->tqtopLevelWidget ()->installEventFilter (this); + wparent->topLevelWidget ()->installEventFilter (this); setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index c86b922dd..6156b5df7 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <kio/kprotocolmanager.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmap.h> #include <config.h> @@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff ) const char* size_ptr = size_str.latin1(); for( int i = 0; i < 8; ++i ) - buff->tqat(i) = size_ptr[i]; + buff->at(i) = size_ptr[i]; } void KJavaProcess::sendBuffer( TQByteArray* buff ) @@ -218,12 +218,12 @@ void KJavaProcess::popBuffer() // kdDebug(6100) << "Sending buffer to java, buffer = >>"; // for( unsigned int i = 0; i < buf->size(); i++ ) // { -// if( buf->tqat(i) == (char)0 ) +// if( buf->at(i) == (char)0 ) // kdDebug(6100) << "<SEP>"; -// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 ) -// kdDebug(6100) << "<CMD " << (int) buf->tqat(i) << ">"; +// else if( buf->at(i) > 0 && buf->at(i) < 10 ) +// kdDebug(6100) << "<CMD " << (int) buf->at(i) << ">"; // else -// kdDebug(6100) << buf->tqat(i); +// kdDebug(6100) << buf->at(i); // } // kdDebug(6100) << "<<" << endl; diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 0946685cb..9b819ee6c 100644 --- a/khtml/khtml_caret.cpp +++ b/khtml/khtml_caret.cpp @@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM caret_boxes.append(caretBox); // afaik an inner flow box can only have the width 0, therefore we don't - // have to care for rtl or tqalignment + // have to care for rtl or alignment // ### can empty inline elements have a width? css 2 spec isn't verbose about it caretBox->_y += flowBox->baseline() - fm.ascent(); @@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar() if (_offset == box->maxOffset()) peekNext(); else if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); else _char = -1; } @@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl; readchar: // get character if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); else _char = -1; }/*end if*/ @@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl; // _peekNext = b; // get character if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); else _char = -1; @@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl; #endif // get character if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox()) - _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode(); + _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode(); else if (b && _offset < b->maxOffset() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); else _char = -1; }/*end if*/ @@ -2103,7 +2103,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, int n = (int)row->row->size(); int i; for (i = 0; i < n; i++) { - RenderTableCell *cell = row->row->tqat(i); + RenderTableCell *cell = row->row->at(i); if (!cell || (long)cell == -1) continue; int absx, absy; @@ -2127,7 +2127,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, int index = i - ((cnt >> 1) + 1)*(cnt & 1) + (cnt >> 1)*!(cnt & 1); if (index < 0 || index >= n) continue; - RenderTableCell *cell = row->row->tqat(index); + RenderTableCell *cell = row->row->at(index); if (!cell || (long)cell == -1) continue; #if DEBUG_CARETMODE > 1 @@ -2227,7 +2227,7 @@ static int findRowInSection(RenderTableSection *section, RenderTableCell *cell, // check for cell int m = row->row->size(); for (int j = 0; j < m; j++) { - RenderTableCell *c = row->row->tqat(j); + RenderTableCell *c = row->row->at(j); if (c == directCell) return i; }/*next j*/ diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h index a5c4bf60d..9524f2df7 100644 --- a/khtml/khtml_caret_p.h +++ b/khtml/khtml_caret_p.h @@ -1034,7 +1034,7 @@ public: */ int chr() const { return _char; } - /** returns the current character as a tqunicode symbol, substituting + /** returns the current character as a unicode symbol, substituting * a blank for a non-text node. */ TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); } @@ -1089,7 +1089,7 @@ protected: CaretBox *box = *copy; InlineBox *b = box->inlineBox(); if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode(); + _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode(); else _char = -1; } diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 5ff15fe53..20d2d9a50 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -35,7 +35,7 @@ #include "misc/loader.h" #include "dom/html_form.h" #include "dom/html_image.h" -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfileinfo.h> #include <tqpopupmenu.h> #include <tqurl.h> @@ -112,7 +112,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) if ( !m_connectedToClipboard && m_editableFormWidget ) { - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( updateEditActions() ) ); if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) @@ -135,7 +135,7 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( m_connectedToClipboard ) { - disconnect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( updateEditActions() ) ); if ( oldWidget ) @@ -223,7 +223,7 @@ void KHTMLPartBrowserExtension::copy() text.replace( TQChar( 0xa0 ), ' ' ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); #ifndef QT_NO_MIMECLIPBOARD TQString htmltext; @@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) if ( !m_extensionProxy ) return; - int slot = m_extensionProxy->tqmetaObject()->findSlot( method ); + int slot = m_extensionProxy->metaObject()->findSlot( method ); if ( slot == -1 ) return; @@ -335,10 +335,10 @@ void KHTMLPartBrowserExtension::updateEditActions() // ### duplicated from KonqMainWindow::slotClipboardDataChanged #ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); enableAction( "paste", data->provides( "text/plain" ) ); #else - TQString data=TQApplication::tqclipboard()->text(); + TQString data=TQApplication::clipboard()->text(); enableAction( "paste", data.contains("://")); #endif bool hasSelection = false; @@ -715,10 +715,10 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation() // Set it in both the mouse selection and in the clipboard KURL::List lst; lst.append( safeURL ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection ); + TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection ); #else - TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries + TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries #endif } @@ -741,8 +741,8 @@ void KHTMLPopupGUIClient::slotCopyImage() drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") ); // Set it in both the mouse selection and in the clipboard - TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setData( new KURLDrag(lst), TQClipboard::Selection ); + TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( new KURLDrag(lst), TQClipboard::Selection ); #else kdDebug() << "slotCopyImage called when the clipboard does not support this. This should not be possible." << endl; #endif @@ -756,10 +756,10 @@ void KHTMLPopupGUIClient::slotCopyImageLocation() // Set it in both the mouse selection and in the clipboard KURL::List lst; lst.append( safeURL ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection ); + TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection ); #else - TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries + TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries #endif } @@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, const TQString &filter, long cacheId, const TQString & suggestedFilename ) { - TQString name = TQString::tqfromLatin1( "index.html" ); + TQString name = TQString::fromLatin1( "index.html" ); if ( !suggestedFilename.isEmpty() ) name = suggestedFilename; else if ( !url.fileName().isEmpty() ) diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index e736df5c2..935f31cc0 100644 --- a/khtml/khtml_pagecache.cpp +++ b/khtml/khtml_pagecache.cpp @@ -95,8 +95,8 @@ KHTMLPageCacheEntry::endData() { m_complete = true; if ( m_file->status() == 0) { - m_file->dataStream()->tqdevice()->flush(); - m_file->dataStream()->tqdevice()->tqat(0); + m_file->dataStream()->device()->flush(); + m_file->dataStream()->device()->at(0); } } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index fefc59fa1..42d7c2fd7 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -107,7 +107,7 @@ using namespace DOM; #include <kstatusbar.h> #include <kurllabel.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> #include <tqtooltip.h> #include <tqmetaobject.h> @@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url ) } if (widget()) - d->m_job->setWindow(widget()->tqtopLevelWidget()); + d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), @@ -1480,7 +1480,7 @@ void KHTMLPart::clear() d->m_startOffset = 0; d->m_endOffset = 0; #ifndef QT_NO_CLIPBOARD - connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); #endif d->m_jobPercent = 0; @@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU d->m_bJScriptForce = false; d->m_bJScriptOverride = true; begin(); - TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) + TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) .arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() ); - errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" ); + errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" ); errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() ); - errText += TQString::tqfromLatin1( "</P>" ); + errText += TQString::fromLatin1( "</P>" ); errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) ); - errText += TQString::tqfromLatin1( "</BODY></HTML>" ); + errText += TQString::fromLatin1( "</BODY></HTML>" ); write(errText); end(); @@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString url, protocol, datetime; url = reqUrl.prettyURL(); protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); - TQString doc = TQString::tqfromLatin1( "<html><head><title>" ); + TQString doc = TQString::fromLatin1( "<html><head><title>" ); doc += i18n( "Error: " ); doc += errorName; - doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url ); + doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url ); doc += i18n( "The requested operation could not be completed" ); - doc += TQString::tqfromLatin1( "</h1><h2>" ); + doc += TQString::fromLatin1( "</h1><h2>" ); doc += errorName; - doc += TQString::tqfromLatin1( "</h2>" ); + doc += TQString::fromLatin1( "</h2>" ); if ( !techName.isNull() ) { - doc += TQString::tqfromLatin1( "<h2>" ); + doc += TQString::fromLatin1( "<h2>" ); doc += i18n( "Technical Reason: " ); doc += techName; - doc += TQString::tqfromLatin1( "</h2>" ); + doc += TQString::fromLatin1( "</h2>" ); } - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Details of the Request:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += i18n( "URL: %1" ).arg( url ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); if ( !protocol.isNull() ) { // uncomment for 3.1... i18n change // doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); } doc += i18n( "Date and Time: %1" ).arg( datetime ); - doc += TQString::tqfromLatin1( "</li><li>" ); + doc += TQString::fromLatin1( "</li><li>" ); doc += i18n( "Additional Information: %1" ).arg( text ); - doc += TQString::tqfromLatin1( "</li></ul><h3>" ); + doc += TQString::fromLatin1( "</li></ul><h3>" ); doc += i18n( "Description:" ); - doc += TQString::tqfromLatin1( "</h3><p>" ); + doc += TQString::fromLatin1( "</h3><p>" ); doc += description; - doc += TQString::tqfromLatin1( "</p>" ); + doc += TQString::fromLatin1( "</p>" ); if ( causes.count() ) { - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Possible Causes:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += causes.join( "</li><li>" ); - doc += TQString::tqfromLatin1( "</li></ul>" ); + doc += TQString::fromLatin1( "</li></ul>" ); } if ( solutions.count() ) { - doc += TQString::tqfromLatin1( "<h3>" ); + doc += TQString::fromLatin1( "<h3>" ); doc += i18n( "Possible Solutions:" ); - doc += TQString::tqfromLatin1( "</h3><ul><li>" ); + doc += TQString::fromLatin1( "</h3><ul><li>" ); doc += solutions.join( "</li><li>" ); - doc += TQString::tqfromLatin1( "</li></ul>" ); + doc += TQString::fromLatin1( "</li></ul>" ); } - doc += TQString::tqfromLatin1( "</body></html>" ); + doc += TQString::fromLatin1( "</body></html>" ); write( doc ); end(); @@ -2286,7 +2286,7 @@ void KHTMLPart::checkCompleted() } // the view will emit completed on our behalf, - // either now or at next tqrepaint if one is pending + // either now or at next repaint if one is pending //kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl; d->m_view->complete( pendingAction ); @@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect() d->m_redirectURL = TQString(); // SYNC check with ecma/kjs_window.cpp::goURL ! - if ( u.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( u.right( u.length() - 11 ) ); kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl; @@ -3005,7 +3005,7 @@ void KHTMLPart::findText() // The lineedit of the dialog would make khtml lose its selection, otherwise #ifndef QT_NO_CLIPBOARD - disconnect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); + disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); #endif // Now show the dialog in which the user can choose options. @@ -3036,7 +3036,7 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K return; #ifndef QT_NO_CLIPBOARD - connect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); + connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); #endif // Create the KFind object @@ -3731,7 +3731,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi return; } - if (url.find( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { + if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) { TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) ); jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long if (url.startsWith("javascript:window.open")) @@ -3838,18 +3838,18 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi extra = i18n(" (In other frame)"); } - if (u.protocol() == TQString::tqfromLatin1("mailto")) { - TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/; + if (u.protocol() == TQString::fromLatin1("mailto")) { + TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/; mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path()); TQStringList queries = TQStringList::split('&', u.query().mid(1)); TQStringList::Iterator it = queries.begin(); const TQStringList::Iterator itEnd = queries.end(); for (; it != itEnd; ++it) - if ((*it).startsWith(TQString::tqfromLatin1("subject="))) + if ((*it).startsWith(TQString::fromLatin1("subject="))) mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8)); - else if ((*it).startsWith(TQString::tqfromLatin1("cc="))) + else if ((*it).startsWith(TQString::fromLatin1("cc="))) mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3)); - else if ((*it).startsWith(TQString::tqfromLatin1("bcc="))) + else if ((*it).startsWith(TQString::fromLatin1("bcc="))) mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4)); mailtoMsg = TQStyleSheet::escape(mailtoMsg); mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString()); @@ -3858,9 +3858,9 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi } // Is this check necessary at all? (Frerich) #if 0 - else if (u.protocol() == TQString::tqfromLatin1("http")) { + else if (u.protocol() == TQString::fromLatin1("http")) { DOM::Node hrefNode = nodeUnderMouse().parentNode(); - while (hrefNode.nodeName().string() != TQString::tqfromLatin1("A") && !hrefNode.isNull()) + while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull()) hrefNode = hrefNode.parentNode(); if (!hrefNode.isNull()) { @@ -3868,12 +3868,12 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi if (!hreflangNode.isNull()) { TQString countryCode = hreflangNode.nodeValue().string().lower(); // Map the language code to an appropriate country code. - if (countryCode == TQString::tqfromLatin1("en")) - countryCode = TQString::tqfromLatin1("gb"); - TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg( - locate("locale", TQString::tqfromLatin1("l10n/") + if (countryCode == TQString::fromLatin1("en")) + countryCode = TQString::fromLatin1("gb"); + TQString flagImg = TQString::fromLatin1("<img src=%1>").arg( + locate("locale", TQString::fromLatin1("l10n/") + countryCode - + TQString::tqfromLatin1("/flag.png"))); + + TQString::fromLatin1("/flag.png"))); emit setStatusBarText(flagImg + u.prettyURL() + extra); } } @@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c if ( !target.isEmpty() ) hasTarget = true; - if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) ); return false; @@ -4027,7 +4027,7 @@ void KHTMLPart::slotViewDocumentSource() } } - (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } void KHTMLPart::slotViewPageInfo() @@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource() } } - (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } KURL KHTMLPart::backgroundURL() const @@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions() { TQObject *ext = KParts::BrowserExtension::childObject( frame ); if ( ext ) - enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" ); + enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" ); } d->m_paPrintFrame->setEnabled( enablePrintFrame ); @@ -4319,7 +4319,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con (*it)->m_params = params; // Support for <frame src="javascript:string"> - if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part)); @@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con TQString KHTMLPart::requestFrameName() { - return TQString::tqfromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); + return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); } bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType, @@ -4408,7 +4408,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank"> if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty()) - args.serviceType = TQString::tqfromLatin1( "text/html" ); + args.serviceType = TQString::fromLatin1( "text/html" ); if ( args.serviceType.isEmpty() ) { kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl; @@ -4650,7 +4650,7 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char { TQString constr; if ( !serviceName.isEmpty() ) - constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) ); + constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) ); KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() ); @@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager() { if ( !d->m_manager && d->m_view ) { - d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), this, "khtml part manager" ); + d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" ); d->m_manager->setAllowNestedParts( true ); connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); @@ -4777,7 +4777,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt "WarnOnUnencryptedForm"); // Move this setting into KSSL instead KConfig *config = kapp->config(); - TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); KConfigGroupSaver saver( config, grpNotifMsgs ); if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) { @@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString urlstring = u.url(); - if ( urlstring.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlstring.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { urlstring = KURL::decode_string(urlstring); crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) ); return; @@ -4873,18 +4873,18 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString bodyEnc; if (contentType.lower() == "multipart/form-data") { // FIXME: is this correct? I suspect not - bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), formData.size())); } else if (contentType.lower() == "text/plain") { // Convention seems to be to decode, and s/&/\n/ - TQString tmpbody = TQString::tqfromLatin1(formData.data(), + TQString tmpbody = TQString::fromLatin1(formData.data(), formData.size()); tmpbody.replace(TQRegExp("[&]"), "\n"); tmpbody.replace(TQRegExp("[+]"), " "); tmpbody = KURL::decode_string(tmpbody); // Decode the rest of it bodyEnc = KURL::encode_string(tmpbody); // Recode for the URL } else { - bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), formData.size())); } @@ -4895,7 +4895,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt if ( strcmp( action, "get" ) == 0 ) { if (u.protocol() != "mailto") - u.setQuery( TQString::tqfromLatin1( formData.data(), formData.size() ) ); + u.setQuery( TQString::fromLatin1( formData.data(), formData.size() ) ); args.setDoPost( false ); } else { @@ -4975,7 +4975,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL ); TQGuardedPtr<TQObject> guard( client ); - TQString mimetype = TQString::tqfromLatin1( "text/html" ); + TQString mimetype = TQString::fromLatin1( "text/html" ); args.metaData()["referrer"] = referrer; if (!linkUrl.isEmpty()) // over a link @@ -5095,7 +5095,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg // TODO: handle child target correctly! currently the script are always executed fur the parent TQString urlStr = url.url(); - if ( urlStr.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlStr.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) ); executeScript( DOM::Node(), script ); return; @@ -5103,17 +5103,17 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg TQString frameName = args.frameName.lower(); if ( !frameName.isEmpty() ) { - if ( frameName == TQString::tqfromLatin1( "_top" ) ) + if ( frameName == TQString::fromLatin1( "_top" ) ) { emit d->m_extension->openURLRequest( url, args ); return; } - else if ( frameName == TQString::tqfromLatin1( "_blank" ) ) + else if ( frameName == TQString::fromLatin1( "_blank" ) ) { emit d->m_extension->createNewWindow( url, args ); return; } - else if ( frameName == TQString::tqfromLatin1( "_parent" ) ) + else if ( frameName == TQString::fromLatin1( "_parent" ) ) { KParts::URLArgs newArgs( args ); newArgs.frameName = TQString(); @@ -5121,7 +5121,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg emit d->m_extension->openURLRequest( url, newArgs ); return; } - else if ( frameName != TQString::tqfromLatin1( "_self" ) ) + else if ( frameName != TQString::fromLatin1( "_self" ) ) { khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); @@ -6610,9 +6610,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event ) #ifndef QT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); - disconnect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); - kapp->tqclipboard()->setText(text,TQClipboard::Selection); - connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + kapp->clipboard()->setText(text,TQClipboard::Selection); + connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; emitSelectionChanged(); @@ -6658,7 +6658,7 @@ void KHTMLPart::slotPrintFrame() if ( !ext ) return; - TQMetaObject *mo = ext->tqmetaObject(); + TQMetaObject *mo = ext->metaObject(); int idx = mo->findSlot( "print()", true ); if ( idx >= 0 ) { @@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken); - frame->tqrepaint(); + frame->repaint(); } } @@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain); - frame->tqrepaint(); + frame->repaint(); } kdDebug(6050) << "new active frame " << d->m_activeFrame << endl; } @@ -7157,7 +7157,7 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); @@ -7199,7 +7199,7 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString> } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp index ed998ffb7..355f50e71 100644 --- a/khtml/khtml_printsettings.cpp +++ b/khtml/khtml_printsettings.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name) diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp index c07b44b79..90770d38f 100644 --- a/khtml/khtml_run.cpp +++ b/khtml/khtml_run.cpp @@ -30,7 +30,7 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ) - : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0, + : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, false, false, hideErrorDialog ), m_child( child ) { diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 6b8649601..431aec0ca 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str if (!_str) ret = KJavaScriptDunno; - if (_str.lower() == TQString::tqfromLatin1("accept")) + if (_str.lower() == TQString::fromLatin1("accept")) ret = KJavaScriptAccept; - else if (_str.lower() == TQString::tqfromLatin1("reject")) + else if (_str.lower() == TQString::fromLatin1("reject")) ret = KJavaScriptReject; return ret; @@ -189,63 +189,63 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai void KHTMLSettings::readDomainSettings(KConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null - : TQString::tqfromLatin1("javascript."); + : TQString::fromLatin1("javascript."); TQString javaPrefix = global ? TQString::null - : TQString::tqfromLatin1("java."); + : TQString::fromLatin1("java."); TQString pluginsPrefix = global ? TQString::null - : TQString::tqfromLatin1("plugins."); + : TQString::fromLatin1("plugins."); // The setting for Java - TQString key = javaPrefix + TQString::tqfromLatin1("EnableJava"); + TQString key = javaPrefix + TQString::fromLatin1("EnableJava"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJava = config->readBoolEntry( key, false ); else if ( !global ) pd_settings.m_bEnableJava = d->global.m_bEnableJava; // The setting for Plugins - key = pluginsPrefix + TQString::tqfromLatin1("EnablePlugins"); + key = pluginsPrefix + TQString::fromLatin1("EnablePlugins"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnablePlugins = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnablePlugins = d->global.m_bEnablePlugins; // The setting for JavaScript - key = jsPrefix + TQString::tqfromLatin1("EnableJavaScript"); + key = jsPrefix + TQString::fromLatin1("EnableJavaScript"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJavaScript = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnableJavaScript = d->global.m_bEnableJavaScript; // window property policies - key = jsPrefix + TQString::tqfromLatin1("WindowOpenPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowOpenPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowOpenPolicy = (KJSWindowOpenPolicy) config->readUnsignedNumEntry( key, KJSWindowOpenSmart ); else if ( !global ) pd_settings.m_windowOpenPolicy = d->global.m_windowOpenPolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowMovePolicy"); + key = jsPrefix + TQString::fromLatin1("WindowMovePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowMovePolicy = (KJSWindowMovePolicy) config->readUnsignedNumEntry( key, KJSWindowMoveAllow ); else if ( !global ) pd_settings.m_windowMovePolicy = d->global.m_windowMovePolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowResizePolicy"); + key = jsPrefix + TQString::fromLatin1("WindowResizePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowResizePolicy = (KJSWindowResizePolicy) config->readUnsignedNumEntry( key, KJSWindowResizeAllow ); else if ( !global ) pd_settings.m_windowResizePolicy = d->global.m_windowResizePolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowStatusPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowStatusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowStatusPolicy = (KJSWindowStatusPolicy) config->readUnsignedNumEntry( key, KJSWindowStatusAllow ); else if ( !global ) pd_settings.m_windowStatusPolicy = d->global.m_windowStatusPolicy; - key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy"); + key = jsPrefix + TQString::fromLatin1("WindowFocusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy) config->readUnsignedNumEntry( key, KJSWindowFocusAllow ); @@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( it.data() ); TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno ); - domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "JavaDomainSettings", domainConfig ); } @@ -624,7 +624,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( KJavaScriptDunno ); TQCString javaScriptPolicy = adviceToStr( it.data() ); - domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "ECMADomainSettings", domainConfig ); } @@ -878,7 +878,7 @@ const TQString &KHTMLSettings::availableFamilies() if ( !avFamilies ) { avFamilies = new TQString; TQFontDatabase db; - TQStringList families = db.tqfamilies(); + TQStringList families = db.families(); TQStringList s; TQRegExp foundryExp(" \\[.+\\]"); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 80f031fe2..121bc1965 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -84,7 +84,7 @@ #include <tqptrdict.h> #include <tqtooltip.h> #include <tqstring.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqtimer.h> #include <tqvaluevector.h> @@ -662,7 +662,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl; if(!m_part || !m_part->xmlDocImpl() || !m_part->xmlDocImpl()->renderer()) { - p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base)); + p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); return; } else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) { // an external update request happens while we have a layout scheduled @@ -726,7 +726,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) d->vertPaintBuffer->resize(10, visibleHeight()); d->tp->begin(d->vertPaintBuffer); d->tp->translate(-ex, -ey); - d->tp->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base)); + d->tp->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey, ew, eh)); d->tp->end(); p->drawPixmap(ex, ey, *d->vertPaintBuffer, 0, 0, ew, eh); @@ -740,7 +740,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT; d->tp->begin(d->paintBuffer); d->tp->translate(-ex, -ey-py); - d->tp->fillRect(ex, ey+py, ew, ph, tqpalette().active().brush(TQColorGroup::Base)); + d->tp->fillRect(ex, ey+py, ew, ph, palette().active().brush(TQColorGroup::Base)); m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey+py, ew, ph)); d->tp->end(); @@ -756,7 +756,7 @@ static int cnt=0; kdDebug() << "[" << ++cnt << "]" << " clip region: " << pr << endl; // p->setClipRegion(TQRect(0,0,ew,eh)); // p->translate(-ex, -ey); - p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base)); + p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr); #endif // DEBUG_NO_PAINT_BUFFER @@ -867,7 +867,7 @@ void KHTMLView::layout() } #if 0 ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__"); - if (listitem) kdDebug(6000) << "after layout, before tqrepaint" << endl; + if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer())); #endif #ifndef KHTML_NO_CARET @@ -2284,7 +2284,7 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose); connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(tqrepaint())); + connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2721,7 +2721,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const TQString url = (*it).url; it = data.remove( it ); // assign the same accesskey also to other elements pointing to the same url - if( !url.isEmpty() && !url.tqstartsWith( "javascript:", false )) { + if( !url.isEmpty() && !url.startsWith( "javascript:", false )) { for( TQValueList< AccessKeyData >::Iterator it2 = data.begin(); it2 != data.end(); ) { @@ -2937,7 +2937,7 @@ void KHTMLView::print(bool quick) root->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); // m_part->xmlDocImpl()->renderer()->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); -// root->tqrepaint(); +// root->repaint(); // p->flush(); kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl; @@ -2983,7 +2983,7 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer()); if(!root) return; - m_part->xmlDocImpl()->setPaintDevice(p->tqdevice()); + m_part->xmlDocImpl()->setPaintDevice(p->device()); root->setPagedMode(true); root->setStaticMode(true); root->setWidth(rc.width()); @@ -3510,12 +3510,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) setStaticBackground(d->useSlowRepaints); -// kdDebug() << "scheduled tqrepaint "<< d->repaintTimerId << endl; +// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl; killTimer(d->repaintTimerId); d->repaintTimerId = 0; TQRect updateRegion; - TQMemArray<TQRect> rects = d->updateRegion.tqrects(); + TQMemArray<TQRect> rects = d->updateRegion.rects(); d->updateRegion = TQRegion(); @@ -3645,10 +3645,10 @@ void KHTMLView::complete( bool pendingAction ) KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } - // is there a tqrepaint pending? + // is there a repaint pending? if (d->repaintTimerId) { -// kdDebug() << "requesting tqrepaint now" << endl; +// kdDebug() << "requesting repaint now" << endl; // do it now killTimer(d->repaintTimerId); d->repaintTimerId = startTimer( 20 ); @@ -3702,7 +3702,7 @@ void KHTMLView::initCaret(bool keepSelection) }/*end if*/ // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; - // ### does not tqrepaint the selection on keepSelection!=false + // ### does not repaint the selection on keepSelection!=false moveCaretTo(m_part->d->caretNode().handle(), m_part->d->caretOffset(), !keepSelection); // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; @@ -3877,7 +3877,7 @@ void KHTMLView::hideCaret() if (d->m_caretViewContext->visible) { // kdDebug(6200) << "redraw caret hidden" << endl; d->m_caretViewContext->visible = false; - // force tqrepaint, otherwise the event won't be handled + // force repaint, otherwise the event won't be handled // before the focus leaves the window repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, @@ -4430,7 +4430,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox) d->m_caretViewContext->origX = d->m_caretViewContext->x; d->scrollBarMoved = false; #if DEBUG_CARETMODE > 3 - //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; + //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; #endif ensureNodeHasFocus(m_part->d->caretNode().handle()); caretOn(); diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h index 212a02b44..65e432090 100644 --- a/khtml/khtmlview.h +++ b/khtml/khtmlview.h @@ -384,8 +384,8 @@ private: * * These operations are executed unconditionally, regardless of the * focus, and the caret display policy. - * @param forceRepaint @p true to force an immediate tqrepaint, otherwise - * do a scheduled tqrepaint + * @param forceRepaint @p true to force an immediate repaint, otherwise + * do a scheduled repaint */ void showCaret(bool forceRepaint = false); /** makes the caret invisible, but does not influence the frequency timer. diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 5d82742d9..20768341f 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -51,7 +51,7 @@ public: Q_ASSERT( !m_lineComplete ); if ( storeNewline || c != '\n' ) { int sz = m_currentLine.size(); - m_currentLine.tqresize( sz+1, TQGArray::SpeedOptim ); + m_currentLine.resize( sz+1, TQGArray::SpeedOptim ); m_currentLine[sz] = c; } if ( c == '\n' ) @@ -68,7 +68,7 @@ public: reset(); } void reset() { - m_currentLine.tqresize( 0, TQGArray::SpeedOptim ); + m_currentLine.resize( 0, TQGArray::SpeedOptim ); m_lineComplete = false; } private: @@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) } else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) ) { - TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower(); + TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower(); if (encoding == "gzip" || encoding == "x-gzip") { m_gzip = true; } else { @@ -245,7 +245,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) ) { Q_ASSERT( m_nextMimeType.isNull() ); - m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); + m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace(); int semicolon = m_nextMimeType.find( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index 58d531384..5efcaf98d 100644 --- a/khtml/misc/arena.cpp +++ b/khtml/misc/arena.cpp @@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) assert((nb & pool->mask) == 0); #endif - nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */ /* attempt to allocate from arenas at pool->current */ { @@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) } else #endif sz = pool->arenasize > nb ? pool->arenasize : nb; - sz += sizeof *a + pool->mask; /* header and tqalignment slop */ + sz += sizeof *a + pool->mask; /* header and alignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index f227f4014..34689cae1 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -37,7 +37,7 @@ using namespace khtml; #include "htmlhashes.h" #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <kglobal.h> #include <kcharsets.h> diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 6f420e3b3..779792e71 100644 --- a/khtml/misc/htmlattrs.c +++ b/khtml/misc/htmlattrs.c @@ -188,7 +188,7 @@ struct spool_attr_t char spool_attr_str42[sizeof("rules")]; char spool_attr_str43[sizeof("compact")]; char spool_attr_str44[sizeof("rev")]; - char spool_attr_str45[sizeof("tqshape")]; + char spool_attr_str45[sizeof("shape")]; char spool_attr_str46[sizeof("charset")]; char spool_attr_str47[sizeof("charoff")]; char spool_attr_str48[sizeof("lang")]; @@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents = "rules", "compact", "rev", - "tqshape", + "shape", "charset", "charoff", "lang", diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index b0c8dc613..1049d10c4 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -33,7 +33,7 @@ namespace khtml const int UNDEFINED = -1; - // tqalignment + // alignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp index 09de5a149..aa3c93cb4 100644 --- a/khtml/misc/knsplugininstaller.cpp +++ b/khtml/misc/knsplugininstaller.cpp @@ -36,10 +36,10 @@ #include <tqiodevice.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <sys/utsname.h> diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index de7d5aea2..82a87dab9 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI : CachedObject(url, CSSStyleSheet, _cachePolicy, 0) { // Set the type we want (probably css or xml) - TQString ah = TQString::tqfromLatin1( accept ); + TQString ah = TQString::fromLatin1( accept ); if ( !ah.isEmpty() ) ah += ","; ah += "*/*;q=0.1"; @@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro // It's javascript we want. // But some websites think their scripts are <some wrong mimetype here> // and refuse to serve them if we only accept application/x-javascript. - setAccept( TQString::tqfromLatin1("*/*") ); + setAccept( TQString::fromLatin1("*/*") ); // load the file Cache::loader()->load(dl, this, false); m_loading = true; @@ -397,7 +397,7 @@ public: void sendTo(TQDataSink* sink, int n) { - sink->receive((const uchar*)&buffer.tqat(pos), n); + sink->receive((const uchar*)&buffer.at(pos), n); pos += n; @@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati delete p; p = new TQPixmap(m->framePixmap()); m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->disconnectqStatus( this, TQT_SLOT( movieStatus( int ) )); + m->disconnecStatus( this, TQT_SLOT( movieStatus( int ) )); m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); imgSource = 0; @@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) imgSource = new ImageSource( _buffer.buffer()); m = new TQMovie( imgSource, 8192 ); m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->connectqStatus( this, TQT_SLOT( movieStatus(int))); + m->connecStatus( this, TQT_SLOT( movieStatus(int))); m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); } } @@ -1167,7 +1167,7 @@ void Loader::servePendingRequests() { job->addMetaData( "cross-domain", part->toplevelURL().url() ); if (part->widget()) - job->setWindow (part->widget()->tqtopLevelWidget()); + job->setWindow (part->widget()->topLevelWidget()); } } diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h index e950f1767..3baed31ce 100644 --- a/khtml/misc/loader.h +++ b/khtml/misc/loader.h @@ -45,7 +45,7 @@ #include <tqpixmap.h> #include <tqbuffer.h> #include <tqstringlist.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include <kurl.h> diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 8f60dcf02..125e8e07d 100644 --- a/khtml/misc/multimap.h +++ b/khtml/misc/multimap.h @@ -70,7 +70,7 @@ private: static inline unsigned int stupidHash(void* ptr) { unsigned long val = (unsigned long)ptr; - // remove tqalignment and multiply by a prime unlikely to be a factor of size + // remove alignment and multiply by a prime unlikely to be a factor of size val = (val >> 4) * 1237; return val; } diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h index d56a78397..789f22af8 100644 --- a/khtml/misc/stringit.h +++ b/khtml/misc/stringit.h @@ -46,7 +46,7 @@ public: DOMStringIt(TQChar *str, uint len) { s = str, l = len; lines = 0; } DOMStringIt(const TQString &str) - { s = str.tqunicode(); l = str.length(); lines = 0; } + { s = str.unicode(); l = str.length(); lines = 0; } DOMStringIt *operator++() { @@ -85,13 +85,13 @@ class TokenizerSubstring friend class TokenizerString; public: TokenizerSubstring() : m_length(0), m_current(0) {} - TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {} + TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {} TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {} void clear() { m_length = 0; m_current = 0; } void appendTo(TQString &str) const { - if (m_string.tqunicode() == m_current) { + if (m_string.unicode() == m_current) { if (str.isEmpty()) str = m_string; else diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index 30beadd7c..bd010047a 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) { next = current->firstChild(); if ( next && adjustEmbedding ) { - EUnicodeBidi ub = next->style()->tqunicodeBidi(); + EUnicodeBidi ub = next->style()->unicodeBidi(); if ( ub != UBNormal && !emptyRun ) { EDirection dir = next->style()->direction(); TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE ) @@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B while (current && current != par) { next = current->nextSibling(); if (next) break; - if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) { + if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) { embed( TQChar::DirPDF, bidi ); } current = current->parent(); @@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi) // Don't shave a character off the endpoint if it was from a soft hyphen. RenderText* textObj = static_cast<RenderText*>(endpoint.obj); if (endpoint.pos+1 < textObj->length() && - textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN) + textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN) return; } endpoint.pos--; @@ -484,7 +484,7 @@ static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState bool haveNextMidpoint = (smidpoints && sCurrMidpoint < sNumMidpoints); BidiIterator nextMidpoint; if (haveNextMidpoint) - nextMidpoint = smidpoints->tqat(sCurrMidpoint); + nextMidpoint = smidpoints->at(sCurrMidpoint); if (betweenMidpoints) { if (!(haveNextMidpoint && nextMidpoint.obj == obj)) return; @@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator } // this causes the operator ++ to open and close embedding levels as needed - // for the CSS tqunicode-bidi property + // for the CSS unicode-bidi property adjustEmbedding = true; bidi.current.increment( bidi ); adjustEmbedding = false; @@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi // be skipped. while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() && #ifndef QT_NO_UNICODETABLES - ( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space - (start.current().tqunicode() == (ushort)0x0009) || // ASCII tab - (start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed - (start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed - (start.current().tqunicode() == (ushort)0x200B) || // Zero-width space + ( (start.current().unicode() == (ushort)0x0020) || // ASCII space + (start.current().unicode() == (ushort)0x0009) || // ASCII tab + (start.current().unicode() == (ushort)0x000A) || // ASCII line feed + (start.current().unicode() == (ushort)0x000C) || // ASCII form feed + (start.current().unicode() == (ushort)0x200B) || // Zero-width space start.obj->isFloatingOrPositioned() ) #else ( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() ) @@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi isLineEmpty = false; // Check for soft hyphens. Go ahead and ignore them. - if (c.tqunicode() == SOFT_HYPHEN && pos > 0) { + if (c.unicode() == SOFT_HYPHEN && pos > 0) { nextIsSoftBreakable = true; if (!ignoringSpaces) { // Ignore soft hyphens @@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi lBreak.endOfInline = false; } goto end; - } else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) ) + } else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) ) // Subtract the width of the soft hyphen out since we fit on a line. tmpW -= t->width(pos-1, 1, f); } @@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi // For soft hyphens on line breaks, we have to chop out the midpoints that made us // ignore the hyphen so that it will render at the end of the line. TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1]; - if (c.tqunicode() == SOFT_HYPHEN) + if (c.unicode() == SOFT_HYPHEN) chopMidpointsAt(lBreak.obj, lBreak.pos-2); } diff --git a/khtml/rendering/break_lines.cpp b/khtml/rendering/break_lines.cpp index a0d314cee..2ae5b53c7 100644 --- a/khtml/rendering/break_lines.cpp +++ b/khtml/rendering/break_lines.cpp @@ -1,7 +1,7 @@ #include <break_lines.h> #include <klibloader.h> #include "tqcstring.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqcleanuphandler.h> #include <config.h> diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h index ed6df2aab..5176e5fb0 100644 --- a/khtml/rendering/break_lines.h +++ b/khtml/rendering/break_lines.h @@ -6,7 +6,7 @@ namespace khtml { /* - array of tqunicode codes where breaking shouldn't occur. + array of unicode codes where breaking shouldn't occur. (in sorted order because of using with binary search) these are currently for Japanese, though simply adding Korean, Chinese ones should work as well @@ -122,7 +122,7 @@ namespace khtml { inline bool isBreakable( const TQChar *str, const int pos, int len ) { const TQChar *c = str+pos; - unsigned short ch = c->tqunicode(); + unsigned short ch = c->unicode(); if ( ch > 0xff ) { // not latin1, need to do more sophisticated checks for asian fonts unsigned char row = c->row(); @@ -147,8 +147,8 @@ namespace khtml { return false; // do binary search in dontbreak[] - return break_bsearch(dontbreakbefore, c->tqunicode()) && - break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode()); + return break_bsearch(dontbreakbefore, c->unicode()) && + break_bsearch(dontbreakafter, (str+(pos-1))->unicode()); } else // no asian font return c->isSpace(); } else { diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp index 57445c12b..9cfe149ad 100644 --- a/khtml/rendering/enumerate.cpp +++ b/khtml/rendering/enumerate.cpp @@ -138,7 +138,7 @@ TQString toHebrew( int number ) { TQString letter; if (number < 1) return TQString::number(number); if (number>999) { - letter = toHebrew(number/1000) + TQString::tqfromLatin1("'"); + letter = toHebrew(number/1000) + TQString::fromLatin1("'"); number = number%1000; } diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp index 766c89840..a33f0e082 100644 --- a/khtml/rendering/font.cpp +++ b/khtml/rendering/font.cpp @@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA const TQString qstr = cstr.string(); if ( scFont ) { const TQString upper = qstr.upper(); - const TQChar *uc = qstr.tqunicode(); + const TQChar *uc = qstr.unicode(); const TQFontMetrics sc_fm( *scFont ); for ( int i = 0; i < len; ++i ) { if ( (uc+i)->category() == TQChar::Letter_Lowercase ) @@ -407,7 +407,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font) /* Cache size info */ if (!scalSizesCache) scalSizesCache = new TQMap<ScalKey, TQValueList<int> >; - (*scalSizesCache)[key] = db.tqsmoothSizes(font.family(), db.styleString(font)); + (*scalSizesCache)[key] = db.smoothSizes(font.family(), db.styleString(font)); } } diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp index 3a00589e2..fce22f7c8 100644 --- a/khtml/rendering/render_applet.cpp +++ b/khtml/rendering/render_applet.cpp @@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args) KJavaApplet* applet = w ? w->applet() : 0; if ( applet ) { - applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] ); - applet->setAppletClass( args[TQString::tqfromLatin1("code") ] ); + applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] ); + applet->setAppletClass( args[TQString::fromLatin1("code") ] ); - TQString str = args[TQString::tqfromLatin1("codeBase") ]; + TQString str = args[TQString::fromLatin1("codeBase") ]; if( !str.isEmpty() ) applet->setCodeBase( str ); - str = args[TQString::tqfromLatin1("name") ]; + str = args[TQString::fromLatin1("name") ]; if( !str.isNull() ) applet->setAppletName( str ); else - applet->setAppletName( args[TQString::tqfromLatin1("code") ] ); + applet->setAppletName( args[TQString::fromLatin1("code") ] ); - str = args[TQString::tqfromLatin1("archive") ]; + str = args[TQString::fromLatin1("archive") ]; if( !str.isEmpty() ) - applet->setArchives( args[TQString::tqfromLatin1("archive") ] ); + applet->setArchives( args[TQString::fromLatin1("archive") ] ); } } diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp index 023b98e36..99fbf4f4d 100644 --- a/khtml/rendering/render_arena.cpp +++ b/khtml/rendering/render_arena.cpp @@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size) #else void* result = 0; - // Ensure we have correct tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // Check recyclers first @@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* ptr) VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr); #endif - // Ensure we have correct tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // See if it's a size that we recycle diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp index 5b30e2a58..ccbb6fad0 100644 --- a/khtml/rendering/render_block.cpp +++ b/khtml/rendering/render_block.cpp @@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) { return false; RenderObject *fc = o->firstChild(); return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 && - static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' '; + static_cast<RenderText *>(fc)->text()[0].unicode() == ' '; } RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled) diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp index 2ed114a53..930ec358c 100644 --- a/khtml/rendering/render_body.cpp +++ b/khtml/rendering/render_body.cpp @@ -81,11 +81,11 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty) } -void RenderBody::tqrepaint(Priority p) +void RenderBody::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } void RenderBody::layout() diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h index 17c237e91..7951f73e1 100644 --- a/khtml/rendering/render_body.h +++ b/khtml/rendering/render_body.h @@ -40,7 +40,7 @@ public: virtual bool isBody() const { return true; } virtual const char *renderName() const { return "RenderBody"; } - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); virtual void layout(); virtual void setStyle(RenderStyle* style); diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp index e63115361..7400752ac 100644 --- a/khtml/rendering/render_box.cpp +++ b/khtml/rendering/render_box.cpp @@ -346,7 +346,7 @@ void RenderBox::paintRootBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty) } if( !bgColor.isValid() && canvas()->view()) - bgColor = canvas()->view()->tqpalette().active().color(TQColorGroup::Base); + bgColor = canvas()->view()->palette().active().color(TQColorGroup::Base); int w = width(); int h = height(); @@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba sy+=b.y()-cy; cx=b.x();cy=b.y();cw=b.width();ch=b.height(); } - // restrict painting to tqrepaint-clip + // restrict painting to repaint-clip if (cy < clipy) { ch -= (clipy - cy); sy += (clipy - cy); @@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever setPos( box->xPos(), box->yPos() ); } -void RenderBox::tqrepaint(Priority prior) +void RenderBox::repaint(Priority prior) { int ow = style() ? style()->outlineSize() : 0; if( isInline() && !isReplaced() ) diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h index 78b85b5f4..c0c618d5c 100644 --- a/khtml/rendering/render_box.h +++ b/khtml/rendering/render_box.h @@ -87,7 +87,7 @@ public: virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp index e5947369d..e8540eba6 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -329,7 +329,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /* if ((firstChild() && firstChild()->style()->visibility() == VISIBLE) || !view()) return; - paintInfo.p->fillRect(paintInfo.r, view()->tqpalette().active().color(TQColorGroup::Base)); + paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base)); } void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) @@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints() if (!needsFullRepaint()) { TQValueList<RenderObject*>::const_iterator it; for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } - //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl; + //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl; m_dirtyChildren.clear(); } -void RenderCanvas::tqrepaint(Priority p) +void RenderCanvas::repaint(Priority p) { if (m_view && !m_staticMode) { if (p == RealtimePriority) { @@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQRect updateRect; - // Don't use tqrepaint() because it will cause all rects to + // Don't use repaint() because it will cause all rects to // be united (see khtmlview::scheduleRepaint()). Instead // just draw damage rects for objects that have a change // in selection state. @@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint) { if (o->selectionState()!=SelectionNone) if (doRepaint) - o->tqrepaint(); + o->repaint(); o->setSelectionState(SelectionNone); - o->tqrepaint(); + o->repaint(); RenderObject* no; if ( !(no = o->firstChild()) ) if ( !(no = o->nextSibling()) ) @@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint) if (m_selectionEnd) { m_selectionEnd->setSelectionState(SelectionNone); if (doRepaint) - m_selectionEnd->tqrepaint(); + m_selectionEnd->repaint(); } // set selection start & end to 0 diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index cd4ef30ca..17f279d7b 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -61,7 +61,7 @@ public: KHTMLView *view() const { return m_view; } - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); void repaintViewRectangle(int x, int y, int w, int h, bool asap=false); bool needsFullRepaint() const; diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp index 13f17c08d..69f987477 100644 --- a/khtml/rendering/render_container.cpp +++ b/khtml/rendering/render_container.cpp @@ -170,11 +170,11 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) KHTMLAssert(oldChild->parent() == this); // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or - // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child + // that a positioned child got yanked). We also repaint, so that the area exposed when the child // disappears gets repainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->tqrepaint(); + oldChild->repaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp index 97dd40468..ae579bd46 100644 --- a/khtml/rendering/render_flow.cpp +++ b/khtml/rendering/render_flow.cpp @@ -267,7 +267,7 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest } -void RenderFlow::tqrepaint(Priority prior) +void RenderFlow::repaint(Priority prior) { if (isInlineFlow()) { // Find our leftmost position. @@ -280,7 +280,7 @@ void RenderFlow::tqrepaint(Priority prior) if (curr == firstLineBox() || curr->xPos() < left) left = curr->xPos(); - // Now tqinvalidate a rectangle. + // Now invalidate a rectangle. int ow = style() ? style()->outlineSize() : 0; // We need to add in the relative position offsets of any inlines (including us) up to our @@ -306,7 +306,7 @@ void RenderFlow::tqrepaint(Priority prior) effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } else - return RenderBox::tqrepaint(prior); + return RenderBox::repaint(prior); } } diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h index 3267a92f1..1e23822bb 100644 --- a/khtml/rendering/render_flow.h +++ b/khtml/rendering/render_flow.h @@ -69,7 +69,7 @@ public: void paintLines(PaintInfo& i, int _tx, int _ty); bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction); - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index 5c53f0250..d55b32fe4 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); - TQSize s( cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ), - cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); + TQSize s( cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorWidth ), + cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); - TQSize s( rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), - rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); + TQSize s( rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), + rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth() bool empty = raw.isEmpty(); if ( empty ) - raw = TQString::tqfromLatin1("X"); + raw = TQString::fromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); TQSize s(pb->tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); - int margin = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) + - pb->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; + int margin = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, pb) + + pb->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; int w = ts.width() + margin; int h = s.height(); if (pb->isDefault() || pb->autoDefault()) { - int dbw = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; + int dbw = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; w += dbw; } @@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement() DOMString label = optElem->getAttribute(ATTR_LABEL); if (!label.isEmpty()) text = label.string(); - text = TQString::tqfromLatin1(" ")+text; + text = TQString::fromLatin1(" ")+text; } if(m_useListBox) { @@ -1406,7 +1406,7 @@ void TextAreaWidget::slotReplaceNext() } if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { - viewport()->tqsetUpdatesEnabled(false); + viewport()->setUpdatesEnabled(false); } KFind::Result res = KFind::NoMatch; @@ -1449,7 +1449,7 @@ void TextAreaWidget::slotReplaceNext() } if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { - viewport()->tqsetUpdatesEnabled(true); + viewport()->setUpdatesEnabled(true); repaintChanged(); } @@ -1738,13 +1738,13 @@ TQString RenderTextArea::text() paragraphText = paragraphText.left(pl); //Snip invented space. for (int l = 0; l < pl; ++l) { if (lindex != w->lineOfChar(p, l)) { - paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n")); + paragraphText.insert(l+ll++, TQString::fromLatin1("\n")); lindex = w->lineOfChar(p, l); } } txt += paragraphText; if (p < w->paragraphs() - 1) - txt += TQString::tqfromLatin1("\n"); + txt += TQString::fromLatin1("\n"); } } else diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index 9f58a0a4f..bc3f00be4 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -728,16 +728,16 @@ void RenderPartObject::updateWidget() HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child ); TQString aStr = p->name(); - aStr += TQString::tqfromLatin1("=\""); + aStr += TQString::fromLatin1("=\""); aStr += p->value(); - aStr += TQString::tqfromLatin1("\""); + aStr += TQString::fromLatin1("\""); TQString name_lower = p->name().lower(); - if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) { + if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) { objbase->setServiceType(p->value()); } else if (url.isEmpty() && - (name_lower == TQString::tqfromLatin1("src") || - name_lower == TQString::tqfromLatin1("movie") || - name_lower == TQString::tqfromLatin1("code"))) { + (name_lower == TQString::fromLatin1("src") || + name_lower == TQString::fromLatin1("movie") || + name_lower == TQString::fromLatin1("code"))) { url = p->value(); } params.append(aStr); @@ -754,8 +754,8 @@ void RenderPartObject::updateWidget() } } } - params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); - params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); + params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); + params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); HTMLEmbedElementImpl *embed = 0; TQString classId; @@ -775,18 +775,18 @@ void RenderPartObject::updateWidget() } classId = objbase->classId; - params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); - params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); + params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); + params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) - params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { - params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH)); } if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty()) - params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) { - params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT)); } @@ -808,7 +808,7 @@ void RenderPartObject::updateWidget() serviceType = "application/x-activex-handler"; #endif - if(classId.find(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { + if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { // It is ActiveX, but the nsplugin system handling // should also work, that's why we don't override the // serviceType with application/x-activex-handler @@ -817,17 +817,17 @@ void RenderPartObject::updateWidget() // with nspluginviewer (Niko) serviceType = "application/x-shockwave-flash"; } - else if(classId.find(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) + else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) serviceType = "audio/x-pn-realaudio-plugin"; - else if(classId.find(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || - objbase->classId.find(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) + else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || + objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) serviceType = "application/x-java-applet"; // http://www.apple.com/quicktime/tools_tips/tutorials/activex.html - else if(classId.find(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) + else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) serviceType = "video/quicktime"; // http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true - else if(objbase->classId.find(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || - classId.find(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) + else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || + classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) serviceType = "video/x-msvideo"; else diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp index f5fc70687..17c65fc9c 100644 --- a/khtml/rendering/render_generated.cpp +++ b/khtml/rendering/render_generated.cpp @@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth() generateContent(); if (str) str->deref(); - str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length()); + str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length()); str->ref(); RenderText::calcMinMaxWidth(); @@ -379,7 +379,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty) diamond[2] = TQPoint(x+s, y+2*s); diamond[3] = TQPoint(x, y+s); p->setBrush( color ); - p->tqdrawConvexPolygon( diamond, 0, 4 ); + p->drawConvexPolygon( diamond, 0, 4 ); return; } case LNONE: diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index b5357bba1..46104adb8 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if ( !berrorPic ) { //qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight); qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight, - KApplication::tqpalette().inactive(), true, 1 ); + KApplication::palette().inactive(), true, 1 ); } TQPixmap const* pix = i ? &i->pixmap() : 0; if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) ) @@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj) if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) { m_oldImage->deref( this ); m_oldImage = 0; - tqrepaint(); + repaint(); } RenderReplaced::notifyFinished(finishedObj); diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index 3427bf1dc..96b0236cb 100644 --- a/khtml/rendering/render_layer.cpp +++ b/khtml/rendering/render_layer.cpp @@ -168,7 +168,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_negZOrderList->tqat(i); + RenderLayer* child = m_negZOrderList->at(i); r += child->paintedRegion(rootLayer); } } @@ -188,19 +188,19 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->tqat(i); + RenderLayer* child = m_posZOrderList->at(i); r += child->paintedRegion(rootLayer); } } return r; } -void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) +void RenderLayer::repaint( Priority p, bool markForRepaint ) { if (markForRepaint && m_markedForRepaint) return; for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) - child->tqrepaint( p, markForRepaint ); + child->repaint( p, markForRepaint ); TQRect layerBounds, damageRect, fgrect; calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect); m_visibleRect = damageRect.intersect( layerBounds ); @@ -213,7 +213,7 @@ void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint) { if (doFullRepaint) { - m_object->tqrepaint(); + m_object->repaint(); checkForRepaint = doFullRepaint = false; } @@ -266,7 +266,7 @@ void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer) m_region = TQRect(0,0,sv->contentsWidth(),sv->contentsHeight()); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->tqat(i); + RenderLayer* child = m_posZOrderList->at(i); if (child->zIndex() == 0 && child->renderer()->style()->position() == STATIC) continue; // we don't know the widget's exact stacking position within flow m_region -= child->paintedRegion(rootLayer); @@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y) y += sy; } -void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint) +void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint) { if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) { if (x < 0) x = 0; @@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrep // Fire the scroll DOM event. m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); - // Just schedule a full tqrepaint of our object. - if (tqrepaint) - m_object->tqrepaint(RealtimePriority); + // Just schedule a full repaint of our object. + if (repaint) + m_object->repaint(RealtimePriority); if (updateScrollbars) { if (m_hBar) @@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth() #ifdef APPLE_CHANGES return m_vBar->width(); #else - return m_vBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + return m_vBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight() #ifdef APPLE_CHANGES return m_hBar->height(); #else - return m_hBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + return m_hBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds) TQScrollBar *b = m_hBar; if (!m_hBar) b = m_vBar; - int sw = b->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent); + int sw = b->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent); if (m_vBar) { TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1); @@ -898,7 +898,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_negZOrderList->tqat(i); + RenderLayer* child = m_negZOrderList->at(i); child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly); } } @@ -946,7 +946,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (uint i = 0; i < count; i++) { - RenderLayer* child = m_posZOrderList->tqat(i); + RenderLayer* child = m_posZOrderList->at(i); child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly); } } @@ -1026,7 +1026,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje if (m_posZOrderList) { uint count = m_posZOrderList->count(); for (int i = count-1; i >= 0; i--) { - RenderLayer* child = m_posZOrderList->tqat(i); + RenderLayer* child = m_posZOrderList->at(i); insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect); if (insideLayer) return insideLayer; @@ -1057,7 +1057,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje if (m_negZOrderList) { uint count = m_negZOrderList->count(); for (int i = count-1; i >= 0; i--) { - RenderLayer* child = m_negZOrderList->tqat(i); + RenderLayer* child = m_negZOrderList->at(i); insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect); if (insideLayer) return insideLayer; @@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, for (uint i = end-1; i > start; i--) { bool sorted = true; for (uint j = start; j < i; j++) { - RenderLayer* elt = buffer->tqat(j); - RenderLayer* elt2 = buffer->tqat(j+1); + RenderLayer* elt = buffer->at(j); + RenderLayer* elt2 = buffer->at(j+1); if (elt->zIndex() > elt2->zIndex()) { sorted = false; buffer->insert(j, elt2); @@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, sortByZOrder(buffer, mergeBuffer, start, mid); sortByZOrder(buffer, mergeBuffer, mid, end); - RenderLayer* elt = buffer->tqat(mid-1); - RenderLayer* elt2 = buffer->tqat(mid); + RenderLayer* elt = buffer->at(mid-1); + RenderLayer* elt2 = buffer->at(mid); // Handle the fast common case (of equal z-indices). The list may already // be completely sorted. @@ -1293,26 +1293,26 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer, uint i1 = start; uint i2 = mid; - elt = buffer->tqat(i1); - elt2 = buffer->tqat(i2); + elt = buffer->at(i1); + elt2 = buffer->at(i2); while (i1 < mid || i2 < end) { if (i1 < mid && (i2 == end || elt->zIndex() <= elt2->zIndex())) { mergeBuffer->insert(mergeBuffer->count(), elt); i1++; if (i1 < mid) - elt = buffer->tqat(i1); + elt = buffer->at(i1); } else { mergeBuffer->insert(mergeBuffer->count(), elt2); i2++; if (i2 < end) - elt2 = buffer->tqat(i2); + elt2 = buffer->at(i2); } } for (uint i = start; i < end; i++) - buffer->insert(i, mergeBuffer->tqat(i-start)); + buffer->insert(i, mergeBuffer->at(i-start)); mergeBuffer->clear(); } @@ -1471,7 +1471,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa if (negList) { for (unsigned i = 0; i != negList->count(); ++i) - writeLayers(ts, rootLayer, negList->tqat(i), paintDirtyRect, indent ); + writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent ); } if (shouldPaint) @@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa TQPtrVector<RenderLayer>* posList = l->posZOrderList(); if (posList) { for (unsigned i = 0; i != posList->count(); ++i) - writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent); + writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent); } } diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h index 1176a63a3..a8f1e5adc 100644 --- a/khtml/rendering/render_layer.h +++ b/khtml/rendering/render_layer.h @@ -190,7 +190,7 @@ public: void checkInlineRelOffset(const RenderObject* o, int& x, int& y); short scrollXOffset() { return m_scrollX; } int scrollYOffset() { return m_scrollY; } - void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true); + void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } void showScrollbar(Qt::Orientation, bool); @@ -202,7 +202,7 @@ public: void paintScrollbars(RenderObject::PaintInfo& pI); void checkScrollbarsAfterLayout(); void slotValueChanged(int); - void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false); + void repaint(Priority p=NormalPriority, bool markForRepaint = false); void updateScrollPositionFromScrollbars(); void updateLayerPosition(); diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp index c88f103d3..769b79670 100644 --- a/khtml/rendering/render_list.cpp +++ b/khtml/rendering/render_list.cpp @@ -333,7 +333,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) diamond[2] = TQPoint(x+s, y+2*s); diamond[3] = TQPoint(x, y+s); p->setBrush( color ); - p->tqdrawConvexPolygon( diamond, 0, 4 ); + p->drawConvexPolygon( diamond, 0, 4 ); return; } case LNONE: @@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) if( style()->direction() == LTR) { p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, - TQString::tqfromLatin1(". ")); + TQString::fromLatin1(". ")); } else { - const TQString& punct(TQString::tqfromLatin1(" .")); + const TQString& punct(TQString::fromLatin1(" .")); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); } } else { if (style()->direction() == LTR) { - const TQString& punct(TQString::tqfromLatin1(". ")); + const TQString& punct(TQString::fromLatin1(". ")); p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item); } else { - const TQString& punct(TQString::tqfromLatin1(" .")); + const TQString& punct(TQString::fromLatin1(" .")); p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); } @@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth() default: KHTMLAssert(false); } - m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". ")); + m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); } end: diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index 1fc72c7d8..162ca4956 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image) { - //tqrepaint bg when it finished loading + //repaint bg when it finished loading if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) { - isBody() ? canvas()->tqrepaint() : tqrepaint(); + isBody() ? canvas()->repaint() : repaint(); } } @@ -1164,15 +1164,15 @@ TQString RenderObject::information() const << " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk() << "}" << (isTableCell() ? - ( TQString::tqfromLatin1(" [r=") + + ( TQString::fromLatin1(" [r=") + TQString::number( static_cast<const RenderTableCell *>(this)->row() ) + - TQString::tqfromLatin1(" c=") + + TQString::fromLatin1(" c=") + TQString::number( static_cast<const RenderTableCell *>(this)->col() ) + - TQString::tqfromLatin1(" rs=") + + TQString::fromLatin1(" rs=") + TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) + - TQString::tqfromLatin1(" cs=") + + TQString::fromLatin1(" cs=") + TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) + - TQString::tqfromLatin1("]") ) : TQString::null ); + TQString::fromLatin1("]") ) : TQString::null ); if ( layer() ) ts << " layer=" << layer(); if ( continuation() ) @@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style) m_style->outlineWidth() > style->outlineWidth() || (!m_style->hidesOverflow() && style->hidesOverflow()) || ( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) { - // schedule a tqrepaint with the old style + // schedule a repaint with the old style if (layer() && !isInlineFlow()) - layer()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(pri); } if ( ( isFloating() && m_style->floating() != style->floating() ) || @@ -1345,7 +1345,7 @@ void RenderObject::setStyle(RenderStyle *style) } setNeedsLayoutAndMinMaxRecalc(); } else if (!isText() && d >= RenderStyle::Visible) { - // a tqrepaint is enough + // a repaint is enough if (layer()) { if (canvas() && canvas()->needsWidgetMasks()) { // update our widget masks @@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style) } } if (layer() && !isInlineFlow()) - layer()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(pri); } } } @@ -1428,9 +1428,9 @@ void RenderObject::repaintDuringLayout() if (canvas()->needsFullRepaint() || isText()) return; if (layer() && !isInlineFlow()) { - layer()->tqrepaint( NormalPriority, true ); + layer()->repaint( NormalPriority, true ); } else { - tqrepaint(); + repaint(); canvas()->deferredRepaint( this ); } } @@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con bool checkParent = ref->isInline() && !ref->isReplacedBlock() && !( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM ); vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0; - // don't allow elements nested inside text-top to have a different vtqalignment. + // don't allow elements nested inside text-top to have a different valignment. if ( va == BASELINE ) return vpos; else if ( va == LENGTH ) diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index e403601d3..f7f772387 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -441,7 +441,7 @@ public: void layoutIfNeeded() { if (needsLayout()) layout(); } // used for element state updates that can not be fixed with a - // tqrepaint and do not need a relayout + // repaint and do not need a relayout virtual void updateFromElement() {} // Called immediately after render-object is inserted @@ -681,8 +681,8 @@ public: // Used by collapsed border tables. virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles); - // force a complete tqrepaint - virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); } + // force a complete repaint + virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); } virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual unsigned int length() const { return 1; } @@ -747,7 +747,7 @@ public: virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } - // recursively tqinvalidate current layout + // recursively invalidate current layout // unused: void invalidateLayout(); virtual void calcVerticalMargins() {} diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 01379930a..7653b746c 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e ) return true; TQWidgetResizeEvent *re = static_cast<TQWidgetResizeEvent *>(e); m_widget->resize( re->w, re->h ); - tqrepaint(); + repaint(); } // eat all events - except if this is a frame (in which case KHTMLView handles it all) if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) @@ -543,10 +543,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, } } } - TQMemArray<TQRect> br = blit.tqrects(); + TQMemArray<TQRect> br = blit.rects(); const int cnt = br.size(); - const bool external = p->tqdevice()->isExtDev(); + const bool external = p->device()->isExtDev(); TQPixmap* const pm = PaintBuffer::grab( widget->size() ); if (!pm) { @@ -558,7 +558,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, if ( external ) { // even hackier! TQPainter pt( pm ); - const TQColor c = widget->tqcolorGroup().base(); + const TQColor c = widget->colorGroup().base(); for (int i = 0; i < cnt; ++i) pt.fillRect( br[i], c ); } else { @@ -672,7 +672,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // don't allow the widget to react to wheel event unless its // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. - if (tqApp->tqfocusWidget() != widget() && + if (tqApp->focusWidget() != widget() && widget()->focusPolicy() <= TQ_StrongFocus) { TQT_TQWHEELEVENT(e)->ignore(); TQApplication::sendEvent(view(), e); diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index 81d0b62ed..a71dd4116 100644 --- a/khtml/rendering/render_style.cpp +++ b/khtml/rendering/render_style.cpp @@ -726,7 +726,7 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const CbLayout: The containing block of the object needs a relayout. Layout: the RenderObject needs a relayout after the style change Visible: The change is visible, but no relayout is needed - NonVisible: The object does need neither tqrepaint nor relayout after + NonVisible: The object does need neither repaint nor relayout after the change. ### TODO: @@ -744,7 +744,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const // EUserInput _user_input : 2; as long as :enabled is not impl'd // ### this needs work to know more exactly if we need a relayout -// or just a tqrepaint +// or just a repaint // non-inherited attributes // DataRef<StyleBoxData> box; @@ -786,7 +786,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const !(noninherited_flags.f._position == other->noninherited_flags.f._position) || !(noninherited_flags.f._floating == other->noninherited_flags.f._floating) || !(noninherited_flags.f._flowAroundFloats == other->noninherited_flags.f._flowAroundFloats) || - !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) ) + !(noninherited_flags.f._unicodeBidi == other->noninherited_flags.f._unicodeBidi) ) return CbLayout; } diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h index 59e38277d..c60a7ef47 100644 --- a/khtml/rendering/render_style.h +++ b/khtml/rendering/render_style.h @@ -39,7 +39,7 @@ #include <tqfont.h> #include <tqfontmetrics.h> #include <tqptrlist.h> -#include <tqpalette.h> +#include <palette.h> #include <tqapplication.h> #include "dom/dom_misc.h" @@ -919,7 +919,7 @@ protected: PseudoId _styleType : 4; bool _hasClip : 1; unsigned _pseudoBits : 8; - EUnicodeBidi _tqunicodeBidi : 2; + EUnicodeBidi _unicodeBidi : 2; // non CSS2 non-inherited bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." @@ -991,7 +991,7 @@ protected: noninherited_flags.f._styleType = NOPSEUDO; noninherited_flags.f._hasClip = false; noninherited_flags.f._pseudoBits = 0; - noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi(); + noninherited_flags.f._unicodeBidi = initialUnicodeBidi(); noninherited_flags.f._textOverflow = initialTextOverflow(); noninherited_flags.f.unused = 0; } @@ -1108,7 +1108,7 @@ public: LengthBox clip() const { return visual->clip; } bool hasClip() const { return noninherited_flags.f._hasClip; } - EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; } + EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; } EClear clear() const { return noninherited_flags.f._clear; } ETableLayout tableLayout() const { return noninherited_flags.f._table_layout; } @@ -1272,7 +1272,7 @@ public: void setClip( Length top, Length right, Length bottom, Length left ); void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; } - void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; } + void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; } void setClear(EClear v) { noninherited_flags.f._clear = v; } void setTableLayout(ETableLayout v) { noninherited_flags.f._table_layout = v; } diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 26e9c26d5..2cf1bf1f9 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -482,7 +482,7 @@ void RenderTable::paint( PaintInfo& pI, int _tx, int _ty) #if 0 TQString m; for (uint i = 0; i < borderStyles.count(); i++) - m += TQString("%1 ").arg((*borderStyles.tqat(i)).width()); + m += TQString("%1 ").arg((*borderStyles.at(i)).width()); kdDebug(6040) << m << endl; #endif TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin(); diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index cc41a1688..f5fa2e373 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena) if (!arena) arena = renderArena(); for(unsigned int i=0; i < len; i++) { - InlineTextBox* s = m_lines.tqat(i); + InlineTextBox* s = m_lines.at(i); if (s) s->detach(arena); m_lines.remove(i); @@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth() bool firstLine = true; for(int i = 0; i < len; i++) { - unsigned short c = str->s[i].tqunicode(); + unsigned short c = str->s[i].unicode(); bool isNewline = false; // If line-breaks survive to here they are preserved @@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth() continue; int wordlen = 0; - while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) && + while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) && !(isBreakable( str->s, i+wordlen, str->l )) ) wordlen++; @@ -1328,11 +1328,11 @@ short RenderText::width() const return w; } -void RenderText::tqrepaint(Priority p) +void RenderText::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } bool RenderText::isFixedWidthFont() const @@ -1464,13 +1464,13 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) TQString result; result += '"'; for (uint i = 0; i != s.length(); ++i) { - TQChar c = s.tqat(i); + TQChar c = s.at(i); if (c == '\\') { result += "\\\\"; } else if (c == '"') { result += "\\\""; } else { - ushort u = c.tqunicode(); + ushort u = c.unicode(); if (u >= 0x20 && u < 0x7F) { result += c; } else { diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index 0923837b3..50132fbc7 100644 --- a/khtml/rendering/render_text.h +++ b/khtml/rendering/render_text.h @@ -36,7 +36,7 @@ class TQPainter; class TQFontMetrics; -// Define a constant for soft hyphen's tqunicode value. +// Define a constant for soft hyphen's unicode value. #define SOFT_HYPHEN 173 const int cNoTruncation = -1; @@ -247,7 +247,7 @@ public: virtual short marginLeft() const { return style()->marginLeft().minWidth(0); } virtual short marginRight() const { return style()->marginRight().minWidth(0); } - virtual void tqrepaint(Priority p=NormalPriority); + virtual void repaint(Priority p=NormalPriority); bool hasBreakableChar() const { return m_hasBreakableChar; } const TQFontMetrics &metrics(bool firstLine) const; diff --git a/khtml/test/align2.html b/khtml/test/align2.html index 789fa3203..56f3feb70 100644 --- a/khtml/test/align2.html +++ b/khtml/test/align2.html @@ -4,14 +4,14 @@ </HEAD> <BODY> <H1>Align Test 2</H1> -This page contains regression tests for vertical tqalignment of images. +This page contains regression tests for vertical alignment of images. Each test consist of a table with a colored background. Within the table an empty image is shown with a border of 1 pixel around it. <HR> <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT size=7>This image has no tqalignment</FONT> +<FONT size=7>This image has no alignment</FONT> </td></tr> </TABLE> <HR> @@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT size=7>This image has no tqalignment</FONT> +<FONT size=7>This image has no alignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> @@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT>This image has no tqalignment</FONT> +<FONT>This image has no alignment</FONT> </td></tr> </TABLE> <HR> @@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT>This image has no tqalignment</FONT> +<FONT>This image has no alignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html index 35d170d2a..21e002382 100644 --- a/khtml/test/image_map.html +++ b/khtml/test/image_map.html @@ -13,11 +13,11 @@ Moving the mouse cursor over the image should show different destinations <!-- =============== TOP IMAGE MAP =========== --> <MAP name="topbar"> -<AREA tqshape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> -<AREA tqshape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> -<AREA tqshape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> -<AREA tqshape="rect" coords="305,0,355,18" href="relative_url_index.html"> -<AREA tqshape="default" nohref> +<AREA shape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> +<AREA shape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> +<AREA shape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> +<AREA shape="rect" coords="305,0,355,18" href="relative_url_index.html"> +<AREA shape="default" nohref> </MAP> </BODY> diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 93c2deea5..e8be1ed1a 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -74,7 +74,7 @@ #include <tqpushbutton.h> #include <tqscrollview.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluelist.h> #include <tqwidget.h> #include <tqfileinfo.h> @@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type) getPartDOMOutput( outputStream, m_part, 0 ); } - dump.replace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) ); + dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) ); return dump; } @@ -1051,7 +1051,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" ); text.replace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" ); text.replace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" ); - if ( text.tqat( 0 ) == '\n' ) + if ( text.at( 0 ) == '\n' ) text = text.mid( 1, text.length() ); text.replace( '\n', "<br>\n" ); cl += text; @@ -1079,8 +1079,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) pos++; int newpos = absBase.find('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -1094,8 +1094,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { for (int i = relBase.string().contains('/'); i > 0; --i) @@ -1138,7 +1138,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & RenderFailure ) { renderDiff += "<pre>"; - FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" ) + FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { @@ -1154,7 +1154,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & DomFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) + FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 93f698ed2..615dfc198 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size ) : QFontEngineXLFD( fs, name, 0) { pixS = size; - ahem = TQString::tqfromLatin1(name).contains("ahem"); + ahem = TQString::fromLatin1(name).contains("ahem"); } QFakeFontEngine::~QFakeFontEngine() @@ -337,7 +337,7 @@ void DCOPClient::processSocketData( int ) } #include <tqapplication.h> -#include <tqpalette.h> +#include <palette.h> KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool , const char* ) diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index 4a2b2daa1..7765cee8a 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); a.setTopWidget(doc->widget()); TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->tqtopLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); @@ -142,7 +142,7 @@ void Dummy::doBenchmark() results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), - TQString::tqfromLatin1("Please select directory with tests")); + TQString::fromLatin1("Please select directory with tests")); if (!directory.isEmpty()) { settings.writePathEntry("path", directory); @@ -184,14 +184,14 @@ void Dummy::nextRun() for (int pos = 0; pos < timings.size(); ++pos) { int t = timings[pos]; if (pos < COLD_RUNS) - m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); + m_part->write(TQString::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); else { total += t; - m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); + m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); } } - m_part->write(TQString::tqfromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); + m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); m_part->write("</tr>"); } diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp index c49a03e78..5121e9caf 100644 --- a/khtml/xml/dom2_eventsimpl.cpp +++ b/khtml/xml/dom2_eventsimpl.cpp @@ -48,7 +48,7 @@ EventImpl::EventImpl() m_currentTarget = 0; m_eventPhase = 0; m_target = 0; - m_createTime = TQDateTime::tqcurrentDateTime(); + 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 = TQDateTime::tqcurrentDateTime(); + m_createTime = TQDateTime::currentDateTime(); m_defaultHandled = false; } @@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl m_keyVal = key->ascii(); m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key()); - // m_keyVal should contain the tqunicode value + // m_keyVal should contain the unicode value // of the pressed key if available. if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty()) - m_keyVal = TQString(key->text()).tqunicode()[0]; + m_keyVal = TQString(key->text()).unicode()[0]; // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. m_modifier = key->state(); @@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const { if (unsigned special = virtKeyVal()) if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special)) - return TQString::tqfromLatin1(id); + return TQString::fromLatin1(id); - if (unsigned tqunicode = keyVal()) - return TQString(TQChar(tqunicode)); + if (unsigned unicode = keyVal()) + return TQString(TQChar(unicode)); return "Unidentified"; } @@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg, //Figure out the code information from the key identifier. if (keyIdentifierArg.length() == 1) { - //Likely to be normal tqunicode id, unless it's one of the few + //Likely to be normal unicode id, unless it's one of the few //special values. - unsigned short code = keyIdentifierArg.tqunicode()[0]; + unsigned short code = keyIdentifierArg.unicode()[0]; if (code > 0x20 && code != 0x7F) keyVal = code; } @@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const if (m_virtKeyVal != DOM_VK_UNDEFINED) return m_virtKeyVal; else - return TQChar((unsigned short)m_keyVal).upper().tqunicode(); + return TQChar((unsigned short)m_keyVal).upper().unicode(); } int KeyboardEventImpl::charCode() const @@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg, //See whether we can get a key out of this. unsigned keyCode = 0; if (text.length() == 1) - keyCode = text.tqunicode()[0].tqunicode(); + keyCode = text.unicode()[0].unicode(); initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, keyCode, 0, 0); } int TextEventImpl::keyCode() const { - //Mozilla returns 0 here unless this is a non-tqunicode key. + //Mozilla returns 0 here unless this is a non-unicode key. //IE stuffs everything here, and so we try to match it.. if (m_keyVal) return m_keyVal; @@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const int TextEventImpl::charCode() const { - //On text events, in Mozilla charCode is 0 for non-tqunicode keys, - //and the tqunicode key otherwise... IE doesn't support this. + //On text events, in Mozilla charCode is 0 for non-unicode keys, + //and the unicode key otherwise... IE doesn't support this. if (m_virtKeyVal) return 0; return m_keyVal; diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 0f70610ef..922714a4e 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) m_namespaceMap = new IdNameMapping(1); TQString xhtml(XHTML_NAMESPACE); m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl("")); - m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length())); + m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length())); m_namespaceMap->names[emptyNamespace]->ref(); m_namespaceMap->names[xhtmlNamespace]->ref(); m_namespaceMap->count+=2; @@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text ) if (m_view) m_view->part()->resetFromScript(); m_tokenizer->setAutoClose(); - write(TQString::tqfromLatin1("<html>")); + write(TQString::fromLatin1("<html>")); } m_tokenizer->write(text, false); } diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h index 8d20f47e6..5e50c09a4 100644 --- a/khtml/xml/dom_docimpl.h +++ b/khtml/xml/dom_docimpl.h @@ -198,7 +198,7 @@ public: DocumentFragmentImpl *createDocumentFragment (); TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); } TextImpl *createTextNode ( const TQString& data ) - { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); } + { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); } CommentImpl *createComment ( DOMStringImpl* data ); CDATASectionImpl *createCDATASection ( DOMStringImpl* data ); ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data ); diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp index f4506c8ba..552ac208e 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 <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <stdlib.h> @@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.tqunicode(), kid.length()).string(); + result += TQConstString(kid.unicode(), kid.length()).string(); } result += "</"; diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index 834f4b674..5febe695e 100644 --- a/khtml/xml/dom_nodeimpl.cpp +++ b/khtml/xml/dom_nodeimpl.cpp @@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture) Event ev = evt; // removeEventListener (e.g. called from a JS event listener) might - // tqinvalidate the item after the current iterator (which "it" is pointing to). + // invalidate the item after the current iterator (which "it" is pointing to). // So we make a copy of the list. TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners; TQValueList<RegisteredEventListener>::iterator it; @@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const delete kidText; } } - return new DOMStringImpl(out.tqunicode(), out.length()); + return new DOMStringImpl(out.unicode(), out.length()); } //------------------------------------------------------------------------- @@ -1925,7 +1925,7 @@ NodeImpl *GenericRONamedNodeMapImpl::item ( unsigned long index ) const if (index >= m_contents->count()) return 0; - return m_contents->tqat(index); + return m_contents->at(index); } unsigned long GenericRONamedNodeMapImpl::length( ) const diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp index 14aa4f5ea..79bddf5d9 100644 --- a/khtml/xml/dom_stringimpl.cpp +++ b/khtml/xml/dom_stringimpl.cpp @@ -61,8 +61,8 @@ bool DOMStringImpl::containsOnlyWhitespace() const for (uint i = 0; i < l; i++) { TQChar c = s[i]; - if (c.tqunicode() <= 0x7F) { - if (c.tqunicode() > ' ') + if (c.unicode() <= 0x7F) { + if (c.unicode() > ' ') return false; } else { if (c.direction() != TQChar::DirWS) @@ -294,10 +294,10 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const int pos2; while((pos2 = str.find(' ', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); + r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos); pos = pos2+1; } - r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); return r; } @@ -320,13 +320,13 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const int pos2; while((pos2 = str.find(',', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.tqunicode()+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((TQChar *) str.tqunicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); else len--; diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h index edac46755..cd7128967 100644 --- a/khtml/xml/dom_stringimpl.h +++ b/khtml/xml/dom_stringimpl.h @@ -92,7 +92,7 @@ public: DOMStringImpl *capitalize(bool noFirstCap=false) const; DOMStringImpl *escapeHTML(); - TQChar *tqunicode() const { return s; } + TQChar *unicode() const { return s; } uint length() const { return l; } TQString string() const; diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp index 8f6164f51..7c043815a 100644 --- a/khtml/xml/xml_tokenizer.cpp +++ b/khtml/xml/xml_tokenizer.cpp @@ -42,7 +42,7 @@ using namespace DOM; using namespace khtml; XMLIncrementalSource::XMLIncrementalSource() - : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ), + : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ), m_finished( false ) { } @@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next() else if ( m_data.length() <= m_pos ) return TQXmlInputSource::EndOfData; else - return m_tqunicode[m_pos++]; + return m_unicode[m_pos++]; } void XMLIncrementalSource::setData( const TQString& str ) { m_data = str; - m_tqunicode = m_data.tqunicode(); + m_unicode = m_data.unicode(); m_pos = 0; if ( !str.isEmpty() ) m_finished = false; @@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data ) void XMLIncrementalSource::appendXML( const TQString& str ) { m_data += str; - m_tqunicode = m_data.tqunicode(); + m_unicode = m_data.unicode(); } TQString XMLIncrementalSource::data() @@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch) if (currentNode()->nodeType() == Node::TEXT_NODE) exitText(); // ### handle exceptions - currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length()))); + currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length()))); return true; } @@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d exitText(); // ### handle exceptions ProcessingInstructionImpl *pi = - m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length())); + m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length())); currentNode()->addChild(pi); pi->checkStyleSheet(); return true; @@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value) { EntityImpl *e = new EntityImpl(m_doc,name); // ### further parse entities inside the value and add them as separate nodes (or entityreferences)? - e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length()))); + e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length()))); if (m_doc->doctype()) static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e); return true; diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h index d2910472e..749c423ff 100644 --- a/khtml/xml/xml_tokenizer.h +++ b/khtml/xml/xml_tokenizer.h @@ -155,7 +155,7 @@ public: private: TQString m_data; uint m_pos; - const TQChar *m_tqunicode; + const TQChar *m_unicode; bool m_finished; }; |