From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- khtml/DESIGN.html | 2 +- khtml/css/css_base.cpp | 2 +- khtml/css/css_renderstyledeclarationimpl.cpp | 2 +- khtml/css/css_stylesheetimpl.cpp | 4 +- khtml/css/css_stylesheetimpl.h | 6 +- khtml/css/css_valueimpl.cpp | 18 +-- khtml/css/csshelper.cpp | 2 +- khtml/css/cssparser.cpp | 18 +-- khtml/css/cssproperties.c | 4 +- khtml/css/cssstyleselector.cpp | 70 +++++----- khtml/css/cssstyleselector.h | 2 +- khtml/css/html4.css | 12 +- khtml/dom/css_extensions.cpp | 6 +- khtml/dom/css_extensions.h | 8 +- khtml/dom/css_value.cpp | 8 +- khtml/dom/css_value.h | 2 +- khtml/dom/dom_doc.cpp | 4 +- khtml/dom/dom_node.h | 2 +- khtml/dom/dom_string.cpp | 18 +-- khtml/dom/dom_string.h | 2 +- khtml/dom/html_block.h | 6 +- khtml/dom/html_element.cpp | 2 +- khtml/dom/html_form.h | 2 +- khtml/dom/html_image.cpp | 2 +- khtml/dom/html_image.h | 12 +- khtml/dom/html_inline.cpp | 2 +- khtml/dom/html_inline.h | 12 +- khtml/dom/html_table.h | 26 ++-- khtml/ecma/kjs_binding.cpp | 4 +- khtml/ecma/kjs_css.cpp | 2 +- khtml/ecma/kjs_debugwin.cpp | 12 +- khtml/ecma/kjs_dom.cpp | 4 +- khtml/ecma/kjs_events.cpp | 4 +- khtml/ecma/kjs_html.cpp | 8 +- khtml/ecma/kjs_navigator.cpp | 38 ++--- khtml/ecma/kjs_proxy.cpp | 10 +- khtml/ecma/kjs_window.cpp | 88 ++++++------ khtml/ecma/xmlhttprequest.cpp | 24 ++-- khtml/html/html_baseimpl.cpp | 4 +- khtml/html/html_documentimpl.cpp | 30 ++-- khtml/html/html_elementimpl.cpp | 34 ++--- khtml/html/html_elementimpl.h | 2 +- khtml/html/html_formimpl.cpp | 20 +-- khtml/html/html_imageimpl.cpp | 22 +-- khtml/html/html_imageimpl.h | 4 +- khtml/html/html_miscimpl.cpp | 2 +- khtml/html/html_objectimpl.cpp | 8 +- khtml/html/htmltokenizer.cpp | 34 ++--- khtml/html/htmltokenizer.h | 4 +- khtml/htmlpageinfo.ui | 4 +- khtml/java/kjavaapplet.h | 2 +- khtml/java/kjavaappletcontext.cpp | 16 +-- khtml/java/kjavaappletcontext.h | 2 +- khtml/java/kjavaappletserver.cpp | 40 +++--- khtml/java/kjavaappletserver.h | 4 +- khtml/java/kjavaappletviewer.cpp | 32 ++--- khtml/java/kjavaappletwidget.cpp | 10 +- khtml/java/kjavaappletwidget.h | 4 +- khtml/java/kjavadownloader.h | 2 +- khtml/java/kjavaprocess.cpp | 2 +- khtml/khtml_caret.cpp | 12 +- khtml/khtml_caret_p.h | 4 +- khtml/khtml_ext.cpp | 8 +- khtml/khtml_factory.cpp | 4 +- khtml/khtml_factory.h | 2 +- khtml/khtml_pagecache.cpp | 12 +- khtml/khtml_pagecache.h | 4 +- khtml/khtml_part.cpp | 200 +++++++++++++-------------- khtml/khtml_part.h | 6 +- khtml/khtml_run.cpp | 2 +- khtml/khtml_settings.cc | 44 +++--- khtml/khtmlimage.cpp | 14 +- khtml/khtmlimage.h | 4 +- khtml/khtmlpart_p.h | 4 +- khtml/khtmlview.cpp | 114 +++++++-------- khtml/khtmlview.h | 10 +- khtml/kjserrordlg.ui | 2 +- khtml/kmultipart/kmultipart.cpp | 14 +- khtml/kmultipart/kmultipart.h | 2 +- khtml/misc/arena.cpp | 4 +- khtml/misc/decoder.cpp | 8 +- khtml/misc/helper.cpp | 4 +- khtml/misc/helper.h | 2 +- khtml/misc/htmlattrs.c | 4 +- khtml/misc/khtmllayout.h | 4 +- khtml/misc/knsplugininstaller.h | 2 +- khtml/misc/loader.cpp | 20 +-- khtml/misc/loader.h | 2 +- khtml/misc/loader_jpeg.cpp | 4 +- khtml/misc/loader_jpeg.h | 2 +- khtml/misc/multimap.h | 8 +- khtml/misc/stringit.h | 6 +- khtml/rendering/bidi.cpp | 28 ++-- khtml/rendering/break_lines.h | 8 +- khtml/rendering/enumerate.cpp | 2 +- khtml/rendering/font.cpp | 2 +- khtml/rendering/render_applet.cpp | 18 +-- khtml/rendering/render_arena.cpp | 4 +- khtml/rendering/render_block.cpp | 6 +- khtml/rendering/render_body.cpp | 4 +- khtml/rendering/render_body.h | 2 +- khtml/rendering/render_box.cpp | 16 +-- khtml/rendering/render_box.h | 4 +- khtml/rendering/render_canvas.cpp | 26 ++-- khtml/rendering/render_canvas.h | 8 +- khtml/rendering/render_container.cpp | 6 +- khtml/rendering/render_flow.cpp | 10 +- khtml/rendering/render_flow.h | 2 +- khtml/rendering/render_form.cpp | 40 +++--- khtml/rendering/render_frames.cpp | 42 +++--- khtml/rendering/render_frames.h | 4 +- khtml/rendering/render_generated.cpp | 2 +- khtml/rendering/render_image.cpp | 6 +- khtml/rendering/render_layer.cpp | 26 ++-- khtml/rendering/render_layer.h | 8 +- khtml/rendering/render_list.cpp | 12 +- khtml/rendering/render_object.cpp | 46 +++--- khtml/rendering/render_object.h | 16 +-- khtml/rendering/render_replaced.cpp | 22 +-- khtml/rendering/render_style.cpp | 6 +- khtml/rendering/render_style.h | 16 +-- khtml/rendering/render_table.cpp | 8 +- khtml/rendering/render_table.h | 2 +- khtml/rendering/render_text.cpp | 26 ++-- khtml/rendering/render_text.h | 4 +- khtml/test/align2.html | 10 +- khtml/test/image_map.html | 10 +- khtml/test_regression.cpp | 30 ++-- khtml/test_regression.h | 4 +- khtml/test_regression_fontoverload.cpp | 4 +- khtml/testkhtml.cpp | 12 +- khtml/testkhtml.h | 2 +- khtml/xml/dom2_eventsimpl.cpp | 32 ++--- khtml/xml/dom_docimpl.cpp | 30 ++-- khtml/xml/dom_docimpl.h | 4 +- khtml/xml/dom_elementimpl.cpp | 2 +- khtml/xml/dom_nodeimpl.cpp | 4 +- khtml/xml/dom_nodeimpl.h | 20 +-- khtml/xml/dom_restyler.cpp | 6 +- khtml/xml/dom_stringimpl.cpp | 16 +-- khtml/xml/dom_stringimpl.h | 2 +- khtml/xml/dom_xmlimpl.h | 2 +- khtml/xml/xml_tokenizer.cpp | 16 +-- khtml/xml/xml_tokenizer.h | 8 +- 144 files changed, 955 insertions(+), 955 deletions(-) (limited to 'khtml') diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html index 00af13045..ea7f73439 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).
Java related stuff.
misc:
Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the -decoder class that converts the incoming stream to unicode. +decoder class that converts the incoming stream to tqunicode.
rendering:
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.cpp b/khtml/css/css_base.cpp index 5af37b9b9..699ff6554 100644 --- a/khtml/css/css_base.cpp +++ b/khtml/css/css_base.cpp @@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const // the original namespace prefix used. Ugh. -dwh DOMString str; const CSSSelector* cs = this; - Q_UINT16 tag = localNamePart(cs->tag); + TQ_UINT16 tag = localNamePart(cs->tag); if (tag == anyLocalName && cs->match == CSSSelector::None) str = "*"; else if (tag != anyLocalName) diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp index daf607a9e..eef98f41e 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->unicodeBidi()) { + switch (style->tqunicodeBidi()) { case UBNormal: return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL); case Embed: diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp index bf85c0d59..8189a6846 100644 --- a/khtml/css/css_stylesheetimpl.cpp +++ b/khtml/css/css_stylesheetimpl.cpp @@ -235,7 +235,7 @@ void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix, } } -void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix) +void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix) { // If the stylesheet has no namespaces we can just return. There won't be any need to ever check // namespace values in selectors. @@ -253,7 +253,7 @@ void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& p Q_ASSERT(m_doc != 0); // Look up the id for this namespace URI. - Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); + TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); id = makeId(nsid, localNamePart(id)); } } diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h index e7a551947..656b59ca9 100644 --- a/khtml/css/css_stylesheetimpl.h +++ b/khtml/css/css_stylesheetimpl.h @@ -101,8 +101,8 @@ public: void deleteRule ( unsigned long index, int &exceptioncode ); void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri); - void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix); - Q_UINT32 defaultNamespace() { return m_defaultNamespace; }; + void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix); + TQ_UINT32 defaultNamespace() { return m_defaultNamespace; }; void setCharset(const DOMString &charset) { m_charset = charset; } const DOMString& charset() const { return m_charset; } @@ -123,7 +123,7 @@ public: protected: DocumentImpl *m_doc; bool m_implicit; - Q_UINT32 m_defaultNamespace; + TQ_UINT32 m_defaultNamespace; CSSNamespace* m_namespaces; DOMString m_charset; }; diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index 52e962725..0fa8bc837 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const break; } case CSSPrimitiveValue::CSS_RGBCOLOR: - if (qAlpha(m_value.rgbcolor) != 0xFF) { + if (tqAlpha(m_value.rgbcolor) != 0xFF) { if (m_value.rgbcolor == khtml::transparentColor) text = "transparent"; else - text = "rgba(" + TQString::number(qRed (m_value.rgbcolor)) + "," - + TQString::number(qBlue (m_value.rgbcolor)) + "," - + TQString::number(qGreen(m_value.rgbcolor)) + "," - + TQString::number(qAlpha(m_value.rgbcolor)/255.0) + ")"; + text = "rgba(" + TQString::number(tqRed (m_value.rgbcolor)) + "," + + TQString::number(tqBlue (m_value.rgbcolor)) + "," + + TQString::number(tqGreen(m_value.rgbcolor)) + "," + + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")"; } else { text = TQColor(m_value.rgbcolor).name(); } @@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName = parsedFontName.lower(); // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; - int pos = available.find( ',' + parsedFontName + ',', 0, false ); + int pos = available.tqfind( ',' + parsedFontName + ',', 0, false ); if ( pos == -1 ) { // many pages add extra MSs to make sure it's windows only ;( if ( parsedFontName.startsWith( "ms " ) ) parsedFontName = parsedFontName.mid( 3 ); if ( parsedFontName.endsWith( " ms" ) ) parsedFontName.truncate( parsedFontName.length() - 3 ); - pos = available.find( ",ms " + parsedFontName + ',', 0, false ); + pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false ); if ( pos == -1 ) - pos = available.find( ',' + parsedFontName + " ms,", 0, false ); + pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false ); } if ( pos != -1 ) { ++pos; - int p = available.find(',', pos); + int p = available.tqfind(',', pos); assert( p != -1 ); // available is supposed to start and end with , parsedFontName = available.mid( pos, p - pos); // kdDebug(0) << "going for '" << parsedFontName << "'" << endl; diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp index 73eff588c..f1d681bd6 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].unicode() > '\r') + if(i->s[k].tqunicode() > '\r') j->s[nl++] = i->s[k]; j->l = nl; diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index d167af025..474067cf0 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.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data, string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_rule ), string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_value ), string.tqunicode(), 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.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_decls ), string.tqunicode(), 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: // | auto | inherit + case CSS_PROP_CLIP: // | auto | inherit if ( id == CSS_VAL_AUTO ) valid_primitive = true; else if ( value->unit == Value::Function ) @@ -2125,7 +2125,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = qRgb(colorValues[0], colorValues[1], colorValues[2]); + c = tqRgb(colorValues[0], colorValues[1], colorValues[2]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* rgba + three commas */ && @@ -2136,7 +2136,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = tqRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 5 /* hsl + two commas */ && @@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[3]; if (!parseHSLParameters(value, colorValues, false)) return 0; - c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); + c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* hsla + three commas */ && @@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[4]; if (!parseHSLParameters(value, colorValues, true)) return 0; - c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else return 0; diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c index c86f2d326..894ab787f 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" - {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, + {"tqunicode-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", -"unicode-bidi", +"tqunicode-bidi", "vertical-align", "visibility", "white-space", diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 15432dcd6..abe6a89ef 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::fromLatin1( file.data() ); + TQString style = TQString::tqfromLatin1( 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::fromLatin1( file.data() ); + TQString style = TQString::tqfromLatin1( file.data() ); DOMString str(style); s_quirksSheet = new DOM::CSSStyleSheetImpl(doc); @@ -496,12 +496,12 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) unsigned int numPseudoProps = 0; // try to sort out most style rules as early as possible. - Q_UINT16 cssTagId = localNamePart(element->id()); + TQ_UINT16 cssTagId = localNamePart(element->id()); int smatch = 0; int schecked = 0; for ( unsigned int i = 0; i < selectors_size; i++ ) { - Q_UINT16 tag = localNamePart(selectors[i]->tag); + TQ_UINT16 tag = localNamePart(selectors[i]->tag); if ( cssTagId == tag || tag == anyLocalName ) { ++schecked; @@ -741,8 +741,8 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e // Cull out any useless layers and also repeat patterns into additional layers. style->adjustBackgroundLayers(); - // Only use slow repaints if we actually have a background image. - // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to + // Only use slow tqrepaints if we actually have a background image. + // FIXME: We only need to tqinvalidate 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(); @@ -828,7 +828,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, static void cleanpath(TQString &path) { int pos; - while ( (pos = path.find( "/../" )) != -1 ) { + while ( (pos = path.tqfind( "/../" )) != -1 ) { int prev = 0; if ( pos > 0 ) prev = path.findRev( "/", pos -1 ); @@ -846,9 +846,9 @@ static void cleanpath(TQString &path) // We don't want to waste a function call on the search for the anchor // in the vast majority of cases where there is no "//" in the path. int refPos = -2; - while ( (pos = path.find( "//", pos )) != -1) { + while ( (pos = path.tqfind( "//", pos )) != -1) { if (refPos == -2) - refPos = path.find("#", 0); + refPos = path.tqfind("#", 0); if (refPos > 0 && pos >= refPos) break; @@ -857,7 +857,7 @@ static void cleanpath(TQString &path) else pos += 2; } - while ( (pos = path.find( "/./" )) != -1) + while ( (pos = path.tqfind( "/./" )) != -1) path.remove( pos, 2 ); //kdDebug() << "checkPseudoState " << path << endl; } @@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded if( attr.isNull() ) { return PseudoNone; } - TQConstString cu(attr.unicode(), attr.length()); + TQConstString cu(attr.tqunicode(), attr.length()); TQString u = cu.string(); if ( !u.contains("://") ) { if ( u[0] == '/' ) @@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth) b = 0; } else { - int n = nth.find('n'); + int n = nth.tqfind('n'); if (n != -1) { if (nth[0] == '-') if (n==1) @@ -917,11 +917,11 @@ static bool matchNth(int count, const TQString& nth) else a = nth.left(n).toInt(); - int p = nth.find('+'); + int p = nth.tqfind('+'); if (p != -1) b = nth.mid(p+1).toInt(); else { - p = nth.find('-'); + p = nth.tqfind('-'); b = -nth.mid(p+1).toInt(); } } @@ -1107,10 +1107,10 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm if (sel->tag != anyQName) { int eltID = e->id(); - Q_UINT16 localName = localNamePart(eltID); - Q_UINT16 ns = namespacePart(eltID); - Q_UINT16 selLocalName = localNamePart(sel->tag); - Q_UINT16 selNS = namespacePart(sel->tag); + TQ_UINT16 localName = localNamePart(eltID); + TQ_UINT16 ns = namespacePart(eltID); + TQ_UINT16 selLocalName = localNamePart(sel->tag); + TQ_UINT16 selNS = namespacePart(sel->tag); if (localName <= ID_LAST_TAG && ns == defaultNamespace) { assert(e->isHTMLElement()); @@ -1158,22 +1158,22 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm // Be smart compare on length first if (sel_len > val_len) return false; // Selector string may not contain spaces - if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false; + if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false; if (sel_len == val_len) return (caseSensitive && !strcmp(sel->value, value)) || (!caseSensitive && !strcasecmp(sel->value, value)); // else the value is longer and can be a list if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false; - TQChar* sel_uc = sel->value.unicode(); - TQChar* val_uc = value->unicode(); + TQChar* sel_uc = sel->value.tqunicode(); + TQChar* val_uc = value->tqunicode(); TQConstString sel_str(sel_uc, sel_len); TQConstString val_str(val_uc, val_len); int pos = 0; for ( ;; ) { - pos = val_str.string().find(sel_str.string(), pos, caseSensitive); + pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive); if ( pos == -1 ) return false; if ( pos == 0 || val_uc[pos-1].isSpace() ) { int endpos = pos + sel_len; @@ -1187,34 +1187,34 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm case CSSSelector::Contain: { //kdDebug( 6080 ) << "checking for contains match" << endl; - TQConstString val_str(value->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), 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->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); const TQString& str = val_str.string(); const TQString& selStr = sel_str.string(); if(str.length() < selStr.length()) return false; // Check if str begins with selStr: - if(str.find(selStr, 0, caseSensitive) != 0) return false; + if(str.tqfind(selStr, 0, caseSensitive) != 0) return false; // It does. Check for exact match or following '-': if(str.length() != selStr.length() && str[selStr.length()] != '-') return false; @@ -2079,13 +2079,13 @@ static TQColor colorForCSSValue( int css_value ) KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support bckgrConfig.setGroup("Desktop0"); // Desktop background. - return bckgrConfig.readColorEntry("Color1", &qApp->palette().disabled().background()); + return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); } return TQColor(); } #endif - const TQPalette &pal = qApp->palette(); + const TQPalette &pal = tqApp->palette(); TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { @@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } case CSS_PROP_UNICODE_BIDI: { - HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi) + HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi) if(!primitiveValue) break; switch (primitiveValue->getIdent()) { case CSS_VAL_NORMAL: @@ -2772,7 +2772,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) col = colorForCSSValue( ident ); } else if ( primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR ) { #ifndef APPLE_CHANGES - if(qAlpha(primitiveValue->getRGBColorValue())) + if(tqAlpha(primitiveValue->getRGBColorValue())) #endif col.setRgb(primitiveValue->getRGBColorValue()); } else { diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h index 23d854bc0..1b076337e 100644 --- a/khtml/css/cssstyleselector.h +++ b/khtml/css/cssstyleselector.h @@ -290,7 +290,7 @@ public: unsigned int selector; unsigned int position; - Q_UINT32 priority; + TQ_UINT32 priority; }; /* diff --git a/khtml/css/html4.css b/khtml/css/html4.css index c3fd1a347..575945464 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; - unicode-bidi: bidi-override; + tqunicode-bidi: bidi-override; } bdo[dir="rtl"] { direction: rtl; - unicode-bidi: bidi-override; + tqunicode-bidi: bidi-override; } /* ### this selector seems to be still broken ... - *[dir="ltr"] { direction: ltr; unicode-bidi: embed } - *[dir="rtl"] { direction: rtl; unicode-bidi: embed } + *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed } + *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed } */ /* elements that are block-level in html4 */ -/* ### don't support unicode-bidi at the moment +/* ### don't support tqunicode-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 - { unicode-bidi: embed } + { tqunicode-bidi: embed } */ /* end bidi settings */ diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp index 23f7739dc..01a47d5f1 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::unicodeBidi() const +DOMString CSS2Properties::tqunicodeBidi() const { if(!impl) return 0; - return ((ElementImpl *)impl)->getAttribute("unicodeBidi"); + return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi"); } void CSS2Properties::setUnicodeBidi( const DOMString &value ) { - if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value); + if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value); } DOMString CSS2Properties::verticalAlign() const diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h index a6cdb2149..bda2cfbbc 100644 --- a/khtml/dom/css_extensions.h +++ b/khtml/dom/css_extensions.h @@ -2515,14 +2515,14 @@ public: /** * See the - * unicode-bidi property definition in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi"> + * tqunicode-bidi property definition in CSS2. * */ - DOM::DOMString unicodeBidi() const; + DOM::DOMString tqunicodeBidi() const; /** - * see unicodeBidi + * see tqunicodeBidi */ void setUnicodeBidi( const DOM::DOMString & ); diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp index de450e861..20faff88a 100644 --- a/khtml/dom/css_value.cpp +++ b/khtml/dom/css_value.cpp @@ -126,7 +126,7 @@ void CSSStyleDeclaration::setProperty( const DOMString &propName, const DOMStrin if (!id) return; bool important = false; TQString str = priority.string(); - if (str.find("important", 0, false) != -1) + if (str.tqfind("important", 0, false) != -1) important = true; static_cast(impl)->setProperty( id, value, important ); @@ -500,17 +500,17 @@ RGBColor::~RGBColor() CSSPrimitiveValue RGBColor::red() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::green() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::blue() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index 5d4a043c7..7523a2797 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 + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape"> * rect 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 0ff123444..088a7a94a 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::fromLatin1("") + title.string() + - TQString::fromLatin1("")); + r->write(TQString::tqfromLatin1("") + title.string() + + TQString::tqfromLatin1("")); return r; } diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h index 37889eec2..4ddd4ffb1 100644 --- a/khtml/dom/dom_node.h +++ b/khtml/dom/dom_node.h @@ -875,7 +875,7 @@ public: * not part of the DOM. * @returns the element id, in case this is an element, 0 otherwise */ - Q_UINT32 elementId() const; + TQ_UINT32 elementId() const; /** * tests if this Node is 0. Useful especially, if casting to a derived diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp index 14bdc2613..f8487cf5a 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.unicode(), str.length() ); + impl = new DOMStringImpl( str.tqunicode(), str.length() ); impl->ref(); } @@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const return true; } -TQChar *DOMString::unicode() const +TQChar *DOMString::tqunicode() const { if(!impl) return 0; - return impl->unicode(); + return impl->tqunicode(); } 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.unicode(); - const TQChar *b = bs.unicode(); + const TQChar *a = as.tqunicode(); + const TQChar *b = bs.tqunicode(); 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.unicode(); + const TQChar *a = as.tqunicode(); 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.unicode(), b.unicode(), l*sizeof(TQChar))) + if(!memcmp(a.tqunicode(), b.tqunicode(), 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.unicode(), b.unicode(), l*sizeof(TQChar))) + if(!memcmp(a.tqunicode(), b.tqunicode(), 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++ ).unicode() != c ) + if ( !c || ( *aptr++ ).tqunicode() != c ) return false; } } diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h index 3fe725f68..69f2f7b13 100644 --- a/khtml/dom/dom_string.h +++ b/khtml/dom/dom_string.h @@ -97,7 +97,7 @@ public: */ DOMString upper() const; - TQChar *unicode() const; + TQChar *tqunicode() const; TQString string() const; int toInt() const; diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h index 43be3660d..e57c311cd 100644 --- a/khtml/dom/html_block.h +++ b/khtml/dom/html_block.h @@ -105,7 +105,7 @@ public: ~HTMLDivElement(); /** - * Horizontal text alignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text alignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text alignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_element.cpp b/khtml/dom/html_element.cpp index 0a2c15e53..0063985ea 100644 --- a/khtml/dom/html_element.cpp +++ b/khtml/dom/html_element.cpp @@ -177,7 +177,7 @@ HTMLCollection HTMLElement::all() const void HTMLElement::assignOther( const Node &other, int elementId ) { - if (other.elementId() != static_cast(elementId)) { + if (other.elementId() != static_cast(elementId)) { if ( impl ) impl->deref(); impl = 0; } else { diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h index 0623e421b..ef318ba06 100644 --- a/khtml/dom/html_form.h +++ b/khtml/dom/html_form.h @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text alignment relative to \c FIELDSET . See the * align attribute definition 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 f7c9dac26..a5cdb3b71 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref ) } } -DOMString HTMLAreaElement::shape() const +DOMString HTMLAreaElement::tqshape() 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 9f30aaa14..9b1334c83 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 shape for the shape of the + * geometry. See also \c tqshape for the tqshape of the * region. See the * coords attribute definition in HTML 4.0. @@ -131,16 +131,16 @@ public: void setNoHref( bool ); /** - * The shape of the active area. The coordinates are given by + * The tqshape of the active area. The coordinates are given by * \c coords . See the - * shape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> + * tqshape attribute definition in HTML 4.0. * */ - DOMString shape() const; + DOMString tqshape() const; /** - * see shape + * see tqshape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 568761685..9f40da2fb 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::shape() const +DOMString HTMLAnchorElement::tqshape() 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 6c1b2d2a2..d5c11d515 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 shape for the shape of the + * geometry. See also \c tqshape for the tqshape of the * region. See the * coords attribute definition in HTML 4.0. @@ -168,16 +168,16 @@ public: void setRev( const DOMString & ); /** - * The shape of the active area. The coordinates are given by + * The tqshape of the active area. The coordinates are given by * \c coords . See the - * shape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> + * tqshape attribute definition in HTML 4.0. * */ - DOMString shape() const; + DOMString tqshape() const; /** - * see shape + * see tqshape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h index c3a364d47..69d163723 100644 --- a/khtml/dom/html_table.h +++ b/khtml/dom/html_table.h @@ -63,7 +63,7 @@ public: ~HTMLTableCaptionElement(); /** - * Caption alignment with respect to the table. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -134,7 +134,7 @@ public: void setAbbr( const DOMString & ); /** - * Horizontal alignment of data in cell. See the * align attribute definition in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the * charoff attribute definition in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical alignment of data in cell. See the * valign attribute definition in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal alignment of cell data in column. See the * align attribute definition in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the * charoff attribute definition in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical alignment of cell data in column. See the * valign attribute definition in HTML 4.0. * @@ -790,7 +790,7 @@ public: void setCells( const HTMLCollection & ); /** - * Horizontal alignment of data within cells of this row. See the + * Horizontal tqalignment of data within cells of this row. See the * * align attribute definition in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the * charoff attribute definition in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical alignment of data within cells of this row. See the * valign attribute definition in HTML 4.0. * @@ -913,7 +913,7 @@ public: ~HTMLTableSectionElement(); /** - * Horizontal alignment of data in cells. See the \c align + * Horizontal tqalignment of data in cells. See the \c align * attribute for HTMLTheadElement for details. * */ @@ -938,7 +938,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the * charoff attribute definition in HTML 4.0. * @@ -951,7 +951,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical alignment of data in cells. See the \c valign + * Vertical tqalignment 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 f9dd291d7..b67e206f0 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.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), 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.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/khtml/ecma/kjs_css.cpp b/khtml/ecma/kjs_css.cpp index b42f9dd02..ea651336e 100644 --- a/khtml/ecma/kjs_css.cpp +++ b/khtml/ecma/kjs_css.cpp @@ -185,7 +185,7 @@ void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyN if (propvalue.isEmpty()) styleDecl.removeProperty(prop); else { - int important = propvalue.find("!important", 0, false); + int important = propvalue.tqfind("!important", 0, false); if (important == -1) styleDecl.setProperty(prop, DOM::DOMString(propvalue), ""); else diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index eeb126ebb..8e5cf5dae 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile) } TQString code = sourceFile->getCode(); - const TQChar *chars = code.unicode(); + const TQChar *chars = code.tqunicode(); uint len = code.length(); TQChar newLine('\n'); TQChar cr('\r'); @@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - KHTMLPart *part = ::qt_cast(static_cast(interpreter)->part()); + KHTMLPart *part = ::tqqt_cast(static_cast(interpreter)->part()); if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast(exec->interpreter())->part(); - KHTMLPart *khtmlpart = ::qt_cast(part); + KHTMLPart *khtmlpart = ::tqqt_cast(part); if (khtmlpart && !khtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; @@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch if (dontShowAgain) { KConfig *config = kapp->config(); - KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); + KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings")); config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0)); config->sync(); TQByteArray data; @@ -1020,7 +1020,7 @@ void KJSDebugWin::enterSession(ExecState *exec) updateContextList(); - qApp->enter_loop(); // won't return until leaveSession() is called + tqApp->enter_loop(); // won't return until leaveSession() is called } void KJSDebugWin::leaveSession() @@ -1043,7 +1043,7 @@ void KJSDebugWin::leaveSession() enableOtherWindows(); } - qApp->exit_loop(); + tqApp->exit_loop(); } void KJSDebugWin::updateContextList() diff --git a/khtml/ecma/kjs_dom.cpp b/khtml/ecma/kjs_dom.cpp index 08afc6aab..1231c5710 100644 --- a/khtml/ecma/kjs_dom.cpp +++ b/khtml/ecma/kjs_dom.cpp @@ -1088,7 +1088,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List Window* active = Window::retrieveActive(exec); // Complete the URL using the "active part" (running interpreter). We do this for the security // check and to make sure we load exactly the same url as we have verified to be safe - KHTMLPart *khtmlpart = ::qt_cast(active->part()); + KHTMLPart *khtmlpart = ::tqqt_cast(active->part()); if (khtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = khtmlpart->htmlDocument().completeURL(s).string(); @@ -1274,7 +1274,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c case DOMDOMImplementation::CreateDocument: { // DOM2 // Initially set the URL to document of the creator... this is so that it resides in the same // host/domain for security checks. The URL will be updated if Document.load() is called. - KHTMLPart *part = ::qt_cast(static_cast(exec->interpreter())->part()); + KHTMLPart *part = ::tqqt_cast(static_cast(exec->interpreter())->part()); if (part) { Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); KURL url = static_cast(part->document().handle())->URL(); diff --git a/khtml/ecma/kjs_events.cpp b/khtml/ecma/kjs_events.cpp index 1144e723b..38664c1b2 100644 --- a/khtml/ecma/kjs_events.cpp +++ b/khtml/ecma/kjs_events.cpp @@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - KHTMLPart *part = ::qt_cast(static_cast(win.imp())->part()); + KHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - KHTMLPart *part = ::qt_cast(static_cast(win.imp())->part()); + KHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp index 57762ffd3..3fdc35bb2 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 - shape KJS::HTMLElement::AnchorShape DontDelete + tqshape 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 - shape KJS::HTMLElement::AreaShape DontDelete + tqshape 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.shape()); + case AnchorShape: return String(anchor.tqshape()); 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.shape()); + case AreaShape: return String(area.tqshape()); 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 a5c793357..b8712e01b 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::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) { //kdDebug() << "appName -> Mozilla" << endl; return String("Netscape"); } - if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) { //kdDebug() << "appName -> IE" << endl; return String("Microsoft Internet Explorer"); @@ -204,17 +204,17 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror"); case AppVersion: // We assume the string is something like Mozilla/version (properties) - return String(userAgent.mid(userAgent.find('/') + 1)); + return String(userAgent.mid(userAgent.tqfind('/') + 1)); case Product: // We are pretending to be Mozilla or Safari - if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) { return String("Gecko"); } // When spoofing as IE, we use Undefined(). - if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) { return Undefined(); } @@ -222,9 +222,9 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror/khtml"); case ProductSub: { - int ix = userAgent.find("Gecko"); - if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') && - userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6) + int ix = userAgent.tqfind("Gecko"); + if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') && + userAgent.tqfind(TQRegExp("\\d{8}"), ix+6) == ix+6) { // We have Gecko/ in the UA string return String(userAgent.mid(ix+6, 8)); @@ -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::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")); + if ( (userAgent.tqfind(TQString::tqfromLatin1("Win"),0,false)>=0) ) + return String(TQString::tqfromLatin1("Win32")); + else if ( (userAgent.tqfind(TQString::tqfromLatin1("Macintosh"),0,false)>=0) || + (userAgent.tqfind(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) ) + return String(TQString::tqfromLatin1("MacPPC")); else { struct utsname name; int ret = uname(&name); if ( ret >= 0 ) - return String(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); + return String(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); else // can't happen - return String(TQString::fromLatin1("Unix X11")); + return String(TQString::tqfromLatin1("Unix X11")); } case CpuClass: { diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp index ca26c5a0b..55e9aeff6 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::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("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::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1 && - userAgent.find(TQString::fromLatin1("KHTML")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1 && + userAgent.tqfind(TQString::tqfromLatin1("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 90123aec6..5fe2ef33e 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -421,7 +421,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p) Object obj = Object::dynamicCast( retrieve( p ) ); #ifndef NDEBUG // obj should never be null, except when javascript has been disabled in that part. - KHTMLPart *part = ::qt_cast(p); + KHTMLPart *part = ::tqqt_cast(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - KHTMLPart * part = ::qt_cast(p); + KHTMLPart * part = ::tqqt_cast(p); KJSProxy *proxy = 0L; if (!part) { - part = ::qt_cast(p->parent()); + part = ::tqqt_cast(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -478,7 +478,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast(this)->m_frames = new FrameArray(exec, part)); @@ -516,7 +516,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part) return false; @@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); // properties that work on all windows if (entry) { @@ -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()->topLevelWidget()->winId()); + KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId()); return Number(entry->value == OuterHeight ? inf.geometry().height() : inf.geometry().width()); #else @@ -1085,7 +1085,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { @@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1240,7 +1240,7 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part) { kdDebug(6070) << "closeNow on non KHTML part" << endl; } else { @@ -1288,7 +1288,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part) return true; // not a KHTMLPart @@ -1301,7 +1301,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - KHTMLPart *activeKHTMLPart = ::qt_cast(activePart); + KHTMLPart *activeKHTMLPart = ::tqqt_cast(activePart); if (!activeKHTMLPart) return true; // not a KHTMLPart @@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle()); @@ -1339,7 +1339,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle()); @@ -1357,7 +1357,7 @@ Value Window::getListener(ExecState *exec, int eventId) const JSEventListener *Window::getJSEventListener(const Value& val, bool html) { // This function is so hot that it's worth coding it directly with imps. - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - KHTMLPart *part = ::qt_cast(m_frame->m_part); - KHTMLPart *active_part = ::qt_cast(active->part()); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); + KHTMLPart *active_part = ::tqqt_cast(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -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::fromLatin1("javascript:"), 0, false) != 0 ) + dstUrl.tqfind(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) part->scheduleRedirection(-1, dstUrl, lockHistory); @@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1488,7 +1488,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1531,7 +1531,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - KHTMLPart *part = ::qt_cast(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(m_frame->m_part); if (!part) return Undefined(); KHTMLView *widget = part->view(); @@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - KHTMLPart* p = ::qt_cast(Window::retrieveActive(exec)->m_frame->m_part); + KHTMLPart* p = ::tqqt_cast(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1602,7 +1602,7 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - KHTMLPart *p = ::qt_cast(m_frame->m_part); + KHTMLPart *p = ::tqqt_cast(m_frame->m_part); KHTMLView *widget = p->view(); KParts::WindowArgs winargs; @@ -1618,11 +1618,11 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString while (it != flist.end()) { TQString s = *it++; TQString key, val; - int pos = s.find('='); + int pos = s.tqfind('='); if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); + TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget()); 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*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.height = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( 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*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.width = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.width > screen.width()) // should actually check workspace winargs.width = screen.width(); if (winargs.width < 100) @@ -1703,7 +1703,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString // request window (new or existing if framename is set) KParts::ReadOnlyPart *newPart = 0L; emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); - if (newPart && ::qt_cast(newPart)) { + if (newPart && ::tqqt_cast(newPart)) { KHTMLPart *khtmlpart = static_cast(newPart); //qDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); khtmlpart->setOpener(p); @@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - KHTMLPart *part = ::qt_cast( m_frame->m_part ); + KHTMLPart *part = ::tqqt_cast( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1760,7 +1760,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast(thisObj.imp()); TQString str, str2; - KHTMLPart *part = ::qt_cast(window->m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(window->m_frame->m_part); if (!part) return Undefined(); @@ -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->topLevelWidget()->raise(); - KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); + widget->tqtopLevelWidget()->raise(); + KWin::deIconifyWindow( widget->tqtopLevelWidget()->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->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); 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->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); 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->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); 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->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) ); } return Undefined(); @@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - KHTMLPart *part = ::qt_cast(window->m_frame->m_part); + KHTMLPart *part = ::tqqt_cast(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast(part->jScript()->interpreter()); @@ -2353,10 +2353,10 @@ DateTimeMS DateTimeMS::now() { DateTimeMS t; TQTime before = TQTime::currentTime(); - t.mDate = TQDate::currentDate(); + t.mDate = TQDate::tqcurrentDate(); t.mTime = TQTime::currentTime(); if (t.mTime < before) - t.mDate = TQDate::currentDate(); // prevent race condition in hacky way :) + t.mDate = TQDate::tqcurrentDate(); // prevent race condition in hacky way :) return t; } @@ -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::fromLatin1("") ); + return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") ); case Protocol: return String( url.protocol()+":" ); case Search: @@ -2590,7 +2590,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att TQString str = v.toString(exec).qstring(); switch (entry->value) { case Href: { - KHTMLPart* p =::qt_cast(Window::retrieveActive(exec)->part()); + KHTMLPart* p =::tqqt_cast(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2603,8 +2603,8 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att url.setRef(str); break; case Host: { - TQString host = str.left(str.find(":")); - TQString port = str.mid(str.find(":")+1); + TQString host = str.left(str.tqfind(":")); + TQString port = str.mid(str.tqfind(":")+1); url.setHost(host); url.setPort(port.toUInt()); break; @@ -2681,7 +2681,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - KHTMLPart *khtmlpart = ::qt_cast(part); + KHTMLPart *khtmlpart = ::tqqt_cast(part); if (khtmlpart) khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index b20515de7..a2095769f 100644 --- a/khtml/ecma/xmlhttprequest.cpp +++ b/khtml/ecma/xmlhttprequest.cpp @@ -395,7 +395,7 @@ void XMLHttpRequest::send(const TQString& _body) // through setRequestHeader. NOTE: the user can still disable // this feature at the protocol level (kio_http). // ### does find() ever succeed? the headers are stored in lower case! - if (requestHeaders.find("Referer") == requestHeaders.end()) { + if (requestHeaders.tqfind("Referer") == requestHeaders.end()) { KURL documentURL(doc->URL()); documentURL.setPass(TQString::null); documentURL.setUser(TQString::null); @@ -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::fromLatin1(BANNED_HTTP_HEADERS)); + TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); if (bannedHeaders.contains(name)) return; // Denied @@ -501,7 +501,7 @@ Value XMLHttpRequest::getAllResponseHeaders() const return Undefined(); } - int endOfLine = responseHeaders.find("\n"); + int endOfLine = responseHeaders.tqfind("\n"); if (endOfLine == -1) { return Undefined(); @@ -535,7 +535,7 @@ Value XMLHttpRequest::getResponseHeader(const TQString& name) const return Undefined(); } - int endOfLine = responseHeaders.find("\n", headerLinePos + matchLength); + int endOfLine = responseHeaders.tqfind("\n", headerLinePos + matchLength); return String(responseHeaders.mid(headerLinePos + matchLength, endOfLine - (headerLinePos + matchLength)).stripWhiteSpace()); } @@ -546,10 +546,10 @@ static Value httpStatus(const TQString& response, bool textStatus = false) return Undefined(); } - int endOfLine = response.find("\n"); + int endOfLine = response.tqfind("\n"); TQString firstLine = (endOfLine == -1) ? response : response.left(endOfLine); - int codeStart = firstLine.find(" "); - int codeEnd = firstLine.find(" ", codeStart + 1); + int codeStart = firstLine.tqfind(" "); + int codeEnd = firstLine.tqfind(" ", codeStart + 1); if (codeStart == -1 || codeEnd == -1) { return Undefined(); @@ -643,9 +643,9 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) // NOTE: Replace a 304 response with a 200! Both IE and Mozilla do this. // Problem first reported through bug# 110272. - int codeStart = responseHeaders.find("304"); + int codeStart = responseHeaders.tqfind("304"); if ( codeStart != -1) { - int codeEnd = responseHeaders.find("\n", codeStart+3); + int codeEnd = responseHeaders.tqfind("\n", codeStart+3); if (codeEnd != -1) responseHeaders.replace(codeStart, (codeEnd-codeStart), "200 OK"); } @@ -659,11 +659,11 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) #endif if ( decoder == NULL ) { - int pos = responseHeaders.find("content-type:", 0, false); + int pos = responseHeaders.tqfind("content-type:", 0, false); if ( pos > -1 ) { pos += 13; - int index = responseHeaders.find('\n', pos); + int index = responseHeaders.tqfind('\n', pos); TQString type = responseHeaders.mid(pos, (index-pos)); index = type.find (';'); if (index > -1) @@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - KHTMLPart *part = ::qt_cast(Window::retrieveActive(exec)->part()); + KHTMLPart *part = ::tqqt_cast(Window::retrieveActive(exec)->part()); if (!part) return Undefined(); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp index 9ebe26242..0ed4e4888 100644 --- a/khtml/html/html_baseimpl.cpp +++ b/khtml/html/html_baseimpl.cpp @@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast( m_render ); - if(render->widget() && ::qt_cast( render->widget()) ) + if(render->widget() && ::tqqt_cast( render->widget()) ) return static_cast( render->widget() )->part()->xmlDocImpl(); return 0; @@ -426,7 +426,7 @@ KHTMLPart* HTMLFrameElementImpl::contentPart() const RenderPart* render = static_cast( m_render ); - if(render->widget() && ::qt_cast( render->widget()) ) + if(render->widget() && ::tqqt_cast( render->widget()) ) return static_cast( render->widget() )->part(); return 0; diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index e2ee3ba57..a38f6c2fb 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->topLevelWidget() ) - windowId = v->topLevelWidget()->winId(); + if ( v && v->tqtopLevelWidget() ) + windowId = v->tqtopLevelWidget()->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->topLevelWidget() ) - windowId = v->topLevelWidget()->winId(); + if ( v && v->tqtopLevelWidget() ) + windowId = v->tqtopLevelWidget()->winId(); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -226,18 +226,18 @@ void HTMLDocumentImpl::slotHistoryChanged() return; recalcStyle( Force ); - m_render->repaint(); + m_render->tqrepaint(); } HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) { TQString url = _url.string(); TQString s; - int pos = url.find('#'); + int pos = url.tqfind('#'); //kdDebug(0) << "map pos of #:" << pos << endl; - s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1); + s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); - TQMapConstIterator it = mapMap.find(s); + TQMapConstIterator it = mapMap.tqfind(s); if (it != mapMap.end()) return *it; @@ -297,7 +297,7 @@ static int parseDocTypePart(const TQString& buffer, int index) else if (ch == '-') { int tmpIndex=index; if (buffer[index+1] == '-' && - ((tmpIndex=buffer.find("--", index+2)) != -1)) + ((tmpIndex=buffer.tqfind("--", index+2)) != -1)) index = tmpIndex+2; else return index; @@ -330,7 +330,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // Skip through any comments and processing instructions. int index = 0; do { - index = buffer.find('<', index); + index = buffer.tqfind('<', index); if (index == -1) break; TQChar nextChar = buffer[index+1]; if (nextChar == '!') { @@ -340,10 +340,10 @@ static bool parseDocTypeDeclaration(const TQString& buffer, break; } index = parseDocTypePart(buffer,index); - index = buffer.find('>', index); + index = buffer.tqfind('>', index); } else if (nextChar == '?') - index = buffer.find('>', index); + index = buffer.tqfind('>', index); else break; } while (index != -1); @@ -371,7 +371,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // |start| is the first character (after the quote) and |end| // is the final quote, so there are |end|-|start| characters. int publicIDStart = index+1; - int publicIDEnd = buffer.find(theChar, publicIDStart); + int publicIDEnd = buffer.tqfind(theChar, publicIDStart); if (publicIDEnd == -1) return false; index = parseDocTypePart(buffer, publicIDEnd+1); @@ -385,7 +385,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // We have a system identifier. *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID; int systemIDStart = index+1; - int systemIDEnd = buffer.find(next, systemIDStart); + int systemIDEnd = buffer.tqfind(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); @@ -410,7 +410,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, if (next != '\"' && next != '\'') return false; int systemIDStart = index+1; - int systemIDEnd = buffer.find(next, systemIDStart); + int systemIDEnd = buffer.tqfind(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index e6269d8b5..a5931cd41 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.unicode(); + const TQChar* s = v.tqunicode(); 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 >= '0' && c <= '9') - ? (c.unicode() - '0') + ? (c.tqunicode() - '0') : ( ( c >= 'a' && c <= 'f' ) - ? (c.unicode() - 'a' + 10) + ? (c.tqunicode() - 'a' + 10) : ( ( c >= 'A' && c <= 'F' ) - ? (c.unicode() - 'A' + 10) + ? (c.tqunicode() - '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.unicode(), kid.length()).string(); + result += TQConstString(kid.tqunicode(), kid.length()).string(); } return result; } @@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode ) appendChild( t, exceptioncode ); } -void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) +void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment ) { - //qDebug("alignment is %s", alignment.string().latin1() ); - // vertical alignment with respect to the current baseline of the text + //qDebug("tqalignment is %s", tqalignment.string().latin1() ); + // vertical tqalignment with respect to the current baseline of the text // right or left means floating images int propfloat = -1; int propvalign = -1; - if ( strcasecmp( alignment, "absmiddle" ) == 0 ) { + if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) { propvalign = CSS_VAL_BOTTOM; - } else if ( strcasecmp( alignment, "left" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "left" ) == 0 ) { propfloat = CSS_VAL_LEFT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "right" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "right" ) == 0 ) { propfloat = CSS_VAL_RIGHT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "top" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "middle" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) { propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; - } else if ( strcasecmp( alignment, "center" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) { propvalign = CSS_VAL_BASELINE; - } else if ( strcasecmp ( alignment, "texttop") == 0 ) { + } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) { propvalign = CSS_VAL_TEXT_TOP; } diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h index f71ae9b23..83836f15d 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 alignment ); + void addHTMLAlignment( DOMString tqalignment ); }; class HTMLGenericElementImpl : public HTMLElementImpl diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index a72df3743..530eb5fb7 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri enc_string.append(c); else { TQString ampersandEscape; - ampersandEscape.sprintf("&#%u;", c.unicode()); + ampersandEscape.sprintf("&#%u;", c.tqunicode()); enc_string.append(ampersandEscape); } } @@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) void HTMLFormElementImpl::setEnctype( const DOMString& type ) { - if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1) + if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1) { m_enctype = "multipart/form-data"; m_multipart = true; m_post = true; - } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1) + } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1) { m_enctype = "text/plain"; m_multipart = false; @@ -1316,10 +1316,10 @@ TQString HTMLInputElementImpl::state( ) { switch (m_type) { case PASSWORD: - return TQString::fromLatin1("."); // empty string, avoid restoring + return TQString::tqfromLatin1("."); // empty string, avoid restoring case CHECKBOX: case RADIO: - return TQString::fromLatin1(checked() ? "on" : "off"); + return TQString::tqfromLatin1(checked() ? "on" : "off"); case TEXT: if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view()) getDocument()->view()->addFormCompletionItem(name().string(), value().string()); @@ -1334,7 +1334,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state) switch (m_type) { case CHECKBOX: case RADIO: - setChecked((state == TQString::fromLatin1("on"))); + setChecked((state == TQString::tqfromLatin1("on"))); break; case FILE: m_value = DOMString(state.left(state.length()-1)); @@ -1560,12 +1560,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis if(m_clicked) { m_clicked = false; - TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x"); + TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x"); encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickX(), 0 )); encoding += fixUpfromUnicode(codec, astr); - astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y"; + astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y"; encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickY(), 0 ) ); encoding += fixUpfromUnicode(codec, astr); @@ -1612,7 +1612,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(m_render)->widget()->topLevelWidget(); + TQWidget* const toplevel = static_cast(m_render)->widget()->tqtopLevelWidget(); if (multipart) { TQCString filearray( "" ); if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) { @@ -2756,7 +2756,7 @@ static TQString expandLF(const TQString& s) for(unsigned pos = 0; pos < len; pos++) { TQChar c = s.at(pos); - switch(c.unicode()) + switch(c.tqunicode()) { case '\n': r[pos2++] = '\r'; diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index be13e93c2..9ced3bf1b 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.unicode() == '#') - name = TQString(s.unicode()+1, s.length()-1).lower(); + if(*s.tqunicode() == '#') + name = TQString(s.tqunicode()+1, s.length()-1).lower(); else name = s.string().lower(); // ### make this work for XML documents, e.g. in case of @@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc) m_coords=0; m_coordsLen = 0; nohref = false; - shape = Unknown; + tqshape = Unknown; lasth = lastw = -1; } @@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr) { case ATTR_SHAPE: if ( strcasecmp( attr->value(), "default" ) == 0 ) - shape = Default; + tqshape = Default; else if ( strcasecmp( attr->value(), "circle" ) == 0 ) - shape = Circle; + tqshape = Circle; else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 ) - shape = Poly; + tqshape = Poly; else if ( strcasecmp( attr->value(), "rect" ) == 0 ) - shape = Rect; + tqshape = 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 ((shape==Poly || shape==Unknown) && m_coordsLen > 5) { + if ((tqshape==Poly || tqshape==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 (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) { + else if (tqshape==Circle && m_coordsLen>=3 || tqshape==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 (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) { + else if (tqshape==Rect && m_coordsLen>=4 || tqshape==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 (shape==Default) + else if (tqshape==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 6f26cd2df..1a389e895 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 shape==Default; } + bool isDefault() const { return tqshape==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 shape : 3; + Shape tqshape : 3; bool nohref : 1; }; diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index 58804bff5..1528fa942 100644 --- a/khtml/html/html_miscimpl.cpp +++ b/khtml/html/html_miscimpl.cpp @@ -290,7 +290,7 @@ TQValueList HTMLCollectionImpl::namedItems( const DOMString &name ) c //remember stuff about elements we were asked for. m_cache->updateNodeListInfo(m_refNode->getDocument()); CollectionCache* cache = static_cast(m_cache); - if (TQValueList* info = cache->nameCache.find(key)) { + if (TQValueList* info = cache->nameCache.tqfind(key)) { return *info; } else { diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp index 106a862e9..5ed1e11f3 100644 --- a/khtml/html/html_objectimpl.cpp +++ b/khtml/html/html_objectimpl.cpp @@ -57,7 +57,7 @@ HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc) void HTMLObjectBaseElementImpl::setServiceType(const TQString & val) { serviceType = val.lower(); - int pos = serviceType.find( ";" ); + int pos = serviceType.tqfind( ";" ); if ( pos!=-1 ) serviceType.truncate( pos ); } @@ -160,9 +160,9 @@ void HTMLObjectBaseElementImpl::attach() { if (serviceType.isEmpty() && url.startsWith("data:")) { // Extract the MIME type from the data URL. - int index = url.find(';'); + int index = url.tqfind(';'); if (index == -1) - index = url.find(','); + index = url.tqfind(','); if (index != -1) { int len = index - 5; if (len > 0) @@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast( m_render )->widget(); - if( widget && ::qt_cast( widget ) ) + if( widget && ::tqqt_cast( widget ) ) return static_cast( widget )->part()->xmlDocImpl(); return 0; } diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 5da6edd14..d1d009d39 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -89,7 +89,7 @@ static const char titleEnd [] = "' || ch == '/' || ch <= ' ' ) && ch && scriptCodeSize >= searchStopperLen && - !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) { + !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) { scriptCodeResync = scriptCodeSize-searchStopperLen+1; tquote = NoQuote; continue; @@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) if (strict) { - if (src->unicode() == '-') { + if (src->tqunicode() == '-') { delimiterCount++; if (delimiterCount == 2) { delimiterCount = 0; @@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) delimiterCount = 0; } - if ((!strict || canClose) && src->unicode() == '>') + if ((!strict || canClose) && src->tqunicode() == '>') { 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->unicode() == '>' && + if (src->tqunicode() == '>' && 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->unicode(); + ushort cc = src->tqunicode(); switch(Entity) { case NoEntity: return; @@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) case Hexadecimal: { - int uc = EntityChar.unicode(); + int uc = EntityChar.tqunicode(); int ll = kMin(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.unicode(); + int uc = EntityChar.tqunicode(); 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.unicode() << endl; + kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl; #endif fixUpChar(EntityChar); @@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) a = khtml::getAttrID(cBuffer, cBufferPos-1); } if (!a) - attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); } dest = buffer; @@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) } if ( cBufferPos == CBUFLEN ) { cBuffer[cBufferPos] = '\0'; - attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::tqfromLatin1(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->unicode(); + curchar = src->tqunicode(); if(curchar > ' ') { if(curchar == '=') { #ifdef TOKEN_DEBUG @@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) { ushort curchar; while(!src.isEmpty()) { - curchar = src->unicode(); + curchar = src->tqunicode(); if(curchar > ' ') { if(( curchar == '\'' || curchar == '\"' )) { tquote = curchar == '\"' ? DoubleQuote : SingleQuote; @@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) while(!src.isEmpty()) { checkBuffer(); - curchar = src->unicode(); + curchar = src->tqunicode(); 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->unicode(); + curchar = src->tqunicode(); 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->unicode(); + ushort cc = src->tqunicode(); if (skipLF && (cc != '\n')) skipLF = false; @@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish() food += TQString(scriptCode, scriptCodeSize); } else { - pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); + pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>'); food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy } KHTML_DELETE_QCHAR_VEC(scriptCode); diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h index 8e36353b0..2197a5083 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->unicode()) { - tid = buffer->unicode(); + if(buffer->tqunicode()) { + tid = buffer->tqunicode(); value = v.implementation(); } else if ( !attrName.isEmpty() && attrName != "/" ) { diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui index 37adef500..9f2e4030c 100644 --- a/khtml/htmlpageinfo.ui +++ b/khtml/htmlpageinfo.ui @@ -40,7 +40,7 @@ unnamed - + layout1 @@ -263,7 +263,7 @@ Expanding - + 20 20 diff --git a/khtml/java/kjavaapplet.h b/khtml/java/kjavaapplet.h index 6fe0f7709..8e02c5ba4 100644 --- a/khtml/java/kjavaapplet.h +++ b/khtml/java/kjavaapplet.h @@ -47,7 +47,7 @@ class KJavaAppletContext; class KJavaAppletPrivate; -class KJavaApplet : public QObject +class KJavaApplet : public TQObject { Q_OBJECT diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp index 76914a5dc..776eb8a64 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::fromLatin1("showstatus") + if ( cmd == TQString::tqfromLatin1("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::fromLatin1( "showurlinframe" ) + else if ( cmd == TQString::tqfromLatin1( "showurlinframe" ) && arg.count() > 1 ) { kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl; emit showDocument( arg[0], arg[1] ); } - else if ( cmd == TQString::fromLatin1( "showdocument" ) + else if ( cmd == TQString::tqfromLatin1( "showdocument" ) && !arg.empty() ) { kdDebug(6100) << "url = " << arg.first() << endl; emit showDocument( arg.first(), "_top" ); } - else if ( cmd == TQString::fromLatin1( "resizeapplet" ) + else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1("audioclip_"))) { + else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) { kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl; } - else if ( cmd == TQString::fromLatin1( "JS_Event" ) + else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1( "AppletStateNotification" ) ) + else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1( "AppletFailed" ) ) { + else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); if (ok) diff --git a/khtml/java/kjavaappletcontext.h b/khtml/java/kjavaappletcontext.h index ca851a42e..119699f23 100644 --- a/khtml/java/kjavaappletcontext.h +++ b/khtml/java/kjavaappletcontext.h @@ -42,7 +42,7 @@ class KJavaAppletServer; class KJavaApplet; class KJavaAppletContextPrivate; -class KJavaAppletContext : public QObject +class KJavaAppletContext : public TQObject { Q_OBJECT diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 59d0517a2..199256b59 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray& void KJavaAppletServer::removeDataJob( int loaderID ) { - const KIOJobMap::iterator it = d->kiojobs.find( loaderID ); + const KIOJobMap::iterator it = d->kiojobs.tqfind( loaderID ); if (it != d->kiojobs.end()) { it.data()->deleteLater(); d->kiojobs.erase( it ); @@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) if (cmd_code == KJAS_PUT_DATA) { // rest of the data is for kio put if (ok) { - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); if (ok && it != d->kiojobs.end()) { TQByteArray qba; qba.setRawData(qb.data() + index, qb.size() - index - 1); @@ -517,7 +517,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) //now parse out the arguments while( index < qb_size ) { - int sep_pos = qb.find( 0, index ); + int sep_pos = qb.tqfind( 0, index ); if (sep_pos < 0) { kdError(6100) << "Missing separation byte" << endl; sep_pos = qb_size; @@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) switch( cmd_code ) { case KJAS_SHOW_DOCUMENT: - cmd = TQString::fromLatin1( "showdocument" ); + cmd = TQString::tqfromLatin1( "showdocument" ); break; case KJAS_SHOW_URLINFRAME: - cmd = TQString::fromLatin1( "showurlinframe" ); + cmd = TQString::tqfromLatin1( "showurlinframe" ); break; case KJAS_SHOW_STATUS: - cmd = TQString::fromLatin1( "showstatus" ); + cmd = TQString::tqfromLatin1( "showstatus" ); break; case KJAS_RESIZE_APPLET: - cmd = TQString::fromLatin1( "resizeapplet" ); + cmd = TQString::tqfromLatin1( "resizeapplet" ); break; case KJAS_GET_URLDATA: @@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_DATA_COMMAND: if (ok && !args.empty()) { const int cmd = args.first().toInt( &ok ); - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; @@ -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::fromLatin1( "JS_Event" ); + cmd = TQString::tqfromLatin1( "JS_Event" ); kdDebug(6100) << "Javascript request: "<< contextID << " code: " << args[0] << endl; break; @@ -581,7 +581,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_PUT_MEMBER: case KJAS_CALL_MEMBER: { const int ticket = args[0].toInt(); - JSStack::iterator it = d->jsstack.find(ticket); + JSStack::iterator it = d->jsstack.tqfind(ticket); if (it != d->jsstack.end()) { kdDebug(6100) << "slotJavaRequest: " << ticket << endl; args.pop_front(); @@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) return; } case KJAS_AUDIOCLIP_PLAY: - cmd = TQString::fromLatin1( "audioclip_play" ); + cmd = TQString::tqfromLatin1( "audioclip_play" ); kdDebug(6100) << "Audio Play: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_LOOP: - cmd = TQString::fromLatin1( "audioclip_loop" ); + cmd = TQString::tqfromLatin1( "audioclip_loop" ); kdDebug(6100) << "Audio Loop: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_STOP: - cmd = TQString::fromLatin1( "audioclip_stop" ); + cmd = TQString::tqfromLatin1( "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::fromLatin1( "AppletStateNotification" ); + cmd = TQString::tqfromLatin1( "AppletStateNotification" ); break; case KJAS_APPLET_FAILED: kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl; - cmd = TQString::fromLatin1( "AppletFailed" ); + cmd = TQString::tqfromLatin1( "AppletFailed" ); break; case KJAS_SECURITY_CONFIRM: { if (KSSL::doesSSLWork() && !d->kssl) @@ -670,7 +670,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) TQString subject = cert->getSubject() + TQChar('\n'); TQRegExp reg(TQString("/[A-Z]+=")); int pos = 0; - while ((pos = subject.find(reg, pos)) > -1) + while ((pos = subject.tqfind(reg, pos)) > -1) subject.replace(pos, 1, TQString("\n ")); text += subject.mid(1); } @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] ); + answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -779,7 +779,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { TQGuardedPtr dialog = new TQDialog( static_cast(parent()), "PermissionDialog"); - dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); + dialog->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); dialog->setCaption( i18n("Security Alert") ); @@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" ); buttonLayout->addWidget( grant ); dialogLayout->addLayout( buttonLayout ); - dialog->resize( dialog->minimumSizeHint() ); + dialog->resize( dialog->tqminimumSizeHint() ); //clearWState( WState_Polished ); connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); @@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { m_button = sender()->name(); - static_cast(sender())->parentWidget()->close(); + static_cast(sender())->tqparentWidget()->close(); } #include "kjavaappletserver.moc" diff --git a/khtml/java/kjavaappletserver.h b/khtml/java/kjavaappletserver.h index 08d0f2983..63463b040 100644 --- a/khtml/java/kjavaappletserver.h +++ b/khtml/java/kjavaappletserver.h @@ -39,7 +39,7 @@ class KJavaAppletContext; class KJavaAppletServerPrivate; class JSStackFrame; -class KJavaAppletServer : public QObject +class KJavaAppletServer : public TQObject { Q_OBJECT @@ -161,7 +161,7 @@ private: }; -class PermissionDialog : public QObject +class PermissionDialog : public TQObject { Q_OBJECT public: diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index d4c8e266f..7e9264786 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQStringList::const_iterator it = args.begin(); const TQStringList::const_iterator itEnd = args.end(); for ( ; it != itEnd; ++it) { - const int equalPos = (*it).find("="); + const int equalPos = (*it).tqfind("="); if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 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::fromLatin1("codebase") || - name_lower == TQString::fromLatin1("java_codebase")) { + else if (name_lower == TQString::tqfromLatin1("codebase") || + name_lower == TQString::tqfromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; } else if (name == "__KHTML__CLASSID") - //else if (name.lower()==TQString::fromLatin1("classid")) + //else if (name.lower()==TQString::tqfromLatin1("classid")) classid = value; - else if (name_lower == TQString::fromLatin1("code") || - name_lower == TQString::fromLatin1("java_code")) + else if (name_lower == TQString::tqfromLatin1("code") || + name_lower == TQString::tqfromLatin1("java_code")) classname = value; - else if (name_lower == TQString::fromLatin1("src")) + else if (name_lower == TQString::tqfromLatin1("src")) src_param = value; - else if (name_lower == TQString::fromLatin1("archive") || - name_lower == TQString::fromLatin1("java_archive") || + else if (name_lower == TQString::tqfromLatin1("archive") || + name_lower == TQString::tqfromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == TQString::fromLatin1("name")) + else if (name_lower == TQString::tqfromLatin1("name")) applet->setAppletName (value); - else if (name_lower == TQString::fromLatin1("width")) + else if (name_lower == TQString::tqfromLatin1("width")) width = value.toInt(); - else if (name_lower == TQString::fromLatin1("height")) + else if (name_lower == TQString::tqfromLatin1("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->topLevelWidget()->winId(); + stream << info << m_view->tqtopLevelWidget()->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->topLevelWidget ()->installEventFilter (this); + wparent->tqtopLevelWidget ()->installEventFilter (this); setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); @@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { } else applet->setAppletClass (url.url ()); AppletParameterDialog (w).exec (); - applet->setSize (w->sizeHint()); + applet->setSize (w->tqsizeHint()); } if (!m_statusbar_icon) { KStatusBar *sb = m_statusbar->statusBar(); @@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) { applet->setParameter (key, val); kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl; } - applet->setSize (w->sizeHint ()); + applet->setSize (w->tqsizeHint ()); if (w->isVisible()) w->showApplet (); } diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp index 1299ce7e8..2e9597b2d 100644 --- a/khtml/java/kjavaappletwidget.cpp +++ b/khtml/java/kjavaappletwidget.cpp @@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); - d->tmplabel->setAlignment( Qt::AlignCenter | Qt::WordBreak ); + d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->show(); @@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w ) } } -TQSize KJavaAppletWidget::sizeHint() const +TQSize KJavaAppletWidget::tqsizeHint() const { - kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl; - TQSize rval = QXEmbed::sizeHint(); + kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl; + TQSize rval = QXEmbed::tqsizeHint(); if( rval.width() == 0 || rval.height() == 0 ) { @@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) { if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) { // delayed showApplet if (applet()->size().width() <= 0) - applet()->setSize (sizeHint()); + applet()->setSize (tqsizeHint()); showApplet(); } } diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h index 18f5be341..0b8ce90e9 100644 --- a/khtml/java/kjavaappletwidget.h +++ b/khtml/java/kjavaappletwidget.h @@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate; -class KJavaAppletWidget : public QXEmbed +class KJavaAppletWidget : public TQXEmbed { Q_OBJECT public: @@ -96,7 +96,7 @@ public: */ void showApplet(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void resize( int, int ); protected slots: diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index d3cf0de41..f9514304c 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -40,7 +40,7 @@ namespace KIO { class KJavaDownloaderPrivate; class KJavaUploaderPrivate; -class KJavaKIOJob : public QObject +class KJavaKIOJob : public TQObject { Q_OBJECT public: diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 1c9f1b346..48eb7b764 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -300,7 +300,7 @@ bool KJavaProcess::invokeJVM() TQString argStr; TQTextOStream stream( &argStr ); const TQValueList args = javaProcess->args(); - qCopy( args.begin(), args.end(), TQTextOStreamIterator( stream, " " ) ); + tqCopy( args.begin(), args.end(), TQTextOStreamIterator( stream, " " ) ); kdDebug(6100) << argStr << endl; KProcess::Communication flags = (KProcess::Communication) diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 9b819ee6c..756b16653 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 alignment + // have to care for rtl or tqalignment // ### 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(b->object())->str->s[_offset].unicode(); + _char = static_cast(b->object())->str->s[_offset].tqunicode(); 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(b->object())->str->s[_offset].unicode(); + _char = static_cast(b->object())->str->s[_offset].tqunicode(); 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(b->object())->text()[_offset].unicode(); + _char = static_cast(b->object())->text()[_offset].tqunicode(); 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(_peekNext->object())->text()[_peekNext->minOffset()].unicode(); + _char = static_cast(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode(); else if (b && _offset < b->maxOffset() && b->isInlineTextBox()) - _char = static_cast(b->object())->text()[_offset].unicode(); + _char = static_cast(b->object())->text()[_offset].tqunicode(); else _char = -1; }/*end if*/ diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h index 9524f2df7..a5c4bf60d 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 unicode symbol, substituting + /** returns the current character as a tqunicode 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(b->object())->str->s[b->minOffset()].unicode(); + _char = static_cast(b->object())->str->s[b->minOffset()].tqunicode(); else _char = -1; } diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 7cadfb944..4f2ceca79 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) if ( !m_extensionProxy ) return; - int slot = m_extensionProxy->metaObject()->findSlot( method ); + int slot = m_extensionProxy->tqmetaObject()->findSlot( method ); if ( slot == -1 ) return; @@ -344,9 +344,9 @@ void KHTMLPartBrowserExtension::updateEditActions() bool hasSelection = false; if( m_editableFormWidget) { - if ( ::qt_cast(m_editableFormWidget)) + if ( ::tqqt_cast(m_editableFormWidget)) hasSelection = static_cast( &(*m_editableFormWidget) )->hasSelectedText(); - else if(::qt_cast(m_editableFormWidget)) + else if(::tqqt_cast(m_editableFormWidget)) hasSelection = static_cast( &(*m_editableFormWidget) )->hasSelectedText(); } @@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, const TQString &filter, long cacheId, const TQString & suggestedFilename ) { - TQString name = TQString::fromLatin1( "index.html" ); + TQString name = TQString::tqfromLatin1( "index.html" ); if ( !suggestedFilename.isEmpty() ) name = suggestedFilename; else if ( !url.fileName().isEmpty() ) diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 7eedc6311..dc7614dce 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); + return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof ); } void KHTMLFactory::ref() diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e9d5c62a8..e5319bf83 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -45,7 +45,7 @@ public: KHTMLFactory( bool clone = false ); virtual ~KHTMLFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); static void registerPart( KHTMLPart *part ); static void deregisterPart( KHTMLPart *part ); diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index 935f31cc0..33462110a 100644 --- a/khtml/khtml_pagecache.cpp +++ b/khtml/khtml_pagecache.cpp @@ -157,7 +157,7 @@ KHTMLPageCache::createCacheEntry() void KHTMLPageCache::addData(long id, const TQByteArray &data) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) entry->addData(data); } @@ -165,7 +165,7 @@ KHTMLPageCache::addData(long id, const TQByteArray &data) void KHTMLPageCache::endData(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) entry->endData(); } @@ -184,13 +184,13 @@ KHTMLPageCache::cancelEntry(long id) bool KHTMLPageCache::isValid(long id) { - return (d->dict.find(id) != 0); + return (d->dict.tqfind(id) != 0); } bool KHTMLPageCache::isComplete(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) return entry->isComplete(); return false; @@ -199,7 +199,7 @@ KHTMLPageCache::isComplete(long id) void KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (!entry || !entry->isComplete()) return; // Make this entry the most recent entry. @@ -271,7 +271,7 @@ KHTMLPageCache::sendData() void KHTMLPageCache::saveData(long id, TQDataStream *str) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); assert(entry); int fd = entry->m_file->handle(); diff --git a/khtml/khtml_pagecache.h b/khtml/khtml_pagecache.h index 9b41950a7..ac9ea5b4b 100644 --- a/khtml/khtml_pagecache.h +++ b/khtml/khtml_pagecache.h @@ -38,7 +38,7 @@ class KHTMLPageCachePrivate; * * It operates completely independent from the kio_http cache. */ -class KHTMLPageCache : public QObject +class KHTMLPageCache : public TQObject { Q_OBJECT public: @@ -113,7 +113,7 @@ private: KHTMLPageCachePrivate *d; }; -class KHTMLPageCacheDelivery : public QObject +class KHTMLPageCacheDelivery : public TQObject { friend class KHTMLPageCache; Q_OBJECT diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 338b9605d..e59b7fe3f 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -178,7 +178,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e script += ")"; kdDebug(6050) << "khtml::ChildFrame::liveConnectEvent " << script << endl; - KHTMLPart * part = ::qt_cast(m_part->parent()); + KHTMLPart * part = ::tqqt_cast(m_part->parent()); if (!part) return; if (!m_jscript) @@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; @@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject * setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, parentWidget, widgetname ), prof ); + init( new KHTMLView( this, tqparentWidget, widgetname ), prof ); } KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) @@ -608,7 +608,7 @@ bool KHTMLPart::openURL( const KURL &url ) if (!d->m_statusBarUALabel) { d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarUALabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarUALabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false); d->m_statusBarUALabel->setPixmap(SmallIcon("agent", instance())); @@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url ) } if (widget()) - d->m_job->setWindow(widget()->topLevelWidget()); + d->m_job->setWindow(widget()->tqtopLevelWidget()); d->m_job->addMetaData(args.metaData()); connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), @@ -1075,7 +1075,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { if (!d->m_statusBarJSErrorLabel) { d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarJSErrorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarJSErrorLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); @@ -1525,7 +1525,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec ) if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) { d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) ); - d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarIconLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); @@ -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::fromLatin1( "" ) + TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) .arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() ); - errText += TQString::fromLatin1( "

" ); + errText += TQString::tqfromLatin1( "

" ); errText += i18n( "An error occurred while loading %1:" ).arg( reqUrl.htmlURL() ); - errText += TQString::fromLatin1( "

" ); + errText += TQString::tqfromLatin1( "

" ); errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) ); - errText += TQString::fromLatin1( "" ); + errText += TQString::tqfromLatin1( "" ); 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::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); - TQString doc = TQString::fromLatin1( "" ); + TQString doc = TQString::tqfromLatin1( "<html><head><title>" ); doc += i18n( "Error: " ); doc += errorName; - doc += TQString::fromLatin1( " - %1

" ).arg( url ); + doc += TQString::tqfromLatin1( " - %1

" ).arg( url ); doc += i18n( "The requested operation could not be completed" ); - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += errorName; - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "" ); if ( !techName.isNull() ) { - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += i18n( "Technical Reason: " ); doc += techName; - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "" ); } - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += i18n( "Details of the Request:" ); - doc += TQString::fromLatin1( "

  • " ); + doc += TQString::tqfromLatin1( "
    • " ); doc += i18n( "URL: %1" ).arg( url ); - doc += TQString::fromLatin1( "
    • " ); + doc += TQString::tqfromLatin1( "
    • " ); if ( !protocol.isNull() ) { // uncomment for 3.1... i18n change // doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol ); - doc += TQString::fromLatin1( "
    • " ); + doc += TQString::tqfromLatin1( "
    • " ); } doc += i18n( "Date and Time: %1" ).arg( datetime ); - doc += TQString::fromLatin1( "
    • " ); + doc += TQString::tqfromLatin1( "
    • " ); doc += i18n( "Additional Information: %1" ).arg( text ); - doc += TQString::fromLatin1( "

    " ); + doc += TQString::tqfromLatin1( "

" ); doc += i18n( "Description:" ); - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += description; - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); if ( causes.count() ) { - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += i18n( "Possible Causes:" ); - doc += TQString::fromLatin1( "

  • " ); + doc += TQString::tqfromLatin1( "
    • " ); doc += causes.join( "
    • " ); - doc += TQString::fromLatin1( "
    " ); + doc += TQString::tqfromLatin1( "
" ); } if ( solutions.count() ) { - doc += TQString::fromLatin1( "

" ); + doc += TQString::tqfromLatin1( "

" ); doc += i18n( "Possible Solutions:" ); - doc += TQString::fromLatin1( "

  • " ); + doc += TQString::tqfromLatin1( "
    • " ); doc += solutions.join( "
    • " ); - doc += TQString::fromLatin1( "
    " ); + doc += TQString::tqfromLatin1( "
" ); } - doc += TQString::fromLatin1( "" ); + doc += TQString::tqfromLatin1( "" ); write( doc ); end(); @@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job ) return; } - KIO::TransferJob *tjob = ::qt_cast(job); + KIO::TransferJob *tjob = ::tqqt_cast(job); if (tjob && tjob->isErrorPage()) { khtml::RenderPart *renderPart = d->m_frame ? static_cast(d->m_frame->m_frame) : 0; if (renderPart) { @@ -2286,7 +2286,7 @@ void KHTMLPart::checkCompleted() } // the view will emit completed on our behalf, - // either now or at next repaint if one is pending + // either now or at next tqrepaint 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::null; // SYNC check with ecma/kjs_window.cpp::goURL ! - if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( u.right( u.length() - 11 ) ); kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl; @@ -2838,7 +2838,7 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit matchLen = matcher.matchedLength(); } else { - d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive); + d->m_findPos = s.string().tqfind(str, d->m_findPos+1, caseSensitive); matchLen = str.length(); } @@ -3111,9 +3111,9 @@ bool KHTMLPart::findTextNext( bool reverse ) if( d->m_lastFindState.last_dir != -1 && bool( d->m_lastFindState.last_dir ) != bool( options & KFindDialog::FindBackwards )) { - qSwap( d->m_findNodeEnd, d->m_findNodeStart ); - qSwap( d->m_findPosEnd, d->m_findPosStart ); - qSwap( d->m_findNode, d->m_findNodePrevious ); + tqSwap( d->m_findNodeEnd, d->m_findNodeStart ); + tqSwap( d->m_findPosEnd, d->m_findPosStart ); + tqSwap( d->m_findNode, d->m_findNodePrevious ); // d->m_findNode now point at the end of the last searched line - advance one node khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0; khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0; @@ -3212,7 +3212,7 @@ bool KHTMLPart::findTextNext( bool reverse ) s.truncate( d->m_findPosEnd ); if ( !s.isEmpty() ) { - newLine = s.find( '\n' ) != -1; // did we just get a newline? + newLine = s.tqfind( '\n' ) != -1; // did we just get a newline? if( !( options & KFindDialog::FindBackwards )) { //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl; @@ -3731,8 +3731,8 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi return; } - if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) { - TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) ); + if (url.tqfind( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { + TQString jscode = KURL::decode_string( url.mid( url.tqfind( "javascript:", 0, false ) ) ); jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long if (url.startsWith("javascript:window.open")) jscode += i18n(" (In new window)"); @@ -3838,18 +3838,18 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi extra = i18n(" (In other frame)"); } - if (u.protocol() == TQString::fromLatin1("mailto")) { - TQString mailtoMsg /* = TQString::fromLatin1("").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/; + if (u.protocol() == TQString::tqfromLatin1("mailto")) { + TQString mailtoMsg /* = TQString::tqfromLatin1("").arg(locate("icon", TQString::tqfromLatin1("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::fromLatin1("subject="))) + if ((*it).startsWith(TQString::tqfromLatin1("subject="))) mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8)); - else if ((*it).startsWith(TQString::fromLatin1("cc="))) + else if ((*it).startsWith(TQString::tqfromLatin1("cc="))) mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3)); - else if ((*it).startsWith(TQString::fromLatin1("bcc="))) + else if ((*it).startsWith(TQString::tqfromLatin1("bcc="))) mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4)); mailtoMsg = TQStyleSheet::escape(mailtoMsg); mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null); @@ -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::fromLatin1("http")) { + else if (u.protocol() == TQString::tqfromLatin1("http")) { DOM::Node hrefNode = nodeUnderMouse().parentNode(); - while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull()) + while (hrefNode.nodeName().string() != TQString::tqfromLatin1("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::fromLatin1("en")) - countryCode = TQString::fromLatin1("gb"); - TQString flagImg = TQString::fromLatin1("").arg( - locate("locale", TQString::fromLatin1("l10n/") + if (countryCode == TQString::tqfromLatin1("en")) + countryCode = TQString::tqfromLatin1("gb"); + TQString flagImg = TQString::tqfromLatin1("").arg( + locate("locale", TQString::tqfromLatin1("l10n/") + countryCode - + TQString::fromLatin1("/flag.png"))); + + TQString::tqfromLatin1("/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::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.tqfind( TQString::tqfromLatin1( "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::fromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); } void KHTMLPart::slotViewPageInfo() @@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource() } } - (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); } KURL KHTMLPart::backgroundURL() const @@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions() { TQObject *ext = KParts::BrowserExtension::childObject( frame ); if ( ext ) - enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" ); + enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" ); } d->m_paPrintFrame->setEnabled( enablePrintFrame ); @@ -4305,7 +4305,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con const TQStringList ¶ms, bool isIFrame ) { //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl; - FrameIt it = d->m_frames.find( frameName ); + FrameIt it = d->m_frames.tqfind( frameName ); if ( it == d->m_frames.end() ) { khtml::ChildFrame * child = new khtml::ChildFrame; @@ -4319,7 +4319,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con (*it)->m_params = params; // Support for - if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { KHTMLPart* p = static_cast(static_cast((*it)->m_part)); @@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con TQString KHTMLPart::requestFrameName() { - return TQString::fromLatin1("").arg(d->m_frameNameId++); + return TQString::tqfromLatin1("").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 or if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty()) - args.serviceType = TQString::fromLatin1( "text/html" ); + args.serviceType = TQString::tqfromLatin1( "text/html" ); if ( args.serviceType.isEmpty() ) { kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl; @@ -4486,7 +4486,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url //CRITICAL STUFF if ( child->m_part ) { - if (!::qt_cast(child->m_part) && child->m_jscript) + if (!::tqqt_cast(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; @@ -4507,7 +4507,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url child->m_part = part; - if (::qt_cast(part)) { + if (::tqqt_cast(part)) { static_cast(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); @@ -4643,19 +4643,19 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, +KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) { TQString constr; if ( !serviceName.isEmpty() ) - constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) ); + constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) ); KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString::null ); if ( offers.isEmpty() ) { - int pos = mimetype.find( "-plugin" ); + int pos = mimetype.tqfind( "-plugin" ); if (pos < 0) return 0L; TQString stripped_mime = mimetype.left( pos ); @@ -4679,9 +4679,9 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) - res = static_cast(static_cast( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); + res = static_cast(static_cast( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); else - res = static_cast(factory->create( parentWidget, widgetName, className )); + res = static_cast(factory->create( tqparentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); @@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager() { if ( !d->m_manager && d->m_view ) { - d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" ); + d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), 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::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("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::fromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlstring.tqfind( TQString::tqfromLatin1( "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::fromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), formData.size())); } else if (contentType.lower() == "text/plain") { // Convention seems to be to decode, and s/&/\n/ - TQString tmpbody = TQString::fromLatin1(formData.data(), + TQString tmpbody = TQString::tqfromLatin1(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::fromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::tqfromLatin1(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::fromLatin1( formData.data(), formData.size() ) ); + u.setQuery( TQString::tqfromLatin1( 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 guard( client ); - TQString mimetype = TQString::fromLatin1( "text/html" ); + TQString mimetype = TQString::tqfromLatin1( "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::fromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlStr.tqfind( TQString::tqfromLatin1( "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::fromLatin1( "_top" ) ) + if ( frameName == TQString::tqfromLatin1( "_top" ) ) { emit d->m_extension->openURLRequest( url, args ); return; } - else if ( frameName == TQString::fromLatin1( "_blank" ) ) + else if ( frameName == TQString::tqfromLatin1( "_blank" ) ) { emit d->m_extension->createNewWindow( url, args ); return; } - else if ( frameName == TQString::fromLatin1( "_parent" ) ) + else if ( frameName == TQString::tqfromLatin1( "_parent" ) ) { KParts::URLArgs newArgs( args ); newArgs.frameName = TQString::null; @@ -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::fromLatin1( "_self" ) ) + else if ( frameName != TQString::tqfromLatin1( "_self" ) ) { khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); @@ -5224,7 +5224,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f)) return this; - FrameIt it = d->m_frames.find( f ); + FrameIt it = d->m_frames.tqfind( f ); const FrameIt end = d->m_frames.end(); if ( it != end ) { @@ -5287,7 +5287,7 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const bool KHTMLPart::frameExists( const TQString &frameName ) { - ConstFrameIt it = d->m_frames.find( frameName ); + ConstFrameIt it = d->m_frames.tqfind( frameName ); if ( it == d->m_frames.end() ) return false; @@ -5299,7 +5299,7 @@ bool KHTMLPart::frameExists( const TQString &frameName ) KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - KHTMLPart* const kp = ::qt_cast(framePart); + KHTMLPart* const kp = ::tqqt_cast(framePart); if (kp) return kp->jScript(); @@ -5317,7 +5317,7 @@ KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) KHTMLPart *KHTMLPart::parentPart() { - return ::qt_cast( parent() ); + return ::tqqt_cast( parent() ); } khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, @@ -5360,8 +5360,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) kdDebug( 6050 ) << indent << "saveState this=" << this << " '" << name() << "' saving URL " << m_url.url() << endl; #endif - stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() - << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); + stream << m_url << (TQ_INT32)d->m_view->contentsX() << (TQ_INT32)d->m_view->contentsY() + << (TQ_INT32) d->m_view->contentsWidth() << (TQ_INT32) d->m_view->contentsHeight() << (TQ_INT32) d->m_view->marginWidth() << (TQ_INT32) d->m_view->marginHeight(); // save link cursor position int focusNodeNumber; @@ -5431,7 +5431,7 @@ void KHTMLPart::saveState( TQDataStream &stream ) } // Save frame data - stream << (Q_UINT32) frameNameLst.count(); + stream << (TQ_UINT32) frameNameLst.count(); stream << frameNameLst << frameServiceTypeLst << frameServiceNameLst << frameURLLst << frameStateBufferLst; #ifndef NDEBUG s_saveStateIndentLevel = indentLevel; @@ -5441,8 +5441,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) void KHTMLPart::restoreState( TQDataStream &stream ) { KURL u; - Q_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; - Q_UINT32 frameCount; + TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; + TQ_UINT32 frameCount; TQStringList frameNames, frameServiceTypes, docState, frameServiceNames; KURL::List frameURLs; TQValueList frameStateBuffers; @@ -5912,7 +5912,7 @@ TQPtrList KHTMLPart::frames() const bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) { kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl; - FrameIt it = d->m_frames.find( urlArgs.frameName ); + FrameIt it = d->m_frames.tqfind( urlArgs.frameName ); if ( it == d->m_frames.end() ) return false; @@ -6658,7 +6658,7 @@ void KHTMLPart::slotPrintFrame() if ( !ext ) return; - TQMetaObject *mo = ext->metaObject(); + TQMetaObject *mo = ext->tqmetaObject(); 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->repaint(); + frame->tqrepaint(); } } @@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain); - frame->repaint(); + frame->tqrepaint(); } 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()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->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 } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->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))); @@ -7249,7 +7249,7 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) { if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarWalletLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); @@ -7386,7 +7386,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart if ( enable && !d->m_statusBarPopupLabel ) { d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) ); - d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarPopupLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarPopupLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false ); d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index af8a1695d..95cd952b1 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -243,10 +243,10 @@ public: * rendered in. You can specify two different parent objects for a * KHTMLPart, one parent for the KHTMLPart document and on parent * for the KHTMLView. If the second @p parent argument is 0L, then - * @p parentWidget is used as parent for both objects, the part and + * @p tqparentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, + KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); @@ -1168,7 +1168,7 @@ protected: * to be a object of your derived type, in which case you should return a new instance for * the mimetype 'text/html' . */ - virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, + virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp index 90770d38f..c07b44b79 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()->topLevelWidget() : 0, + : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0, false, false, hideErrorDialog ), m_child( child ) { diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 8e1c0f934..bcefa88c6 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -121,7 +121,7 @@ static KPerDomainSettings &setup_per_domain_policy( kdWarning() << "setup_per_domain_policy: domain is empty" << endl; } const TQString ldomain = domain.lower(); - PolicyMap::iterator it = d->domainPolicy.find(ldomain); + PolicyMap::iterator it = d->domainPolicy.tqfind(ldomain); if (it == d->domainPolicy.end()) { // simply copy global domain settings (they should have been initialized // by this time) @@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str if (!_str) ret = KJavaScriptDunno; - if (_str.lower() == TQString::fromLatin1("accept")) + if (_str.lower() == TQString::tqfromLatin1("accept")) ret = KJavaScriptAccept; - else if (_str.lower() == TQString::fromLatin1("reject")) + else if (_str.lower() == TQString::tqfromLatin1("reject")) ret = KJavaScriptReject; return ret; @@ -161,7 +161,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice) { TQString tmp(configStr); - int splitIndex = tmp.find(':'); + int splitIndex = tmp.tqfind(':'); if ( splitIndex == -1) { domain = configStr.lower(); @@ -172,7 +172,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai { domain = tmp.left(splitIndex).lower(); TQString adviceString = tmp.mid( splitIndex+1, tmp.length() ); - int splitIndex2 = adviceString.find( ':' ); + int splitIndex2 = adviceString.tqfind( ':' ); if( splitIndex2 == -1 ) { // Java advice only javaAdvice = strToAdvice( adviceString ); @@ -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::fromLatin1("javascript."); + : TQString::tqfromLatin1("javascript."); TQString javaPrefix = global ? TQString::null - : TQString::fromLatin1("java."); + : TQString::tqfromLatin1("java."); TQString pluginsPrefix = global ? TQString::null - : TQString::fromLatin1("plugins."); + : TQString::tqfromLatin1("plugins."); // The setting for Java - TQString key = javaPrefix + TQString::fromLatin1("EnableJava"); + TQString key = javaPrefix + TQString::tqfromLatin1("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::fromLatin1("EnablePlugins"); + key = pluginsPrefix + TQString::tqfromLatin1("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::fromLatin1("EnableJavaScript"); + key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowOpenPolicy"); + key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowMovePolicy"); + key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowResizePolicy"); + key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowStatusPolicy"); + key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowFocusPolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy) config->readUnsignedNumEntry( key, KJSWindowFocusAllow ); @@ -508,7 +508,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) const TQStringList::ConstIterator itEnd = dl.end(); for (; it != itEnd; ++it) { const TQString domain = (*it).lower(); - TQMap::Iterator pos = domainList.find(domain); + TQMap::Iterator pos = domainList.tqfind(domain); if (pos == notfound) domainList.insert(domain,0); }/*next it*/ } @@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( it.data() ); TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno ); - domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::tqfromLatin1("%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::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "ECMADomainSettings", domainConfig ); } @@ -656,7 +656,7 @@ static const KPerDomainSettings &lookup_hostname_policy( const PolicyMap::const_iterator notfound = d->domainPolicy.end(); // First check whether there is a perfect match. - PolicyMap::const_iterator it = d->domainPolicy.find(hostname); + PolicyMap::const_iterator it = d->domainPolicy.tqfind(hostname); if( it != notfound ) { #ifdef DEBUG_SETTINGS kdDebug() << "perfect match" << endl; @@ -670,9 +670,9 @@ static const KPerDomainSettings &lookup_hostname_policy( // there's no dots left. TQString host_part = hostname; int dot_idx = -1; - while( (dot_idx = host_part.find(TQChar('.'))) >= 0 ) { + while( (dot_idx = host_part.tqfind(TQChar('.'))) >= 0 ) { host_part.remove(0,dot_idx); - it = d->domainPolicy.find(host_part); + it = d->domainPolicy.tqfind(host_part); Q_ASSERT(notfound == d->domainPolicy.end()); if( it != notfound ) { #ifdef DEBUG_SETTINGS diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 03279e968..195602849 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory() delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); + return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, +KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - KHTMLPart* parentPart = ::qt_cast( parent ); + KHTMLPart* parentPart = ::tqqt_cast( parent ); setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); - TQVBox *box = new TQVBox( parentWidget, widgetName ); + TQVBox *box = new TQVBox( tqparentWidget, widgetName ); m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_khtml->setAutoloadImages( true ); @@ -103,7 +103,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the khtml part // forward opening requests to parent frame (if existing) - KHTMLPart *p = ::qt_cast(parent); + KHTMLPart *p = ::tqqt_cast(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; connect(m_khtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); @@ -304,7 +304,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::Drop: { // find out if this part is embedded in a frame, and send the // event to its outside widget - KHTMLPart *p = ::qt_cast(parent()); + KHTMLPart *p = ::tqqt_cast(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index dda918177..735df4491 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -44,7 +44,7 @@ public: KHTMLImageFactory(); virtual ~KHTMLImageFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); @@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *parentWidget, const char *widgetName, + KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); virtual ~KHTMLImage(); diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h index 0047dde54..cebee9455 100644 --- a/khtml/khtmlpart_p.h +++ b/khtml/khtmlpart_p.h @@ -72,7 +72,7 @@ namespace KParts namespace khtml { - class KDE_EXPORT ChildFrame : public QObject + class KDE_EXPORT ChildFrame : public TQObject { Q_OBJECT public: @@ -127,7 +127,7 @@ typedef KHTMLFrameList::Iterator FrameIt; static int khtml_part_dcop_counter = 0; -class KHTMLWalletQueue : public QObject +class KHTMLWalletQueue : public TQObject { Q_OBJECT public: diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 850d8e9cd..58306a4a5 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -220,7 +220,7 @@ public: #ifdef DEBUG_PIXEL timer.start(); pixelbooth = 0; - repaintbooth = 0; + tqrepaintbooth = 0; #endif scrollBarMoved = false; contentsMoving = false; @@ -238,7 +238,7 @@ public: delete postponed_autorepeat; postponed_autorepeat = NULL; layoutTimerId = 0; - repaintTimerId = 0; + tqrepaintTimerId = 0; scrollTimerId = 0; scrollSuspended = false; scrollSuspendPreActivate = false; @@ -324,7 +324,7 @@ public: #ifdef DEBUG_PIXEL TQTime timer; unsigned int pixelbooth; - unsigned int repaintbooth; + unsigned int tqrepaintbooth; #endif TQPainter *tp; @@ -359,7 +359,7 @@ public: int layoutTimerId; TQKeyEvent* postponed_autorepeat; - int repaintTimerId; + int tqrepaintTimerId; int scrollTimerId; int scrollTiming; int scrollBy; @@ -650,14 +650,14 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) #ifdef DEBUG_PIXEL if ( d->timer.elapsed() > 5000 ) { - qDebug( "drawed %d pixels in %d repaints the last %d milliseconds", - d->pixelbooth, d->repaintbooth, d->timer.elapsed() ); + qDebug( "drawed %d pixels in %d tqrepaints the last %d milliseconds", + d->pixelbooth, d->tqrepaintbooth, d->timer.elapsed() ); d->timer.restart(); d->pixelbooth = 0; - d->repaintbooth = 0; + d->tqrepaintbooth = 0; } d->pixelbooth += ew*eh; - d->repaintbooth++; + d->tqrepaintbooth++; #endif //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl; @@ -867,7 +867,7 @@ void KHTMLView::layout() } #if 0 ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__"); - if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; + if (listitem) kdDebug(6000) << "after layout, before tqrepaint" << endl; if (listitem) dumpLineBoxes(static_cast(listitem->renderer())); #endif #ifndef KHTML_NO_CARET @@ -972,7 +972,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; pixmap.resize( 48, 48 ); - pixmap.fill( TQColor( qRgba( 127, 127, 127, 127 ) ) ); + pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); @@ -1112,8 +1112,8 @@ static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent* TQPoint p(x-absx, y-absy); TQMouseEvent fw(me->type(), p, me->button(), me->state()); TQWidget* w = r->widget(); - TQScrollView* sc = ::qt_cast(w); - if (sc && !::qt_cast(w)) + TQScrollView* sc = ::tqqt_cast(w); + if (sc && !::tqqt_cast(w)) static_cast(sc)->sendEvent(&fw); else if(w) static_cast(w)->sendEvent(&fw); @@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if (d->clickCount > 0 && TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) { - d->clickCount = 0; // moving the mouse outside the threshold invalidates the click + d->clickCount = 0; // moving the mouse outside the threshold tqinvalidates the click } // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events @@ -1202,7 +1202,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) c = KCursor::ibeamCursor(); if ( mev.url.length() && m_part->settings()->changeCursor() ) { c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1217,7 +1217,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) break; case CURSOR_POINTER: c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1903,19 +1903,19 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) if (c->isWidgetType()) { TQWidget *w = static_cast(c); // don't install the event filter on toplevels - if (w->parentWidget(true) == view) { + if (w->tqparentWidget(true) == view) { if (!strcmp(w->name(), "__khtml")) { w->installEventFilter(this); w->unsetCursor(); - if (!::qt_cast(w)) + if (!::tqqt_cast(w)) w->setBackgroundMode( TQWidget::NoBackground ); static_cast(w)->setNoErase(); if (w->children()) { TQObjectListIterator it(*w->children()); for (; it.current(); ++it) { - TQWidget *widget = ::qt_cast(it.current()); + TQWidget *widget = ::tqqt_cast(it.current()); if (widget && !widget->isTopLevel()) { - if (!::qt_cast(w)) + if (!::tqqt_cast(w)) widget->setBackgroundMode( TQWidget::NoBackground ); static_cast(widget)->setNoErase(); widget->installEventFilter(this); @@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *c = v; while (v && v != view) { c = v; - v = v->parentWidget(true); + v = v->tqparentWidget(true); } if (v && !strcmp(c->name(), "__khtml")) { @@ -1941,23 +1941,23 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Paint: if (!allowWidgetPaintEvents) { // eat the event. Like this we can control exactly when the widget - // get's repainted. + // get's tqrepainted. block = true; int x = 0, y = 0; TQWidget *v = w; while (v && v != view) { x += v->x(); y += v->y(); - v = v->parentWidget(); + v = v->tqparentWidget(); } viewportToContents( x, y, x, y ); TQPaintEvent *pe = static_cast(e); - bool asap = !d->contentsMoving && ::qt_cast(c); + bool asap = !d->contentsMoving && ::tqqt_cast(c); - // TQScrollView needs fast repaints + // TQScrollView needs fast tqrepaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && !static_cast(m_part->xmlDocImpl()->renderer())->needsLayout() ) { - repaintContents(x + pe->rect().x(), y + pe->rect().y(), + tqrepaintContents(x + pe->rect().x(), y + pe->rect().y(), pe->rect().width(), pe->rect().height(), true); } else { scheduleRepaint(x + pe->rect().x(), y + pe->rect().y(), @@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->parentWidget() == view || ::qt_cast(c)) && !::qt_cast(w)) { + if ( (w->tqparentWidget() == view || ::tqqt_cast(c)) && !::tqqt_cast(w)) { TQMouseEvent *me = static_cast(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->parentWidget() == view && !::qt_cast(w)) { + if (w->tqparentWidget() == view && !::tqqt_cast(w)) { TQKeyEvent *ke = static_cast(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); @@ -2272,19 +2272,19 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal TQString accesskey; if( s.length() == 1 ) { TQChar a = s.string()[ 0 ].upper(); - if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains + if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = a; } if( accesskey.isNull() && fallbacks.contains( en )) { TQChar a = fallbacks[ en ].upper(); - if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains + if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = TQString( "" ) + a + ""; } if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,Qt::WDestructiveClose); connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); + connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2835,7 +2835,7 @@ void KHTMLView::print(bool quick) int headerHeight = 0; TQFont headerFont("Sans Serif", 8); - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true); + TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true); TQString headerMid = docname; TQString headerRight; @@ -2933,7 +2933,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->repaint(); +// root->tqrepaint(); // p->flush(); kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl; @@ -3121,7 +3121,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const TQStringList sites = d->formCompletions->readListEntry("Sites"); d->formCompletions->setGroup(TQString::null);//reset - return (sites.find(host) != sites.end()); + return (sites.tqfind(host) != sites.end()); } // returns true if event should be swallowed @@ -3497,8 +3497,8 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) khtml::RenderCanvas* root = static_cast(document->renderer()); if ( root && root->needsLayout() ) { - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; scheduleRelayout(); return; } @@ -3506,9 +3506,9 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) setStaticBackground(d->useSlowRepaints); -// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl; - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; +// kdDebug() << "scheduled tqrepaint "<< d->tqrepaintTimerId << endl; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; TQRect updateRegion; TQMemArray rects = d->updateRegion.rects(); @@ -3522,7 +3522,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) TQRect newRegion = updateRegion.unite(rects[i]); if (2*newRegion.height() > 3*updateRegion.height() ) { - repaintContents( updateRegion ); + tqrepaintContents( updateRegion ); updateRegion = rects[i]; } else @@ -3530,11 +3530,11 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } if ( !updateRegion.isNull() ) - repaintContents( updateRegion ); + tqrepaintContents( updateRegion ); // As widgets can only be accurately positioned during painting, every layout might // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before layout, but the layout - // pushed it out of the viewport, it will not be repainted, and consequently it's assocoated widget won't be repositioned! + // pushed it out of the viewport, it will not be tqrepainted, and consequently it's assocoated widget won't be repositioned! // Thus we need to check each supposedly 'visible' widget at the end of each layout, and remove it in case it's no more in sight. if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) { @@ -3556,7 +3556,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) addChild(w, 0, -500000); } - emit repaintAccessKeys(); + emit tqrepaintAccessKeys(); if (d->emitCompletedAfterRepaint) { bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull; d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone; @@ -3587,11 +3587,11 @@ void KHTMLView::unscheduleRelayout() void KHTMLView::unscheduleRepaint() { - if (!d->repaintTimerId) + if (!d->tqrepaintTimerId) return; - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; } void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) @@ -3618,8 +3618,8 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) if (asap && !parsing) unscheduleRepaint(); - if ( !d->repaintTimerId ) - d->repaintTimerId = startTimer( time ); + if ( !d->tqrepaintTimerId ) + d->tqrepaintTimerId = startTimer( time ); // kdDebug() << "starting timer " << time << endl; } @@ -3641,13 +3641,13 @@ void KHTMLView::complete( bool pendingAction ) KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } - // is there a repaint pending? - if (d->repaintTimerId) + // is there a tqrepaint pending? + if (d->tqrepaintTimerId) { -// kdDebug() << "requesting repaint now" << endl; +// kdDebug() << "requesting tqrepaint now" << endl; // do it now - killTimer(d->repaintTimerId); - d->repaintTimerId = startTimer( 20 ); + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = startTimer( 20 ); d->emitCompletedAfterRepaint = pendingAction ? KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } @@ -3698,7 +3698,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 repaint the selection on keepSelection!=false + // ### does not tqrepaint 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; @@ -3841,7 +3841,7 @@ void KHTMLView::showCaret(bool forceRepaint) d->m_caretViewContext->width, d->m_caretViewContext->height); } else { - repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); }/*end if*/ @@ -3873,9 +3873,9 @@ void KHTMLView::hideCaret() if (d->m_caretViewContext->visible) { // kdDebug(6200) << "redraw caret hidden" << endl; d->m_caretViewContext->visible = false; - // force repaint, otherwise the event won't be handled + // force tqrepaint, otherwise the event won't be handled // before the focus leaves the window - repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); d->m_caretViewContext->visible = true; @@ -4426,7 +4426,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().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; + //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " 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 a79eff17f..b9bf47222 100644 --- a/khtml/khtmlview.h +++ b/khtml/khtmlview.h @@ -75,7 +75,7 @@ class KHTMLViewPrivate; * * Suitable for use as an application's main view. **/ -class KHTML_EXPORT KHTMLView : public QScrollView +class KHTML_EXPORT KHTMLView : public TQScrollView { Q_OBJECT @@ -179,7 +179,7 @@ signals: void cleared(); void zoomView( int ); void hideAccessKeys(); - void repaintAccessKeys(); + void tqrepaintAccessKeys(); void findAheadActive( bool ); //#define NO_SMOOTH_SCROLL_HACK #ifndef NO_SMOOTH_SCROLL_HACK @@ -231,7 +231,7 @@ protected slots: #ifndef NO_SMOOTH_SCROLL_HACK void scrollTick(); #else - void scrollTick() {}; // moc cannot handle #if + void scrollTick() {}; // tqmoc cannot handle #if #endif private slots: @@ -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 repaint, otherwise - * do a scheduled repaint + * @param forceRepaint @p true to force an immediate tqrepaint, otherwise + * do a scheduled tqrepaint */ void showCaret(bool forceRepaint = false); /** makes the caret invisible, but does not influence the frequency timer. diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui index 3e2eea389..7a86c2569 100644 --- a/khtml/kjserrordlg.ui +++ b/khtml/kjserrordlg.ui @@ -63,7 +63,7 @@ Expanding - + 311 21 diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 17ea9d485..ef76339ab 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( parentWidget, widgetName ); + TQVBox *box = new TQVBox( tqparentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); @@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) } else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) ) { - TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower(); + TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower(); if (encoding == "gzip" || encoding == "x-gzip") { m_gzip = true; } else { @@ -245,8 +245,8 @@ 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::fromLatin1( line.data() + 14 ).stripWhiteSpace(); - int semicolon = m_nextMimeType.find( ';' ); + m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); + int semicolon = m_nextMimeType.tqfind( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl; @@ -266,14 +266,14 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie: kdDebug() << "Ignoring header " << line << endl; } else { - if ( !qstrncmp( line, m_boundary, m_boundaryLength ) ) + if ( !tqstrncmp( line, m_boundary, m_boundaryLength ) ) { #ifdef DEBUG_PARSING kdDebug() << "boundary found!" << endl; kdDebug() << "after it is " << line.data() + m_boundaryLength << endl; #endif // Was it the very last boundary ? - if ( !qstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) + if ( !tqstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) { #ifdef DEBUG_PARSING kdDebug() << "Completed!" << endl; diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index f3bf95219..a17269d74 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart { Q_OBJECT public: - KMultiPart( TQWidget *parentWidget, const char *widgetName, + KMultiPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KMultiPart(); diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index 5efcaf98d..58d531384 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 alignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */ /* 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 alignment slop */ + sz += sizeof *a + pool->mask; /* header and tqalignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index f227f4014..bd831c125 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -170,7 +170,7 @@ static int findXMLEncoding(const TQCString &str, int &encodingLength) { int len = str.length(); - int pos = str.find("encoding"); + int pos = str.tqfind("encoding"); if (pos == -1) return -1; pos += 8; @@ -365,10 +365,10 @@ TQString Decoder::decode(const char *data, int len) TQCString str( ptr, (end-ptr)+1); str = str.lower(); int pos = 0; - //if( (pos = str.find("http-equiv", pos)) == -1) break; - //if( (pos = str.find("content-type", pos)) == -1) break; + //if( (pos = str.tqfind("http-equiv", pos)) == -1) break; + //if( (pos = str.tqfind("content-type", pos)) == -1) break; while( pos < ( int ) str.length() ) { - if( (pos = str.find("charset", pos)) == -1) break; + if( (pos = str.tqfind("charset", pos)) == -1) break; pos += 7; // skip whitespace.. while( pos < (int)str.length() && str[pos] <= ' ' ) pos++; diff --git a/khtml/misc/helper.cpp b/khtml/misc/helper.cpp index f56a4ba92..8c0b79ab5 100644 --- a/khtml/misc/helper.cpp +++ b/khtml/misc/helper.cpp @@ -66,12 +66,12 @@ double calcHue(double temp1, double temp2, double hueVal) // explanation available at http://en.wikipedia.org/wiki/HSL_color_space // all values are in the range of 0 to 1.0 -QRgb khtml::qRgbaFromHsla(double h, double s, double l, double a) +QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a) { double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s; double temp1 = 2.0 * l - temp2; - return qRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); + return tqRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); } /** finds out the background color of an element diff --git a/khtml/misc/helper.h b/khtml/misc/helper.h index 85442fae8..167a2a68e 100644 --- a/khtml/misc/helper.h +++ b/khtml/misc/helper.h @@ -40,7 +40,7 @@ namespace khtml bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); TQColor retrieveBackgroundColor(const RenderObject *obj); - QRgb qRgbaFromHsla(double h, double s, double l, double a); + QRgb tqRgbaFromHsla(double h, double s, double l, double a); //enumerator for findSelectionNode enum FindSelectionResult { SelectionPointBefore, diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 779792e71..6f420e3b3 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("shape")]; + char spool_attr_str45[sizeof("tqshape")]; 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", - "shape", + "tqshape", "charset", "charoff", "lang", diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index e4fb531a1..b0c8dc613 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -33,7 +33,7 @@ namespace khtml const int UNDEFINED = -1; - // alignment + // tqalignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; @@ -103,7 +103,7 @@ namespace khtml unsigned type : 3; bool quirk : 1; } l; - Q_UINT32 _length; + TQ_UINT32 _length; }; }; diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h index 0d9535ba9..0910a685b 100644 --- a/khtml/misc/knsplugininstaller.h +++ b/khtml/misc/knsplugininstaller.h @@ -87,7 +87,7 @@ private: * This class contain all the the methods used to perform a plugin installation * */ -class KNSPluginInstallEngine : public QObject +class KNSPluginInstallEngine : public TQObject { Q_OBJECT public: diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index d6e463b02..3d9d7b531 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -144,7 +144,7 @@ void CachedObject::deref(CachedObjectClient *c) assert( c ); assert( m_clients.count() ); assert( !canDelete() ); - assert( m_clients.find( c ) ); + assert( m_clients.tqfind( c ) ); Cache::flush(); @@ -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::fromLatin1( accept ); + TQString ah = TQString::tqfromLatin1( 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 // and refuse to serve them if we only accept application/x-javascript. - setAccept( TQString::fromLatin1("*/*") ); + setAccept( TQString::tqfromLatin1("*/*") ); // load the file Cache::loader()->load(dl, this, false); m_loading = true; @@ -476,7 +476,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl pixPart = 0; bg = 0; scaled = 0; - bgColor = qRgba( 0, 0, 0, 0xFF ); + bgColor = tqRgba( 0, 0, 0, 0xFF ); typeChecked = false; isFullyTransparent = false; monochrome = false; @@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c ) const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight) { - static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF ); + static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF ); TQSize s(pixmap_size()); int w = xWidth; @@ -709,8 +709,8 @@ void CachedImage::movieStatus(int status) const TQImage& im = m->frameImage(); monochrome = ( ( im.depth() <= 8 ) && ( im.numColors() - int( im.hasAlphaBuffer() ) <= 2 ) ); for (int i = 0; monochrome && i < im.numColors(); ++i) - if (im.colorTable()[i] != qRgb(0xff, 0xff, 0xff) && - im.colorTable()[i] != qRgb(0x00, 0x00, 0x00)) + if (im.colorTable()[i] != tqRgb(0xff, 0xff, 0xff) && + im.colorTable()[i] != tqRgb(0x00, 0x00, 0x00)) monochrome = false; if( (im.width() < 5 || im.height() < 5) && im.hasAlphaBuffer()) // only evaluate for small images { @@ -816,7 +816,7 @@ void CachedImage::clear() delete p; p = 0; delete bg; bg = 0; delete scaled; scaled = 0; - bgColor = qRgba( 0, 0, 0, 0xff ); + bgColor = tqRgba( 0, 0, 0, 0xff ); bgSize = TQSize(-1,-1); delete pixPart; pixPart = 0; @@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative) void DocLoader::insertCachedObject( CachedObject* o ) const { - if ( m_docObjects.find(o) ) + if ( m_docObjects.tqfind(o) ) return; m_docObjects.insert( o, o ); if ( m_docObjects.count() > 3 * m_docObjects.size() ) @@ -1167,7 +1167,7 @@ void Loader::servePendingRequests() { job->addMetaData( "cross-domain", part->toplevelURL().url() ); if (part->widget()) - job->setWindow (part->widget()->topLevelWidget()); + job->setWindow (part->widget()->tqtopLevelWidget()); } } diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h index 4314e950e..e950f1767 100644 --- a/khtml/misc/loader.h +++ b/khtml/misc/loader.h @@ -405,7 +405,7 @@ namespace khtml /** * @internal */ - class Loader : public QObject + class Loader : public TQObject { Q_OBJECT diff --git a/khtml/misc/loader_jpeg.cpp b/khtml/misc/loader_jpeg.cpp index 57174fe1b..8c6404924 100644 --- a/khtml/misc/loader_jpeg.cpp +++ b/khtml/misc/loader_jpeg.cpp @@ -358,7 +358,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* } else if ( cinfo.output_components == 1 ) { image.create( cinfo.output_width, cinfo.output_height, 8, 256 ); for (int i=0; i<256; i++) - image.setColor(i, qRgb(i,i,i)); + image.setColor(i, tqRgb(i,i,i)); } #ifdef JPEG_DEBUG @@ -431,7 +431,7 @@ again: for (uint i=cinfo.output_width; i--; ) { in-=3; - out[i] = qRgb(in[0], in[1], in[2]); + out[i] = tqRgb(in[0], in[1], in[2]); } } } diff --git a/khtml/misc/loader_jpeg.h b/khtml/misc/loader_jpeg.h index c97b2bcbf..87b18a8b5 100644 --- a/khtml/misc/loader_jpeg.h +++ b/khtml/misc/loader_jpeg.h @@ -35,7 +35,7 @@ namespace khtml * * An incremental loader factory for JPEG's. */ - class KJPEGFormatType : public QImageFormatType + class KJPEGFormatType : public TQImageFormatType { public: TQImageFormat* decoderFor(const uchar* buffer, int length); diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 125e8e07d..fbd883457 100644 --- a/khtml/misc/multimap.h +++ b/khtml/misc/multimap.h @@ -42,7 +42,7 @@ public: typedef MultiMapPtrList List; void append(void* key, T* element) { - List *list = dict.find(key); + List *list = dict.tqfind(key); if (!list){ list = new List(8); dict.insert(key, list); @@ -50,7 +50,7 @@ public: list->append(element); } void remove(void* key, T* element) { - List *list = dict.find(key); + List *list = dict.tqfind(key); if (list) { list->remove(element); if (list->isEmpty()) dict.remove(key); @@ -60,7 +60,7 @@ public: dict.remove(key); } List* find(void* key) { - return dict.find(key); + return dict.tqfind(key); } private: TQPtrDict dict; @@ -70,7 +70,7 @@ private: static inline unsigned int stupidHash(void* ptr) { unsigned long val = (unsigned long)ptr; - // remove alignment and multiply by a prime unlikely to be a factor of size + // remove tqalignment 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 789f22af8..d56a78397 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.unicode(); l = str.length(); lines = 0; } + { s = str.tqunicode(); 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.unicode()) {} + TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {} 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.unicode() == m_current) { + if (m_string.tqunicode() == m_current) { if (str.isEmpty()) str = m_string; else diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index bd010047a..80aede1ef 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()->unicodeBidi(); + EUnicodeBidi ub = next->style()->tqunicodeBidi(); 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()->unicodeBidi() != UBNormal && !emptyRun ) { + if ( adjustEmbedding && current->style()->tqunicodeBidi() != 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(endpoint.obj); if (endpoint.pos+1 < textObj->length() && - textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN) + textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN) return; } endpoint.pos--; @@ -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 unicode-bidi property + // for the CSS tqunicode-bidi property adjustEmbedding = true; bidi.current.increment( bidi ); adjustEmbedding = false; @@ -1329,7 +1329,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin m_overflowHeight = 0; - invalidateVerticalPositions(); + tqinvalidateVerticalPositions(); #ifdef DEBUG_LAYOUT TQTime qt; qt.start(); @@ -1360,7 +1360,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin RenderObject *o = first( this, bidi, false ); while ( o ) { if (o->markedForRepaint()) { - o->repaintDuringLayout(); + o->tqrepaintDuringLayout(); o->setMarkedForRepaint(false); } if (o->isReplaced() || o->isFloating() || o->isPositioned()) { @@ -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().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.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.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.unicode() == SOFT_HYPHEN && pos > 0) { + if (c.tqunicode() == 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].unicode() == SOFT_HYPHEN) ) + } else if ( (pos > 1 && str[pos-1].tqunicode() == 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(lBreak.obj)->text()[lBreak.pos-1]; - if (c.unicode() == SOFT_HYPHEN) + if (c.tqunicode() == SOFT_HYPHEN) chopMidpointsAt(lBreak.obj, lBreak.pos-2); } diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h index 5176e5fb0..ed6df2aab 100644 --- a/khtml/rendering/break_lines.h +++ b/khtml/rendering/break_lines.h @@ -6,7 +6,7 @@ namespace khtml { /* - array of unicode codes where breaking shouldn't occur. + array of tqunicode 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->unicode(); + unsigned short ch = c->tqunicode(); 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->unicode()) && - break_bsearch(dontbreakafter, (str+(pos-1))->unicode()); + return break_bsearch(dontbreakbefore, c->tqunicode()) && + break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode()); } else // no asian font return c->isSpace(); } else { diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp index 9cfe149ad..57445c12b 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::fromLatin1("'"); + letter = toHebrew(number/1000) + TQString::tqfromLatin1("'"); number = number%1000; } diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp index a33f0e082..64ede83e3 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.unicode(); + const TQChar *uc = qstr.tqunicode(); const TQFontMetrics sc_fm( *scFont ); for ( int i = 0; i < len; ++i ) { if ( (uc+i)->category() == TQChar::Letter_Lowercase ) diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp index fce22f7c8..3bf373f73 100644 --- a/khtml/rendering/render_applet.cpp +++ b/khtml/rendering/render_applet.cpp @@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const int rval = 300; if( m_widget ) - rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width(); + rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width(); return rval > 10 ? rval : 50; } @@ -80,7 +80,7 @@ int RenderApplet::intrinsicHeight() const int rval = 150; if( m_widget ) - rval = m_widget->sizeHint().height(); + rval = m_widget->tqsizeHint().height(); return rval > 10 ? rval : 50; } @@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap &args) KJavaApplet* applet = w ? w->applet() : 0; if ( applet ) { - applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] ); - applet->setAppletClass( args[TQString::fromLatin1("code") ] ); + applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] ); + applet->setAppletClass( args[TQString::tqfromLatin1("code") ] ); - TQString str = args[TQString::fromLatin1("codeBase") ]; + TQString str = args[TQString::tqfromLatin1("codeBase") ]; if( !str.isEmpty() ) applet->setCodeBase( str ); - str = args[TQString::fromLatin1("name") ]; + str = args[TQString::tqfromLatin1("name") ]; if( !str.isNull() ) applet->setAppletName( str ); else - applet->setAppletName( args[TQString::fromLatin1("code") ] ); + applet->setAppletName( args[TQString::tqfromLatin1("code") ] ); - str = args[TQString::fromLatin1("archive") ]; + str = args[TQString::tqfromLatin1("archive") ]; if( !str.isEmpty() ) - applet->setArchives( args[TQString::fromLatin1("archive") ] ); + applet->setArchives( args[TQString::tqfromLatin1("archive") ] ); } } diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp index 99fbf4f4d..023b98e36 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 alignment for pointers. Important for Tru64 + // Ensure we have correct tqalignment 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 alignment for pointers. Important for Tru64 + // Ensure we have correct tqalignment 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 ccbb6fad0..764eecb55 100644 --- a/khtml/rendering/render_block.cpp +++ b/khtml/rendering/render_block.cpp @@ -635,7 +635,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren) } if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -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(fc)->stringLength() == 1 && - static_cast(fc)->text()[0].unicode() == ' '; + static_cast(fc)->text()[0].tqunicode() == ' '; } RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled) @@ -1581,7 +1581,7 @@ void RenderBlock::layoutPositionedObjects(bool relayoutChildren) for ( ; (r = it.current()); ++it ) { //kdDebug(6040) << " have a positioned object" << endl; if (r->markedForRepaint()) { - r->repaintDuringLayout(); + r->tqrepaintDuringLayout(); r->setMarkedForRepaint(false); } if ( relayoutChildren || r->style()->position() == FIXED || diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp index 930ec358c..2ed114a53 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::repaint(Priority p) +void RenderBody::tqrepaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->repaint(p); + cb->tqrepaint(p); } void RenderBody::layout() diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h index 7951f73e1..17c237e91 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 repaint(Priority p=NormalPriority); + virtual void tqrepaint(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 e6742d54e..602b07d0a 100644 --- a/khtml/rendering/render_box.cpp +++ b/khtml/rendering/render_box.cpp @@ -490,7 +490,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba TQColor bgColor = c; // Paint the color first underneath all images. - if (!bgLayer->next() && bgColor.isValid() && qAlpha(bgColor.rgb()) > 0) + if (!bgLayer->next() && bgColor.isValid() && tqAlpha(bgColor.rgb()) > 0) p->fillRect(_tx, clipy, w, cliph, bgColor); // no progressive loading of the background image @@ -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 repaint-clip + // restrict painting to tqrepaint-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::repaint(Priority prior) +void RenderBox::tqrepaint(Priority prior) { int ow = style() ? style()->outlineSize() : 0; if( isInline() && !isReplaced() ) @@ -806,17 +806,17 @@ void RenderBox::repaint(Priority prior) p = p->parent(); int xoff = p->hasOverflowClip() ? 0 : p->overflowLeft(); int yoff = p->hasOverflowClip() ? 0 : p->overflowTop(); - p->repaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); + p->tqrepaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); } else { int xoff = hasOverflowClip() ? 0 : overflowLeft(); int yoff = hasOverflowClip() ? 0 : overflowTop(); - repaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); + tqrepaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } } -void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { x += m_x; y += m_y; @@ -830,7 +830,7 @@ void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) if (style()->position() == FIXED) f=true; - // kdDebug( 6040 ) << "RenderBox(" <layer()) { @@ -839,7 +839,7 @@ void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) if (style()->position() == ABSOLUTE) o->layer()->checkInlineRelOffset(this,x,y); } - o->repaintRectangle(x, y, w, h, p, f); + o->tqrepaintRectangle(x, y, w, h, p, f); } } diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h index c0c618d5c..8158d6037 100644 --- a/khtml/rendering/render_box.h +++ b/khtml/rendering/render_box.h @@ -87,9 +87,9 @@ public: virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; - virtual void repaint(Priority p=NormalPriority); + virtual void tqrepaint(Priority p=NormalPriority); - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual short containingBlockWidth() const; void relativePositionOffset(int &tx, int &ty) const; diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp index e8540eba6..2065d8b1a 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -217,11 +217,11 @@ void RenderCanvas::updateDocumentSize() // if we are about to show a scrollbar, and the document is sized to the viewport w or h, // then reserve the scrollbar space so that it doesn't trigger the _other_ scrollbar - if (!vss && m_width - m_view->verticalScrollBar()->sizeHint().width() == s.width() && + if (!vss && m_width - m_view->verticalScrollBar()->tqsizeHint().width() == s.width() && m_cachedDocWidth <= m_width) hDocW = kMin( m_cachedDocWidth, s.width() ); - if (!hss && m_height - m_view->horizontalScrollBar()->sizeHint().height() == s.height() && + if (!hss && m_height - m_view->horizontalScrollBar()->tqsizeHint().height() == s.height() && m_cachedDocHeight <= m_height) hDocH = kMin( m_cachedDocHeight, s.height() ); @@ -269,7 +269,7 @@ bool RenderCanvas::needsFullRepaint() const return m_needsFullRepaint || m_pagedMode; } -void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap) +void RenderCanvas::tqrepaintViewRectangle(int x, int y, int w, int h, bool asap) { KHTMLAssert( view() ); view()->scheduleRepaint( x, y, w, h, asap ); @@ -332,7 +332,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /* 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) +void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { if (m_staticMode) return; // kdDebug( 6040 ) << "updating views contents (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; @@ -353,7 +353,7 @@ void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool if (p == RealtimePriority) // ### KWQ's updateContents has an additional parameter "now". // It's not clear what the difference between updateContents(...,true) - // and repaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) + // and tqrepaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) m_view->updateContents(ur/*, true*/); else if (p == HighPriority) m_view->scheduleRepaint(x, y, w, h, true /*asap*/); @@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints() if (!needsFullRepaint()) { TQValueList::const_iterator it; for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it ) - (*it)->repaint(); + (*it)->tqrepaint(); } - //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl; + //kdDebug(6040) << "scheduled deferred tqrepaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl; m_dirtyChildren.clear(); } -void RenderCanvas::repaint(Priority p) +void RenderCanvas::tqrepaint(Priority p) { if (m_view && !m_staticMode) { if (p == RealtimePriority) { @@ -388,7 +388,7 @@ void RenderCanvas::repaint(Priority p) m_view->scheduleRelayout(); return; } - // ### same as in repaintRectangle + // ### same as in tqrepaintRectangle m_view->updateContents(m_view->contentsX(), m_view->contentsY(), m_view->visibleWidth(), m_view->visibleHeight()/*, true*/); } @@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQRect updateRect; - // Don't use repaint() because it will cause all rects to + // Don't use tqrepaint() 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->repaint(); + o->tqrepaint(); o->setSelectionState(SelectionNone); - o->repaint(); + o->tqrepaint(); 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->repaint(); + m_selectionEnd->tqrepaint(); } // set selection start & end to 0 diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index 17f279d7b..82b59705b 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -61,9 +61,9 @@ public: KHTMLView *view() const { return m_view; } - 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); + virtual void tqrepaint(Priority p=NormalPriority); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false); bool needsFullRepaint() const; void deferredRepaint( RenderObject* o ); void scheduleDeferredRepaints(); @@ -137,7 +137,7 @@ protected: void updateDocumentSize(); // internal setters for cached values of document width/height - // Setting to -1/-1 invalidates the cache. + // Setting to -1/-1 tqinvalidates the cache. void setCachedDocWidth(int w ) { m_cachedDocWidth = w; } void setCachedDocHeight(int h) { m_cachedDocHeight = h; } diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp index 69f987477..45cfc5729 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 repaint, so that the area exposed when the child - // disappears gets repainted properly. + // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child + // disappears gets tqrepainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->repaint(); + oldChild->tqrepaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp index ae579bd46..2d56e8f40 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::repaint(Priority prior) +void RenderFlow::tqrepaint(Priority prior) { if (isInlineFlow()) { // Find our leftmost position. @@ -280,7 +280,7 @@ void RenderFlow::repaint(Priority prior) if (curr == firstLineBox() || curr->xPos() < left) left = curr->xPos(); - // Now invalidate a rectangle. + // Now tqinvalidate 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 @@ -295,18 +295,18 @@ void RenderFlow::repaint(Priority prior) } RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0; - containingBlock()->repaintRectangle(-ow+left, -ow+top, + containingBlock()->tqrepaintRectangle(-ow+left, -ow+top, width()+ow*2, (lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2, prior); } else { if (firstLineBox() && firstLineBox()->topOverflow() < 0) { int ow = style() ? style()->outlineSize() : 0; - repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), + tqrepaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } else - return RenderBox::repaint(prior); + return RenderBox::tqrepaint(prior); } } diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h index 1e23822bb..3267a92f1 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 repaint(Priority p=NormalPriority); + virtual void tqrepaint(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 58a9a8d33..f06dd4a62 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -99,7 +99,7 @@ void RenderFormElement::layout() setNeedsLayout(false); } -Qt::AlignmentFlags RenderFormElement::textAlignment() const +TQ_Alignment RenderFormElement::textAlignment() const { switch (style()->textAlign()) { case LEFT: @@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQCheckBox *cb = static_cast( m_widget ); - TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ), - cb->style().pixelMetric( TQStyle::PM_IndicatorHeight ) ); + TQSize s( cb->style().tqpixelMetric( TQStyle::PM_IndicatorWidth ), + cb->style().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQRadioButton *rb = static_cast( m_widget ); - TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), - rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); + TQSize s( rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), + rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth() bool empty = raw.isEmpty(); if ( empty ) - raw = TQString::fromLatin1("X"); + raw = TQString::tqfromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); - int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + - pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; + int margin = pb->style().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) + + pb->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; int w = ts.width() + margin; int h = s.height(); if (pb->isDefault() || pb->autoDefault()) { - int dbw = pb->style().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; + int dbw = pb->style().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; w += dbw; } @@ -491,7 +491,7 @@ void RenderLineEdit::setStyle(RenderStyle* _style) { RenderFormElement::setStyle( _style ); - widget()->setAlignment(textAlignment()); + widget()->tqsetAlignment(textAlignment()); } void RenderLineEdit::highLightWord( unsigned int length, unsigned int pos ) @@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth() edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); - TQSize bs = static_cast( m_widget )->minimumSizeHint() - edit->minimumSizeHint(); + TQSize bs = static_cast( m_widget )->tqminimumSizeHint() - edit->tqminimumSizeHint(); setIntrinsicWidth( s.width() + bs.width() ); setIntrinsicHeight( kMax(s.height(), bs.height()) ); @@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement() DOMString label = optElem->getAttribute(ATTR_LABEL); if (!label.isEmpty()) text = label.string(); - text = TQString::fromLatin1(" ")+text; + text = TQString::tqfromLatin1(" ")+text; } if(m_useListBox) { @@ -1107,14 +1107,14 @@ void RenderSelect::layout( ) if(size < 1) size = kMin(static_cast(m_widget)->count(), 10u); - width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width(); + width += 2*w->frameWidth() + w->verticalScrollBar()->tqsizeHint().width(); height = size*height + 2*w->frameWidth(); setIntrinsicWidth( width ); setIntrinsicHeight( height ); } else { - TQSize s(m_widget->sizeHint()); + TQSize s(m_widget->tqsizeHint()); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); } @@ -1450,7 +1450,7 @@ void TextAreaWidget::slotReplaceNext() if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { viewport()->setUpdatesEnabled(true); - repaintChanged(); + tqrepaintChanged(); } if (res == KFind::NoMatch) { // at end @@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth() const TQFontMetrics &m = style()->fontMetrics(); w->setTabStopWidth(8 * m.width(" ")); TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() + - w->verticalScrollBar()->sizeHint().width(), + w->verticalScrollBar()->tqsizeHint().width(), kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 + (w->wordWrap() == TQTextEdit::NoWrap ? - w->horizontalScrollBar()->sizeHint().height() : 0) + w->horizontalScrollBar()->tqsizeHint().height() : 0) ); setIntrinsicWidth( size.width() ); @@ -1670,7 +1670,7 @@ void RenderTextArea::setStyle(RenderStyle* _style) RenderFormElement::setStyle(_style); widget()->blockSignals(true); - widget()->setAlignment(textAlignment()); + widget()->tqsetAlignment(textAlignment()); widget()->blockSignals(false); scrollbarsStyled = false; @@ -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::fromLatin1("\n")); + paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n")); lindex = w->lineOfChar(p, l); } } txt += paragraphText; if (p < w->paragraphs() - 1) - txt += TQString::fromLatin1("\n"); + txt += TQString::tqfromLatin1("\n"); } } else diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index 3d06b7e6d..b157df16d 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -728,16 +728,16 @@ void RenderPartObject::updateWidget() HTMLParamElementImpl *p = static_cast( child ); TQString aStr = p->name(); - aStr += TQString::fromLatin1("=\""); + aStr += TQString::tqfromLatin1("=\""); aStr += p->value(); - aStr += TQString::fromLatin1("\""); + aStr += TQString::tqfromLatin1("\""); TQString name_lower = p->name().lower(); - if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) { + if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) { objbase->setServiceType(p->value()); } else if (url.isEmpty() && - (name_lower == TQString::fromLatin1("src") || - name_lower == TQString::fromLatin1("movie") || - name_lower == TQString::fromLatin1("code"))) { + (name_lower == TQString::tqfromLatin1("src") || + name_lower == TQString::tqfromLatin1("movie") || + name_lower == TQString::tqfromLatin1("code"))) { url = p->value(); } params.append(aStr); @@ -754,8 +754,8 @@ void RenderPartObject::updateWidget() } } } - params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); - params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); + params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); + params.append( TQString::tqfromLatin1("__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::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); - params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); + params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); + params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) - params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { - params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::tqfromLatin1("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::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) { - params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::tqfromLatin1("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::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { + if(classId.tqfind(TQString::tqfromLatin1("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::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) serviceType = "audio/x-pn-realaudio-plugin"; - else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || - objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || + objbase->classId.tqfind(TQString::tqfromLatin1("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::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("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::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || - classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) + else if(objbase->classId.tqfind(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || + classId.tqfind(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) serviceType = "video/x-msvideo"; else diff --git a/khtml/rendering/render_frames.h b/khtml/rendering/render_frames.h index 3dd7ed0d9..c6e93cbe0 100644 --- a/khtml/rendering/render_frames.h +++ b/khtml/rendering/render_frames.h @@ -61,7 +61,7 @@ public: bool canResize( int _x, int _y); void setResizing(bool e); - Qt::CursorShape cursorShape() const { return m_cursor; } + Qt::tqCursorShape cursorShape() const { return m_cursor; } bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); @@ -73,7 +73,7 @@ public: #endif private: - Qt::CursorShape m_cursor; + Qt::tqCursorShape m_cursor; int m_oldpos; int m_gridLen[2]; int* m_gridDelta[2]; diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp index 17c65fc9c..ba80a5aa1 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.unicode(), m_item.length()); + str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length()); str->ref(); RenderText::calcMinMaxWidth(); diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index 120e75361..2db7e56bb 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -196,10 +196,10 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) resizeCache = TQPixmap(); // for resized animations if(completeRepaint) - repaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); + tqrepaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); else { - repaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), + tqrepaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), r.width(), r.height()); } } @@ -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; - repaint(); + tqrepaint(); } RenderReplaced::notifyFinished(finishedObj); diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index 2b7e93f1f..d1cdfa63e 100644 --- a/khtml/rendering/render_layer.cpp +++ b/khtml/rendering/render_layer.cpp @@ -195,17 +195,17 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) return r; } -void RenderLayer::repaint( Priority p, bool markForRepaint ) +void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) { if (markForRepaint && m_markedForRepaint) return; for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) - child->repaint( p, markForRepaint ); + child->tqrepaint( p, markForRepaint ); TQRect layerBounds, damageRect, fgrect; calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect); m_visibleRect = damageRect.intersect( layerBounds ); if (m_visibleRect.isValid()) - renderer()->canvas()->repaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); + renderer()->canvas()->tqrepaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); if (markForRepaint) m_markedForRepaint = true; } @@ -213,7 +213,7 @@ void RenderLayer::repaint( Priority p, bool markForRepaint ) void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint) { if (doFullRepaint) { - m_object->repaint(); + m_object->tqrepaint(); checkForRepaint = doFullRepaint = false; } @@ -233,14 +233,14 @@ void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepain #ifdef APPLE_CHANGES // FIXME: Child object could override visibility. if (checkForRepaint && (m_object->style()->visibility() == VISIBLE)) - m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect); + m_object->tqrepaintAfterLayoutIfNeeded(m_tqrepaintRect, m_fullRepaintRect); #else if (checkForRepaint && m_markedForRepaint) { TQRect layerBounds, damageRect, fgrect; calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect); TQRect vr = damageRect.intersect( layerBounds ); if (vr != m_visibleRect && vr.isValid()) { - renderer()->canvas()->repaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); + renderer()->canvas()->tqrepaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); m_visibleRect = vr; } } @@ -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 repaint) +void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint) { 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 repai // Fire the scroll DOM event. m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); - // Just schedule a full repaint of our object. - if (repaint) - m_object->repaint(RealtimePriority); + // Just schedule a full tqrepaint of our object. + if (tqrepaint) + m_object->tqrepaint(RealtimePriority); if (updateScrollbars) { if (m_hBar) @@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth() #ifdef APPLE_CHANGES return m_vBar->width(); #else - return m_vBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + return m_vBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight() #ifdef APPLE_CHANGES return m_hBar->height(); #else - return m_hBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + return m_hBar->style().tqpixelMetric(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->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + int sw = b->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); if (m_vBar) { TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1); diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h index b65047391..1176a63a3 100644 --- a/khtml/rendering/render_layer.h +++ b/khtml/rendering/render_layer.h @@ -63,7 +63,7 @@ namespace khtml { class RenderObject; class RenderScrollMediator; -class RenderScrollMediator: public QObject +class RenderScrollMediator: public TQObject { Q_OBJECT public: @@ -78,7 +78,7 @@ private: }; // This class handles the auto-scrolling of layers with overflow: marquee. -class Marquee: public QObject +class Marquee: public TQObject { Q_OBJECT @@ -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 repaint = true); + void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = 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 repaint(Priority p=NormalPriority, bool markForRepaint = false); + void tqrepaint(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 b08ec6eb9..45767a8bb 100644 --- a/khtml/rendering/render_list.cpp +++ b/khtml/rendering/render_list.cpp @@ -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|Qt::DontClip, m_item); p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, - TQString::fromLatin1(". ")); + TQString::tqfromLatin1(". ")); } else { - const TQString& punct(TQString::fromLatin1(" .")); + const TQString& punct(TQString::tqfromLatin1(" .")); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } } else { if (style()->direction() == LTR) { - const TQString& punct(TQString::fromLatin1(". ")); + const TQString& punct(TQString::tqfromLatin1(". ")); p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|Qt::DontClip, punct); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|Qt::DontClip, m_item); } else { - const TQString& punct(TQString::fromLatin1(" .")); + const TQString& punct(TQString::tqfromLatin1(" .")); p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } @@ -387,7 +387,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag if(m_width != m_listImage->pixmap_size().width() || m_height != m_listImage->pixmap_size().height()) setNeedsLayoutAndMinMaxRecalc(); else - repaintRectangle(0, 0, m_width, m_height); + tqrepaintRectangle(0, 0, m_width, m_height); } void RenderListMarker::calcMinMaxWidth() @@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth() default: KHTMLAssert(false); } - m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); + m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". ")); } end: diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index c5ee68720..2efeae238 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -71,8 +71,8 @@ using namespace khtml; #define COLOR_DARK_BS_FACTOR 30 #define COLOR_DARK_TS_FACTOR 50 -#define LIGHT_GRAY qRgb(192, 192, 192) -#define DARK_GRAY qRgb(96, 96, 96) +#define LIGHT_GRAY tqRgb(192, 192, 192) +#define DARK_GRAY tqRgb(96, 96, 96) #ifndef NDEBUG static void *baseOfRenderObjectBeingDeleted; @@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image) { - //repaint bg when it finished loading + //tqrepaint bg when it finished loading if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) { - isBody() ? canvas()->repaint() : repaint(); + isBody() ? canvas()->tqrepaint() : tqrepaint(); } } @@ -1103,9 +1103,9 @@ void RenderObject::paint( PaintInfo&, int /*tx*/, int /*ty*/) { } -void RenderObject::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderObject::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - if(parent()) parent()->repaintRectangle(x, y, w, h, p, f); + if(parent()) parent()->tqrepaintRectangle(x, y, w, h, p, f); } #ifdef ENABLE_DUMP @@ -1164,15 +1164,15 @@ TQString RenderObject::information() const << " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk() << "}" << (isTableCell() ? - ( TQString::fromLatin1(" [r=") + + ( TQString::tqfromLatin1(" [r=") + TQString::number( static_cast(this)->row() ) + - TQString::fromLatin1(" c=") + + TQString::tqfromLatin1(" c=") + TQString::number( static_cast(this)->col() ) + - TQString::fromLatin1(" rs=") + + TQString::tqfromLatin1(" rs=") + TQString::number( static_cast(this)->rowSpan() ) + - TQString::fromLatin1(" cs=") + + TQString::tqfromLatin1(" cs=") + TQString::number( static_cast(this)->colSpan() ) + - TQString::fromLatin1("]") ) : TQString::null ); + TQString::tqfromLatin1("]") ) : 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 repaint with the old style + // schedule a tqrepaint with the old style if (layer() && !isInlineFlow()) - layer()->repaint(pri); + layer()->tqrepaint(pri); else - repaint(pri); + tqrepaint(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 repaint is enough + // a tqrepaint 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()->repaint(pri); + layer()->tqrepaint(pri); else - repaint(pri); + tqrepaint(pri); } } } @@ -1423,14 +1423,14 @@ void RenderObject::dirtyFormattingContext( bool checkContainer ) m_parent->dirtyFormattingContext(false); } -void RenderObject::repaintDuringLayout() +void RenderObject::tqrepaintDuringLayout() { if (canvas()->needsFullRepaint() || isText()) return; if (layer() && !isInlineFlow()) { - layer()->repaint( NormalPriority, true ); + layer()->tqrepaint( NormalPriority, true ); } else { - repaint(); + tqrepaint(); 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 valignment. + // don't allow elements nested inside text-top to have a different vtqalignment. if ( va == BASELINE ) return vpos; else if ( va == LENGTH ) @@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2; } -void RenderObject::invalidateVerticalPositions() +void RenderObject::tqinvalidateVerticalPositions() { m_verticalPosition = PositionUndefined; RenderObject *child = firstChild(); while( child ) { - child->invalidateVerticalPositions(); + child->tqinvalidateVerticalPositions(); child = child->nextSibling(); } } diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index f7f772387..2e67807c3 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -327,7 +327,7 @@ public: void setOverhangingContents(bool p=true); void markContainingBlocksForLayout(); void dirtyFormattingContext( bool checkContainer ); - void repaintDuringLayout(); + void tqrepaintDuringLayout(); void setNeedsLayout(bool b, bool markParents = true); void setChildNeedsLayout(bool b, bool markParents = true); void setMinMaxKnown(bool b=true) { @@ -441,7 +441,7 @@ public: void layoutIfNeeded() { if (needsLayout()) layout(); } // used for element state updates that can not be fixed with a - // repaint and do not need a relayout + // tqrepaint and do not need a relayout virtual void updateFromElement() {} // Called immediately after render-object is inserted @@ -681,9 +681,9 @@ public: // Used by collapsed border tables. virtual void collectBorders(TQValueList& borderStyles); - // 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); + // force a complete tqrepaint + virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); } + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual unsigned int length() const { return 1; } @@ -747,8 +747,8 @@ 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 invalidate current layout - // unused: void invalidateLayout(); + // recursively tqinvalidate current layout + // unused: void tqinvalidateLayout(); virtual void calcVerticalMargins() {} void removeFromObjectLists(); @@ -790,7 +790,7 @@ protected: virtual TQRect viewRect() const; void remove(); - void invalidateVerticalPositions(); + void tqinvalidateVerticalPositions(); bool attemptDirectLayerTranslation(); void updateWidgetMasks(); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 157d1b76d..300328688 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -183,10 +183,10 @@ bool RenderWidget::event( TQEvent *e ) return true; QWidgetResizeEvent *re = static_cast(e); m_widget->resize( re->w, re->h ); - repaint(); + tqrepaint(); } // eat all events - except if this is a frame (in which case KHTMLView handles it all) - if ( ::qt_cast( m_widget ) ) + if ( ::tqqt_cast( m_widget ) ) return TQObject::event( e ); return true; } @@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget) connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); - if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::qt_cast(m_widget)) + if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); if (m_widget->focusPolicy() > TQWidget::StrongFocus) @@ -330,7 +330,7 @@ void RenderWidget::updateFromElement() else m_widget->unsetPalette(); // Border: - TQFrame* frame = ::qt_cast(m_widget); + TQFrame* frame = ::tqqt_cast(m_widget); if (frame) { if (shouldPaintBackgroundOrBorder()) { @@ -531,7 +531,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, // build region TQObjectListIterator it = *widget->children(); for (; it.current(); ++it) { - TQWidget* const w = ::qt_cast(it.current()); + TQWidget* const w = ::tqqt_cast(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { TQRect r2 = w->geometry(); blit -= r2; @@ -557,7 +557,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, if ( external ) { // even hackier! TQPainter pt( pm ); - const TQColor c = widget->colorGroup().base(); + const TQColor c = widget->tqcolorGroup().base(); for (int i = 0; i < cnt; ++i) pt.fillRect( br[i], c ); } else { @@ -612,7 +612,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty) bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) { // no special event processing if this is a frame (in which case KHTMLView handles it all) - if ( ::qt_cast( m_widget ) ) + if ( ::tqqt_cast( m_widget ) ) return false; if ( !element() ) return true; @@ -667,11 +667,11 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) break; case TQEvent::Wheel: - if (widget()->parentWidget() == view()->viewport()) { + if (widget()->tqparentWidget() == view()->viewport()) { // 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 (qApp->focusWidget() != widget() && + if (tqApp->tqfocusWidget() != widget() && widget()->focusPolicy() <= TQWidget::StrongFocus) { static_cast(e)->ignore(); TQApplication::sendEvent(view(), e); @@ -808,8 +808,8 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // << " pos=" << p << " type=" << type // << " button=" << button << " state=" << state << endl; TQMouseEvent e(type, p, button, state); - TQScrollView * sc = ::qt_cast(m_widget); - if (sc && !::qt_cast(m_widget)) + TQScrollView * sc = ::tqqt_cast(m_widget); + if (sc && !::tqqt_cast(m_widget)) static_cast(sc)->sendEvent(&e); else static_cast(m_widget)->sendEvent(&e); diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index a71dd4116..81d0b62ed 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 repaint nor relayout after + NonVisible: The object does need neither tqrepaint 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 repaint +// or just a tqrepaint // non-inherited attributes // DataRef 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._unicodeBidi == other->noninherited_flags.f._unicodeBidi) ) + !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) ) return CbLayout; } diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h index 29b369ca1..59e38277d 100644 --- a/khtml/rendering/render_style.h +++ b/khtml/rendering/render_style.h @@ -220,7 +220,7 @@ public: } bool isTransparent() const { - return color.isValid() && qAlpha(color.rgb()) == 0; + return color.isValid() && tqAlpha(color.rgb()) == 0; } bool operator==(const BorderValue& o) const @@ -888,7 +888,7 @@ protected: unsigned int unused : 27; } f; - Q_UINT64 _iflags; + TQ_UINT64 _iflags; }; } inherited_flags; @@ -919,14 +919,14 @@ protected: PseudoId _styleType : 4; bool _hasClip : 1; unsigned _pseudoBits : 8; - EUnicodeBidi _unicodeBidi : 2; + EUnicodeBidi _tqunicodeBidi : 2; // non CSS2 non-inherited bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." unsigned int unused : 11; } f; - Q_UINT64 _niflags; + TQ_UINT64 _niflags; }; } noninherited_flags; @@ -991,7 +991,7 @@ protected: noninherited_flags.f._styleType = NOPSEUDO; noninherited_flags.f._hasClip = false; noninherited_flags.f._pseudoBits = 0; - noninherited_flags.f._unicodeBidi = initialUnicodeBidi(); + noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi(); noninherited_flags.f._textOverflow = initialTextOverflow(); noninherited_flags.f.unused = 0; } @@ -1029,7 +1029,7 @@ public: bool hasOffset() const { return surround->offset.nonZero(); } bool hasBackground() const { - if (backgroundColor().isValid() && qAlpha(backgroundColor().rgb()) > 0) + if (backgroundColor().isValid() && tqAlpha(backgroundColor().rgb()) > 0) return true; else return background->m_background.hasImage(); @@ -1108,7 +1108,7 @@ public: LengthBox clip() const { return visual->clip; } bool hasClip() const { return noninherited_flags.f._hasClip; } - EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; } + EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; } 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._unicodeBidi = b; } + void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = 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 2cf1bf1f9..f1ce83155 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -277,7 +277,7 @@ void RenderTable::layout() } if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -1306,7 +1306,7 @@ int RenderTableSection::layoutRows( int toAdd ) m_width = table()->contentWidth(); if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -2319,9 +2319,9 @@ bool RenderTableCell::requiresLayer() const { return /* style()->opacity() < 1.0f || */ hasOverflowClip() || isRelPositioned(); } -void RenderTableCell::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderTableCell::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - RenderBlock::repaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); + RenderBlock::tqrepaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); } bool RenderTableCell::absolutePosition(int &xPos, int &yPos, bool f) const diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h index a6de6cfaf..b620b512c 100644 --- a/khtml/rendering/render_table.h +++ b/khtml/rendering/render_table.h @@ -396,7 +396,7 @@ public: // lie position to outside observers virtual int yPos() const { return m_y + _topExtra; } - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual bool absolutePosition(int &xPos, int &yPos, bool f = false) const; virtual short baselinePosition( bool = false ) const; diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index 0bded06fc..788110a6d 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -230,7 +230,7 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p // In this case, simply swap the colors, thus in compliance with // NN4 (win32 only), IE, and Mozilla. if (!khtml::hasSufficientContrast(hbg, bg)) - qSwap(hc, hbg); + tqSwap(hc, hbg); } p->setPen(hc); @@ -319,9 +319,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, const int w = m_width+2*thickness; const int h = m_height+2*thickness; const QRgb color = shadow->color.rgb(); - const int gray = qGray(color); + const int gray = tqGray(color); const bool inverse = (gray < 100); - const QRgb bgColor = (inverse) ? qRgb(255,255,255) : qRgb(0,0,0); + const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); TQPixmap pixmap(w, h); pixmap.fill(bgColor); TQPainter p; @@ -365,7 +365,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, for(int i=thickness; i 255) a = 255; - res.setPixel(i,j, qRgba(r,g,b,a)); + res.setPixel(i,j, tqRgba(r,g,b,a)); } } @@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth() bool firstLine = true; for(int i = 0; i < len; i++) { - unsigned short c = str->s[i].unicode(); + unsigned short c = str->s[i].tqunicode(); 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].unicode() != SOFT_HYPHEN) && + while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) && !(isBreakable( str->s, i+wordlen, str->l )) ) wordlen++; @@ -1328,11 +1328,11 @@ short RenderText::width() const return w; } -void RenderText::repaint(Priority p) +void RenderText::tqrepaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->repaint(p); + cb->tqrepaint(p); } bool RenderText::isFixedWidthFont() const @@ -1470,7 +1470,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) } else if (c == '"') { result += "\\\""; } else { - ushort u = c.unicode(); + ushort u = c.tqunicode(); if (u >= 0x20 && u < 0x7F) { result += c; } else { diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index d91782b47..2e14b95cd 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 unicode value. +// Define a constant for soft hyphen's tqunicode 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 repaint(Priority p=NormalPriority); + virtual void tqrepaint(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 56f3feb70..789fa3203 100644 --- a/khtml/test/align2.html +++ b/khtml/test/align2.html @@ -4,14 +4,14 @@

Align Test 2

-This page contains regression tests for vertical alignment of images. +This page contains regression tests for vertical tqalignment 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.
-This image has no alignment +This image has no tqalignment
@@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no alignment +This image has no tqalignment
@@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no alignment +This image has no tqalignment
@@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no alignment +This image has no tqalignment
diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html index 21e002382..35d170d2a 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 - - - - - + + + + + diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 288f0df6b..c756dc2ea 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -215,7 +215,7 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar switch (id) { case Print: { UString str = args[0].toString(exec); - if ( str.qstring().lower().find( "failed!" ) >= 0 ) + if ( str.qstring().lower().tqfind( "failed!" ) >= 0 ) m_regTest->saw_failure = true; TQString res = str.qstring().replace('\007', ""); m_regTest->m_currentOutput += res + "\n"; @@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type) getPartDOMOutput( outputStream, m_part, 0 ); } - dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) ); + dump.replace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) ); return dump; } @@ -1000,9 +1000,9 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int x = 0; x < w; ++x ) { QRgb l = ls[x]; QRgb r = rs[x]; - if ( ( abs( qRed( l ) - qRed(r ) ) < 20 ) && - ( abs( qGreen( l ) - qGreen(r ) ) < 20 ) && - ( abs( qBlue( l ) - qBlue(r ) ) < 20 ) ) + if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && + ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && + ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) continue; kdDebug() << "pixel (" << x << ", " << y << ") is different " << TQColor( lhsi.pixel ( x, y ) ) << " " << TQColor( rhsi.pixel ( x, y ) ) << endl; return false; @@ -1077,10 +1077,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.find('/', pos); + int newpos = absBase.tqfind('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.tqunicode() + 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.unicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.tqunicode() + 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 += "
";
-        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" )
+        FILE *pipe = popen( TQString::tqfromLatin1( "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 += "
";
-        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
+        FILE *pipe = popen( TQString::tqfromLatin1( "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 ) {
@@ -1254,7 +1254,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
 void RegressionTest::testStaticFile(const TQString & filename)
 {
-    qApp->mainWidget()->resize( 800, 600); // restore size
+    tqApp->mainWidget()->resize( 800, 600); // restore size
 
     // Set arguments
     KParts::URLArgs args;
@@ -1400,7 +1400,7 @@ public:
 
 void RegressionTest::testJSFile(const TQString & filename )
 {
-    qApp->mainWidget()->resize( 800, 600); // restore size
+    tqApp->mainWidget()->resize( 800, 600); // restore size
 
     // create interpreter
     // note: this is different from the interpreter used by the part,
@@ -1636,7 +1636,7 @@ bool RegressionTest::svnIgnored( const TQString &filename )
 
 void RegressionTest::resizeTopLevelWidget( int w, int h )
 {
-    qApp->mainWidget()->resize( w, h );
+    tqApp->mainWidget()->resize( w, h );
     // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event
     TQApplication::sendPostedEvents( 0, TQEvent::Resize );
 }
diff --git a/khtml/test_regression.h b/khtml/test_regression.h
index 1ec4e7d33..df76f4439 100644
--- a/khtml/test_regression.h
+++ b/khtml/test_regression.h
@@ -36,7 +36,7 @@ class TQTimer;
 /**
  * @internal
  */
-class PartMonitor : public QObject
+class PartMonitor : public TQObject
 {
   Q_OBJECT
 public:
@@ -122,7 +122,7 @@ class ScriptInterpreter;
 /**
  * @internal
  */
-class RegressionTest : public QObject
+class RegressionTest : public TQObject
 {
   Q_OBJECT
 public:
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index a10146480..93f698ed2 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::fromLatin1(name).contains("ahem");
+    ahem = TQString::tqfromLatin1(name).contains("ahem");
 }
 
 QFakeFontEngine::~QFakeFontEngine()
@@ -152,7 +152,7 @@ int QFakeFontEngine::leading() const
     // the original uses double and creates quite random results depending
     // on the compiler flags
     int l = ( _size * 15 + 50) / 100;
-    // only valid on i386 without -O2 assert(l == int(qRound(_size * 0.15)));
+    // only valid on i386 without -O2 assert(l == int(tqRound(_size * 0.15)));
     return (l > 0) ? l : 1;
 }
 
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 7765cee8a..d98d875b2 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
     TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) );
 
-    if (args->url(0).url().right(4).find(".xml", 0, false) == 0) {
+    if (args->url(0).url().right(4).tqfind(".xml", 0, false) == 0) {
         KParts::URLArgs ags(doc->browserExtension()->urlArgs());
         ags.serviceType = "text/xml";
         doc->browserExtension()->setURLArgs(ags);
@@ -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()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
+		     doc->widget()->tqtopLevelWidget(), 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::fromLatin1("Please select directory with tests"));
+            TQString::tqfromLatin1("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::fromLatin1("(Cold):") + TQString::number(t) + "");
+		    m_part->write(TQString::tqfromLatin1("(Cold):") + TQString::number(t) + "");
                 else {
                     total += t;
-                    m_part->write(TQString::fromLatin1("") + TQString::number(t) + "");
+                    m_part->write(TQString::tqfromLatin1("") + TQString::number(t) + "");
                 }
             }
 
-            m_part->write(TQString::fromLatin1("Average:") + TQString::number(double(total) / HOT_RUNS) + "");
+            m_part->write(TQString::tqfromLatin1("Average:") + TQString::number(double(total) / HOT_RUNS) + "");
 
             m_part->write("");
         }
diff --git a/khtml/testkhtml.h b/khtml/testkhtml.h
index b945ec942..4fd76d044 100644
--- a/khtml/testkhtml.h
+++ b/khtml/testkhtml.h
@@ -8,7 +8,7 @@
 /**
  * @internal
  */
-class Dummy : public QObject
+class Dummy : public TQObject
 {
   Q_OBJECT
 public:
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index bcc2fca3a..c648ed63e 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -48,7 +48,7 @@ EventImpl::EventImpl()
     m_currentTarget = 0;
     m_eventPhase = 0;
     m_target = 0;
-    m_createTime = TQDateTime::currentDateTime();
+    m_createTime = TQDateTime::tqcurrentDateTime();
     m_defaultHandled = false;
 }
 
@@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg)
     m_currentTarget = 0;
     m_eventPhase = 0;
     m_target = 0;
-    m_createTime = TQDateTime::currentDateTime();
+    m_createTime = TQDateTime::tqcurrentDateTime();
     m_defaultHandled = false;
 }
 
@@ -499,14 +499,14 @@ public:
     }
 
     L toLeft(R r) {
-        TQMapIterator i( m_rToL.find(r) );
+        TQMapIterator i( m_rToL.tqfind(r) );
         if (i != m_rToL.end())
             return *i;
         return L();
     }
 
     R toRight(L l) {
-        TQMapIterator i = m_lToR.find(l);
+        TQMapIterator i = m_lToR.tqfind(l);
         if (i != m_lToR.end())
             return *i;
         return R();
@@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
     m_keyVal = key->ascii();
     m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key());
 
-    // m_keyVal should contain the unicode value
+    // m_keyVal should contain the tqunicode value
     // of the pressed key if available.
     if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
-        m_keyVal = key->text().unicode()[0];
+        m_keyVal = key->text().tqunicode()[0];
 
     // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
     m_modifier = key->state();
@@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const
 {
     if (unsigned special = virtKeyVal())
         if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
-            return TQString::fromLatin1(id);
+            return TQString::tqfromLatin1(id);
 
-    if (unsigned unicode = keyVal())
-        return TQString(TQChar(unicode));
+    if (unsigned tqunicode = keyVal())
+        return TQString(TQChar(tqunicode));
 
     return "Unidentified";
 }
@@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
 
     //Figure out the code information from the key identifier.
     if (keyIdentifierArg.length() == 1) {
-        //Likely to be normal unicode id, unless it's one of the few
+        //Likely to be normal tqunicode id, unless it's one of the few
         //special values.
-        unsigned short code = keyIdentifierArg.unicode()[0];
+        unsigned short code = keyIdentifierArg.tqunicode()[0];
         if (code > 0x20 && code != 0x7F)
             keyVal = code;
     }
@@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const
     if (m_virtKeyVal != DOM_VK_UNDEFINED)
         return m_virtKeyVal;
     else
-        return TQChar((unsigned short)m_keyVal).upper().unicode();
+        return TQChar((unsigned short)m_keyVal).upper().tqunicode();
 }
 
 int KeyboardEventImpl::charCode() const
@@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg,
     //See whether we can get a key out of this.
     unsigned keyCode = 0;
     if (text.length() == 1)
-        keyCode = text.unicode()[0].unicode();
+        keyCode = text.tqunicode()[0].tqunicode();
     initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg,
         keyCode, 0, 0);
 }
 
 int TextEventImpl::keyCode() const
 {
-    //Mozilla returns 0 here unless this is a non-unicode key.
+    //Mozilla returns 0 here unless this is a non-tqunicode key.
     //IE stuffs everything here, and so we try to match it..
     if (m_keyVal)
         return m_keyVal;
@@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const
 
 int TextEventImpl::charCode() const
 {
-    //On text events, in Mozilla charCode is 0 for non-unicode keys,
-    //and the unicode key otherwise... IE doesn't support this.
+    //On text events, in Mozilla charCode is 0 for non-tqunicode keys,
+    //and the tqunicode key otherwise... IE doesn't support this.
     if (m_virtKeyVal)
         return 0;
     return m_keyVal;
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 36570d69a..347adb510 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.find(id);
+    ItemInfo* info = m_dict.tqfind(id);
     if (info)
     {
         info->ref++;
@@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.find(id);
+    ItemInfo* info = m_dict.tqfind(id);
     info->nd = nd;
 }
 
@@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
 {
     if (id.isEmpty()) return;
 
-    ItemInfo* info = m_dict.find(id);
+    ItemInfo* info = m_dict.tqfind(id);
     info->ref--;
     if (info->ref == 0)
     {
@@ -276,13 +276,13 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd)
 bool ElementMappingCache::contains(const TQString& id)
 {
     if (id.isEmpty()) return false;
-    return m_dict.find(id);
+    return m_dict.tqfind(id);
 }
 
 ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
 {
     if (id.isEmpty()) return 0;
-    return m_dict.find(id);
+    return m_dict.tqfind(id);
 }
 
 static KStaticDeleter< TQPtrList > s_changedDocumentsDeleter;
@@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
     m_namespaceMap = new IdNameMapping(1);
     TQString xhtml(XHTML_NAMESPACE);
     m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl(""));
-    m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length()));
+    m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length()));
     m_namespaceMap->names[emptyNamespace]->ref();
     m_namespaceMap->names[xhtmlNamespace]->ref();
     m_namespaceMap->count+=2;
@@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text )
         if (m_view)
             m_view->part()->resetFromScript();
         m_tokenizer->setAutoClose();
-        write(TQString::fromLatin1(""));
+        write(TQString::tqfromLatin1(""));
     }
     m_tokenizer->write(text, false);
 }
@@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
     {
         // get delay and url
         TQString str = content.string().stripWhiteSpace();
-        int pos = str.find(TQRegExp("[;,]"));
+        int pos = str.tqfind(TQRegExp("[;,]"));
         if ( pos == -1 )
-            pos = str.find(TQRegExp("[ \t]"));
+            pos = str.tqfind(TQRegExp("[ \t]"));
 
         bool ok = false;
 	int delay = kMax( 0, content.implementation()->toInt(&ok) );
@@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
             pos++;
             while(pos < (int)str.length() && str[pos].isSpace()) pos++;
             str = str.mid(pos);
-            if(str.find("url", 0,  false ) == 0)  str = str.mid(3);
+            if(str.tqfind("url", 0,  false ) == 0)  str = str.mid(3);
             str = str.stripWhiteSpace();
             if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
             while(str.length() &&
@@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI,
     TQString name = cs ? n.string() : n.string().upper();
 
     if (!_nsURI) {
-        id = (NodeImpl::Id)(long) map->ids.find( name );
+        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
         if (!id && _type != NodeImpl::NamespaceId) {
-            id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name );
+            id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name );
 	}
     } else {
-        id = (NodeImpl::Id)(long) map->ids.find( name );
+        id = (NodeImpl::Id)(long) map->ids.tqfind( name );
         if (!readonly && id && _prefix && _prefix->l) {
             // we were called in registration mode... check if the alias exists
             TQConstString px( _prefix->s, _prefix->l );
             TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
-            if (!map->ids.find( qn )) {
+            if (!map->ids.tqfind( qn )) {
                 map->ids.insert( qn, (void*)id );
             }
         }
@@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
 
     //Check to see if we have this sort of item cached.
     NodeListImpl::Cache* cached =
-        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash());
+        (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash());
 
     if (cached) {
         if (cached->key == key) {
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index 5e50c09a4..a4aec9223 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -198,7 +198,7 @@ public:
     DocumentFragmentImpl *createDocumentFragment ();
     TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); }
     TextImpl *createTextNode ( const TQString& data )
-        { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); }
+        { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); }
     CommentImpl *createComment ( DOMStringImpl* data );
     CDATASectionImpl *createCDATASection ( DOMStringImpl* data );
     ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data );
@@ -616,7 +616,7 @@ protected:
                 TQConstString px( _prefix->s, _prefix->l );
                 TQString name = cs ? n.string() : n.string().upper();
                 TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
-                if (!ids.find( qn )) {
+                if (!ids.tqfind( qn )) {
                     ids.insert( qn, (void*)id );
                 }
             }
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index c41bef3dc..f4506c8ba 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const
 
 	for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
 	    DOMString kid = child->toString();
-	    result += TQConstString(kid.unicode(), kid.length()).string();
+	    result += TQConstString(kid.tqunicode(), kid.length()).string();
 	}
 
 	result += " listeners = *m_regdListeners.listeners;
     TQValueList::iterator it;
@@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const
       delete kidText;
     }
   }
-  return new DOMStringImpl(out.unicode(), out.length());
+  return new DOMStringImpl(out.tqunicode(), out.length());
 }
 
 //-------------------------------------------------------------------------
diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h
index 1e53edf19..275452d69 100644
--- a/khtml/xml/dom_nodeimpl.h
+++ b/khtml/xml/dom_nodeimpl.h
@@ -86,17 +86,17 @@ private:
 #define NodeImpl_IdNSMask    0xffff0000
 #define NodeImpl_IdLocalMask 0x0000ffff
 
-const Q_UINT16 defaultNamespace = 0;
-const Q_UINT16 xhtmlNamespace = 1;
-const Q_UINT16 emptyNamespace = 2;
-const Q_UINT16 anyNamespace = 0xffff;
-const Q_UINT16 anyLocalName = 0xffff;
+const TQ_UINT16 defaultNamespace = 0;
+const TQ_UINT16 xhtmlNamespace = 1;
+const TQ_UINT16 emptyNamespace = 2;
+const TQ_UINT16 anyNamespace = 0xffff;
+const TQ_UINT16 anyLocalName = 0xffff;
 
-inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; }
-inline Q_UINT16 namespacePart(Q_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
-inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; }
+inline TQ_UINT16 localNamePart(TQ_UINT32 id) { return id & NodeImpl_IdLocalMask; }
+inline TQ_UINT16 namespacePart(TQ_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
+inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; }
 
-const Q_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
+const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName);
 
 class NodeImpl : public khtml::TreeShared
 {
@@ -155,7 +155,7 @@ public:
     // appendChild(), and returns the node into which will be parsed next.
     virtual NodeImpl *addChild(NodeImpl *newChild);
 
-    typedef Q_UINT32 Id;
+    typedef TQ_UINT32 Id;
     // id() is used to easily and exactly identify a node. It
     // is optimized for quick comparison and low memory consumption.
     // its value depends on the owner document of the node and is
diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp
index 0050c4a03..699a5ab59 100644
--- a/khtml/xml/dom_restyler.cpp
+++ b/khtml/xml/dom_restyler.cpp
@@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep
 
 void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
 {
-    KMultiMap::List* my_dependencies = reverse_map.find(subject);
+    KMultiMap::List* my_dependencies = reverse_map.tqfind(subject);
 
     if (!my_dependencies) return;
 
@@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe
 
 void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
 {
-    KMultiMap::List* my_dependencies = reverse_map.find(subject);
+    KMultiMap::List* my_dependencies = reverse_map.tqfind(subject);
 
     if (!my_dependencies) return;
 
@@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
 void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
 {
     assert(type < LastStructuralDependency);
-    KMultiMap::List* dep = dependency_map[type].find(dependency);
+    KMultiMap::List* dep = dependency_map[type].tqfind(dependency);
 
     if (!dep) return;
 
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index bb1a728e9..d4e568408 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -61,8 +61,8 @@ bool DOMStringImpl::containsOnlyWhitespace() const
 
     for (uint i = 0; i < l; i++) {
         TQChar c = s[i];
-        if (c.unicode() <= 0x7F) {
-            if (c.unicode() > ' ')
+        if (c.tqunicode() <= 0x7F) {
+            if (c.tqunicode() > ' ')
                 return false;
         } else {
             if (c.direction() != TQChar::DirWS)
@@ -293,11 +293,11 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
     int pos = 0;
     int pos2;
 
-    while((pos2 = str.find(' ', pos)) != -1) {
-        r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+    while((pos2 = str.tqfind(' ', pos)) != -1) {
+        r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
         pos = pos2+1;
     }
-    r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+    r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
 
     return r;
 }
@@ -319,14 +319,14 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
     int pos = 0;
     int pos2;
 
-    while((pos2 = str.find(',', pos)) != -1) {
-        r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+    while((pos2 = str.tqfind(',', pos)) != -1) {
+        r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
         pos = pos2+1;
     }
 
     /* IE Quirk: If the last comma is the last char skip it and reduce len by one */
     if (str.length()-pos > 0)
-        r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+        r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
     else
         len--;
 
diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h
index cd7128967..edac46755 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/khtml/xml/dom_stringimpl.h
@@ -92,7 +92,7 @@ public:
     DOMStringImpl *capitalize(bool noFirstCap=false) const;
     DOMStringImpl *escapeHTML();
 
-    TQChar *unicode() const { return s; }
+    TQChar *tqunicode() const { return s; }
     uint length() const { return l; }
     TQString string() const;
 
diff --git a/khtml/xml/dom_xmlimpl.h b/khtml/xml/dom_xmlimpl.h
index a394579d2..d88dc041f 100644
--- a/khtml/xml/dom_xmlimpl.h
+++ b/khtml/xml/dom_xmlimpl.h
@@ -163,7 +163,7 @@ protected:
     CSSStyleSheetImpl *m_sheet;
 };
 
-class XMLAttributeReader : public QXmlDefaultHandler
+class XMLAttributeReader : public TQXmlDefaultHandler
 {
 public:
     XMLAttributeReader(const TQString& _attrString);
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 7c043815a..a0f3f665c 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -42,7 +42,7 @@ using namespace DOM;
 using namespace khtml;
 
 XMLIncrementalSource::XMLIncrementalSource()
-    : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
+    : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ),
       m_finished( false )
 {
 }
@@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next()
     else if ( m_data.length() <= m_pos )
         return TQXmlInputSource::EndOfData;
     else
-        return m_unicode[m_pos++];
+        return m_tqunicode[m_pos++];
 }
 
 void XMLIncrementalSource::setData( const TQString& str )
 {
     m_data = str;
-    m_unicode = m_data.unicode();
+    m_tqunicode = m_data.tqunicode();
     m_pos = 0;
     if ( !str.isEmpty() )
         m_finished = false;
@@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data )
 void XMLIncrementalSource::appendXML( const TQString& str )
 {
     m_data += str;
-    m_unicode = m_data.unicode();
+    m_tqunicode = m_data.tqunicode();
 }
 
 TQString XMLIncrementalSource::data()
@@ -152,7 +152,7 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname)
 {
     /* QXml does not resolve the namespaces of attributes in the same 
        tag that preceed the xmlns declaration. This fixes up that case */
-    if (uri.isEmpty() && qname.find(':') != -1) {
+    if (uri.isEmpty() && qname.tqfind(':') != -1) {
         TQXmlNamespaceSupport ns;
         TQString localName, prefix;
         ns.splitName(qname, prefix, localName);
@@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch)
     if (currentNode()->nodeType() == Node::TEXT_NODE)
         exitText();
     // ### handle exceptions
-    currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length())));
+    currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length())));
     return true;
 }
 
@@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d
         exitText();
     // ### handle exceptions
     ProcessingInstructionImpl *pi =
-        m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length()));
+        m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length()));
     currentNode()->addChild(pi);
     pi->checkStyleSheet();
     return true;
@@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value)
 {
     EntityImpl *e = new EntityImpl(m_doc,name);
     // ### further parse entities inside the value and add them as separate nodes (or entityreferences)?
-    e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length())));
+    e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length())));
      if (m_doc->doctype())
          static_cast(m_doc->doctype()->entities())->addNode(e);
     return true;
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index cbf5cd5dd..d2910472e 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -48,7 +48,7 @@ namespace DOM {
 
 namespace khtml {
 
-class XMLHandler : public QXmlDefaultHandler
+class XMLHandler : public TQXmlDefaultHandler
 {
 public:
     XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view);
@@ -116,7 +116,7 @@ private:
     State state;
 };
 
-class Tokenizer : public QObject
+class Tokenizer : public TQObject
 {
     Q_OBJECT
 public:
@@ -139,7 +139,7 @@ signals:
 
 };
 
-class XMLIncrementalSource : public QXmlInputSource
+class XMLIncrementalSource : public TQXmlInputSource
 {
 public:
     XMLIncrementalSource();
@@ -155,7 +155,7 @@ public:
 private:
     TQString      m_data;
     uint         m_pos;
-    const TQChar *m_unicode;
+    const TQChar *m_tqunicode;
     bool         m_finished;
 };
 
-- 
cgit v1.2.1