From 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- khtml/css/css_stylesheetimpl.cpp | 6 +++--- khtml/css/css_valueimpl.cpp | 8 ++++---- khtml/css/cssstyleselector.cpp | 26 +++++++++++++------------- khtml/dom/css_value.cpp | 2 +- khtml/ecma/kjs_binding.cpp | 2 +- khtml/ecma/kjs_binding.h | 2 +- khtml/ecma/kjs_css.cpp | 2 +- khtml/ecma/kjs_debugwin.cpp | 2 +- khtml/ecma/kjs_navigator.cpp | 28 ++++++++++++++-------------- khtml/ecma/kjs_proxy.cpp | 10 +++++----- khtml/ecma/kjs_window.cpp | 12 ++++++------ khtml/ecma/xmlhttprequest.cpp | 24 ++++++++++++------------ khtml/html/html_documentimpl.cpp | 18 +++++++++--------- khtml/html/html_formimpl.cpp | 12 ++++++------ khtml/html/html_miscimpl.cpp | 2 +- khtml/html/html_objectimpl.cpp | 6 +++--- khtml/html/htmltokenizer.cpp | 4 ++-- khtml/java/kjavaappletserver.cpp | 12 ++++++------ khtml/java/kjavaappletviewer.cpp | 2 +- khtml/khtml_ext.cpp | 2 +- khtml/khtml_factory.cpp | 2 +- khtml/khtml_pagecache.cpp | 12 ++++++------ khtml/khtml_part.cpp | 38 +++++++++++++++++++------------------- khtml/khtml_settings.cc | 16 ++++++++-------- khtml/khtmlview.cpp | 20 ++++++++++---------- khtml/kmultipart/kmultipart.cpp | 2 +- khtml/misc/decoder.cpp | 8 ++++---- khtml/misc/loader.cpp | 16 ++++++++-------- khtml/misc/multimap.h | 6 +++--- khtml/rendering/render_canvas.cpp | 8 ++++---- khtml/rendering/render_frames.cpp | 14 +++++++------- khtml/rendering/render_object.cpp | 2 +- khtml/rendering/render_table.cpp | 2 +- khtml/test_regression.cpp | 4 ++-- khtml/testkhtml.cpp | 2 +- khtml/xml/dom2_eventsimpl.cpp | 4 ++-- khtml/xml/dom_docimpl.cpp | 32 ++++++++++++++++---------------- khtml/xml/dom_docimpl.h | 2 +- khtml/xml/dom_nodeimpl.cpp | 2 +- khtml/xml/dom_stringimpl.cpp | 8 ++++---- khtml/xml/xml_tokenizer.cpp | 4 ++-- 41 files changed, 193 insertions(+), 193 deletions(-) (limited to 'khtml') diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp index a27ed5286..8189a6846 100644 --- a/khtml/css/css_stylesheetimpl.cpp +++ b/khtml/css/css_stylesheetimpl.cpp @@ -324,7 +324,7 @@ StyleSheetListImpl::~StyleSheetListImpl() void StyleSheetListImpl::add( StyleSheetImpl* s ) { - if ( !styleSheets.tqcontainsRef( s ) ) { + if ( !styleSheets.containsRef( s ) ) { s->ref(); styleSheets.append( s ); } @@ -379,8 +379,8 @@ MediaListImpl::MediaListImpl( CSSRuleImpl *parentRule, const DOMString &media ) bool MediaListImpl::contains( const DOMString &medium ) const { - return m_lstMedia.empty() || m_lstMedia.tqcontains( medium ) || - m_lstMedia.tqcontains( "all" ); + return m_lstMedia.empty() || m_lstMedia.contains( medium ) || + m_lstMedia.contains( "all" ); } CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index cb63ceb64..3fa38efe9 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName = parsedFontName.lower(); // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; - int pos = available.tqfind( ',' + parsedFontName + ',', 0, false ); + int pos = available.find( ',' + 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.tqfind( ",ms " + parsedFontName + ',', 0, false ); + pos = available.find( ",ms " + parsedFontName + ',', 0, false ); if ( pos == -1 ) - pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false ); + pos = available.find( ',' + parsedFontName + " ms,", 0, false ); } if ( pos != -1 ) { ++pos; - int p = available.tqfind(',', pos); + int p = available.find(',', 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/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 08b47da4b..32391bb7f 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -257,7 +257,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, u.setQuery( TQString::null ); u.setRef( TQString::null ); encodedurl.file = u.url(); - int pos = encodedurl.file.tqfindRev('/'); + int pos = encodedurl.file.findRev('/'); encodedurl.path = encodedurl.file; if ( pos > 0 ) { encodedurl.path.truncate( pos ); @@ -828,12 +828,12 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, static void cleanpath(TQString &path) { int pos; - while ( (pos = path.tqfind( "/../" )) != -1 ) { + while ( (pos = path.find( "/../" )) != -1 ) { int prev = 0; if ( pos > 0 ) - prev = path.tqfindRev( "/", pos -1 ); + prev = path.findRev( "/", pos -1 ); // don't remove the host, i.e. http://foo.org/../foo.html - if (prev < 0 || (prev > 3 && path.tqfindRev("://", prev-1) == prev-2)) + if (prev < 0 || (prev > 3 && path.findRev("://", prev-1) == prev-2)) path.remove( pos, 3); else // matching directory found ? @@ -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.tqfind( "//", pos )) != -1) { + while ( (pos = path.find( "//", pos )) != -1) { if (refPos == -2) - refPos = path.tqfind("#", 0); + refPos = path.find("#", 0); if (refPos > 0 && pos >= refPos) break; @@ -857,7 +857,7 @@ static void cleanpath(TQString &path) else pos += 2; } - while ( (pos = path.tqfind( "/./" )) != -1) + while ( (pos = path.find( "/./" )) != -1) path.remove( pos, 2 ); //kdDebug() << "checkPseudoState " << path << endl; } @@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth) b = 0; } else { - int n = nth.tqfind('n'); + int n = nth.find('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.tqfind('+'); + int p = nth.find('+'); if (p != -1) b = nth.mid(p+1).toInt(); else { - p = nth.tqfind('-'); + p = nth.find('-'); b = -nth.mid(p+1).toInt(); } } @@ -1173,7 +1173,7 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm int pos = 0; for ( ;; ) { - pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive); + pos = val_str.string().find(sel_str.string(), pos, caseSensitive); if ( pos == -1 ) return false; if ( pos == 0 || val_uc[pos-1].isSpace() ) { int endpos = pos + sel_len; @@ -1189,7 +1189,7 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm //kdDebug( 6080 ) << "checking for contains match" << endl; TQConstString val_str(value->tqunicode(), value->length()); TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); - return val_str.string().tqcontains(sel_str.string(), caseSensitive); + return val_str.string().contains(sel_str.string(), caseSensitive); } case CSSSelector::Begin: { @@ -1214,7 +1214,7 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm const TQString& selStr = sel_str.string(); if(str.length() < selStr.length()) return false; // Check if str begins with selStr: - if(str.tqfind(selStr, 0, caseSensitive) != 0) return false; + if(str.find(selStr, 0, caseSensitive) != 0) return false; // It does. Check for exact match or following '-': if(str.length() != selStr.length() && str[selStr.length()] != '-') return false; diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp index 20faff88a..90d1b1570 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.tqfind("important", 0, false) != -1) + if (str.find("important", 0, false) != -1) important = true; static_cast(impl)->setProperty( id, value, important ); diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp index 2646b8e26..4fa87e2ce 100644 --- a/khtml/ecma/kjs_binding.cpp +++ b/khtml/ecma/kjs_binding.cpp @@ -190,7 +190,7 @@ ScriptInterpreter::~ScriptInterpreter() #ifdef KJS_VERBOSE kdDebug(6070) << "ScriptInterpreter::~ScriptInterpreter " << this << " for part=" << m_frame << endl; #endif - assert( interpreterList && interpreterList->tqcontains( this ) ); + assert( interpreterList && interpreterList->contains( this ) ); interpreterList->remove( this ); if ( interpreterList->isEmpty() ) { delete interpreterList; diff --git a/khtml/ecma/kjs_binding.h b/khtml/ecma/kjs_binding.h index 0672cd8eb..c55da21ce 100644 --- a/khtml/ecma/kjs_binding.h +++ b/khtml/ecma/kjs_binding.h @@ -103,7 +103,7 @@ namespace KJS { m_domObjects.insert( objectHandle, obj ); } void customizedDOMObject( DOMObject* obj ) { - m_customizedDomObjects.tqreplace( obj, this ); + m_customizedDomObjects.replace( obj, this ); } bool deleteDOMObject( void* objectHandle ) { DOMObject* obj = m_domObjects.take( objectHandle ); diff --git a/khtml/ecma/kjs_css.cpp b/khtml/ecma/kjs_css.cpp index ea651336e..b42f9dd02 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.tqfind("!important", 0, false); + int important = propvalue.find("!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 8ebd20349..b3c2a41b1 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -1123,7 +1123,7 @@ bool KJSDebugWin::haveBreakpoint(SourceFile *sourceFile, int line0, int line1) for (int i = 0; i < m_breakpointCount; i++) { int sourceId = m_breakpoints[i].sourceId; int lineno = m_breakpoints[i].lineno; - if (m_sourceFragments.tqcontains(sourceId) && + if (m_sourceFragments.contains(sourceId) && m_sourceFragments[sourceId]->sourceFile == sourceFile) { int absLineno = m_sourceFragments[sourceId]->baseLine+lineno-1; if (absLineno >= line0 && absLineno <= line1) diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index 657addcf3..637b6a8e1 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.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) + if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::tqfromLatin1("compatible")) == -1) { //kdDebug() << "appName -> Mozilla" << endl; return String("Netscape"); } - if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.find(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.tqfind('/') + 1)); + return String(userAgent.mid(userAgent.find('/') + 1)); case Product: // We are pretending to be Mozilla or Safari - if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) + if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::tqfromLatin1("compatible")) == -1) { return String("Gecko"); } // When spoofing as IE, we use Undefined(). - if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.find(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.tqfind("Gecko"); + int ix = userAgent.find("Gecko"); if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') && - userAgent.tqfind(TQRegExp("\\d{8}"), ix+6) == ix+6) + userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6) { // We have Gecko/ in the UA string return String(userAgent.mid(ix+6, 8)); @@ -245,10 +245,10 @@ 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.tqfind(TQString::tqfromLatin1("Win"),0,false)>=0) ) + if ( (userAgent.find(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) ) + else if ( (userAgent.find(TQString::tqfromLatin1("Macintosh"),0,false)>=0) || + (userAgent.find(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) ) return String(TQString::tqfromLatin1("MacPPC")); else { diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp index 55e9aeff6..2469ac681 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.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || - userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) + if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.find(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.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && - userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1 && - userAgent.tqfind(TQString::tqfromLatin1("KHTML")) == -1) + if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.find(TQString::tqfromLatin1("compatible")) == -1 && + userAgent.find(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 77a098680..067a189ac 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -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.tqfind(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) + dstUrl.find(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) part->scheduleRedirection(-1, dstUrl, lockHistory); @@ -1618,7 +1618,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString while (it != flist.end()) { TQString s = *it++; TQString key, val; - int pos = s.tqfind('='); + int pos = s.find('='); if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); @@ -2271,7 +2271,7 @@ void WindowQObject::timerEvent(TQTimerEvent *) it = TQPtrListIterator(toExecute); for (; it.current(); ++it) { ScheduledAction *action = it.current(); - if (!scheduledActions.tqcontainsRef(action)) // removed by clearTimeout() + if (!scheduledActions.containsRef(action)) // removed by clearTimeout() continue; action->executing = true; // prevent deletion in clearTimeout() @@ -2288,7 +2288,7 @@ void WindowQObject::timerEvent(TQTimerEvent *) action->executing = false; - if (!scheduledActions.tqcontainsRef(action)) + if (!scheduledActions.containsRef(action)) delete action; else action->nextTime = action->nextTime.addMSecs(action->interval); @@ -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.tqfind(":")); - TQString port = str.mid(str.tqfind(":")+1); + TQString host = str.left(str.find(":")); + TQString port = str.mid(str.find(":")+1); url.setHost(host); url.setPort(port.toUInt()); break; diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index f821d7b95..7b88477f0 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.tqfind("Referer") == requestHeaders.end()) { + if (requestHeaders.find("Referer") == requestHeaders.end()) { KURL documentURL(doc->URL()); documentURL.setPass(TQString::null); documentURL.setUser(TQString::null); @@ -489,7 +489,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val TQStringList bannedHeaders = TQStringList::split(',', TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); - if (bannedHeaders.tqcontains(name)) + if (bannedHeaders.contains(name)) return; // Denied requestHeaders[name] = value.stripWhiteSpace(); @@ -501,7 +501,7 @@ Value XMLHttpRequest::getAllResponseHeaders() const return Undefined(); } - int endOfLine = responseHeaders.tqfind("\n"); + int endOfLine = responseHeaders.find("\n"); if (endOfLine == -1) { return Undefined(); @@ -535,7 +535,7 @@ Value XMLHttpRequest::getResponseHeader(const TQString& name) const return Undefined(); } - int endOfLine = responseHeaders.tqfind("\n", headerLinePos + matchLength); + int endOfLine = responseHeaders.find("\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.tqfind("\n"); + int endOfLine = response.find("\n"); TQString firstLine = (endOfLine == -1) ? response : response.left(endOfLine); - int codeStart = firstLine.tqfind(" "); - int codeEnd = firstLine.tqfind(" ", codeStart + 1); + int codeStart = firstLine.find(" "); + int codeEnd = firstLine.find(" ", 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.tqfind("304"); + int codeStart = responseHeaders.find("304"); if ( codeStart != -1) { - int codeEnd = responseHeaders.tqfind("\n", codeStart+3); + int codeEnd = responseHeaders.find("\n", codeStart+3); if (codeEnd != -1) responseHeaders.replace(codeStart, (codeEnd-codeStart), "200 OK"); } @@ -659,13 +659,13 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) #endif if ( decoder == NULL ) { - int pos = responseHeaders.tqfind("content-type:", 0, false); + int pos = responseHeaders.find("content-type:", 0, false); if ( pos > -1 ) { pos += 13; - int index = responseHeaders.tqfind('\n', pos); + int index = responseHeaders.find('\n', pos); TQString type = responseHeaders.mid(pos, (index-pos)); - index = type.tqfind (';'); + index = type.find (';'); if (index > -1) encoding = TQString(type.mid( index+1 ).remove(TQRegExp("charset[ ]*=[ ]*", false))).stripWhiteSpace(); } diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index a38f6c2fb..a5c78657c 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -233,11 +233,11 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) { TQString url = _url.string(); TQString s; - int pos = url.tqfind('#'); + int pos = url.find('#'); //kdDebug(0) << "map pos of #:" << pos << endl; s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); - TQMapConstIterator it = mapMap.tqfind(s); + TQMapConstIterator it = mapMap.find(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.tqfind("--", index+2)) != -1)) + ((tmpIndex=buffer.find("--", 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.tqfind('<', index); + index = buffer.find('<', 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.tqfind('>', index); + index = buffer.find('>', index); } else if (nextChar == '?') - index = buffer.tqfind('>', index); + index = buffer.find('>', 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.tqfind(theChar, publicIDStart); + int publicIDEnd = buffer.find(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.tqfind(next, systemIDStart); + int systemIDEnd = buffer.find(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.tqfind(next, systemIDStart); + int systemIDEnd = buffer.find(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index d025f428e..1512395e2 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -122,8 +122,8 @@ static TQCString encodeCString(const TQCString& e) // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1 // safe characters like NS handles them for compatibility static const char *safe = "-._*"; - TQCString encoded(( e.length()+e.tqcontains( '\n' ) )*3 - +e.tqcontains('\r') * 3 + 1); + TQCString encoded(( e.length()+e.contains( '\n' ) )*3 + +e.contains('\r') * 3 + 1); int enclen = 0; bool crmissing = false; unsigned char oldc; @@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) void HTMLFormElementImpl::setEnctype( const DOMString& type ) { - if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1) + if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1) { m_enctype = "multipart/form-data"; m_multipart = true; m_post = true; - } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1) + } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1) { m_enctype = "text/plain"; m_multipart = false; @@ -457,7 +457,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { if ((current->inputType() == HTMLInputElementImpl::PASSWORD || current->inputType() == HTMLInputElementImpl::TEXT) && !current->readOnly() && - map.tqcontains(current->name().string())) { + map.contains(current->name().string())) { getDocument()->setFocusNode(current); current->setValue(map[current->name().string()]); } @@ -2751,7 +2751,7 @@ void HTMLTextAreaElementImpl::attach() static TQString expandLF(const TQString& s) { // LF -> CRLF - unsigned crs = s.tqcontains( '\n' ); + unsigned crs = s.contains( '\n' ); if (crs == 0) return s; unsigned len = s.length(); diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index 2b0387d35..d5e812029 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.tqfind(key)) { + if (TQValueList* info = cache->nameCache.find(key)) { return *info; } else { diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp index 5ed1e11f3..2dc0f4288 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.tqfind( ";" ); + int pos = serviceType.find( ";" ); 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.tqfind(';'); + int index = url.find(';'); if (index == -1) - index = url.tqfind(','); + index = url.find(','); if (index != -1) { int len = index - 5; if (len > 0) diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index d1d009d39..0b9b5f34d 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -347,7 +347,7 @@ void HTMLTokenizer::parseSpecial(TokenizerString &src) // possible end of tagname, lets check. if ( !scriptCodeResync && !escaped && !src.escaped() && ( ch == '>' || ch == '/' || ch <= ' ' ) && ch && scriptCodeSize >= searchStopperLen && - !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) { + !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) { scriptCodeResync = scriptCodeSize-searchStopperLen+1; tquote = NoQuote; continue; @@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish() food += TQString(scriptCode, scriptCodeSize); } else { - pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>'); + pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy } KHTML_DELETE_QCHAR_VEC(scriptCode); diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index e7c136f38..d95f194ad 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.tqfind( loaderID ); + const KIOJobMap::iterator it = d->kiojobs.find( 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.tqfind( ID_num ); + KIOJobMap::iterator it = d->kiojobs.find( 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.tqfind( 0, index ); + int sep_pos = qb.find( 0, index ); if (sep_pos < 0) { kdError(6100) << "Missing separation byte" << endl; sep_pos = qb_size; @@ -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.tqfind( ID_num ); + KIOJobMap::iterator it = d->kiojobs.find( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; @@ -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.tqfind(ticket); + JSStack::iterator it = d->jsstack.find(ticket); if (it != d->jsstack.end()) { kdDebug(6100) << "slotJavaRequest: " << ticket << endl; args.pop_front(); @@ -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.tqfind(reg, pos)) > -1) + while ((pos = subject.find(reg, pos)) > -1) subject.replace(pos, 1, TQString("\n ")); text += subject.mid(1); } diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index b5038a576..a3f8fc361 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).tqfind("="); + const int equalPos = (*it).find("="); if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index e802177d1..5ff15fe53 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->tqmetaObject()->tqfindSlot( method ); + int slot = m_extensionProxy->tqmetaObject()->findSlot( method ); if ( slot == -1 ) return; diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index bb80a1e83..7eedc6311 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -146,7 +146,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part ) if ( !s_parts ) s_parts = new TQPtrList; - if ( !s_parts->tqcontainsRef( part ) ) + if ( !s_parts->containsRef( part ) ) { s_parts->append( part ); ref(); diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index 31e764b5e..e736df5c2 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.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(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.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) entry->endData(); } @@ -184,13 +184,13 @@ KHTMLPageCache::cancelEntry(long id) bool KHTMLPageCache::isValid(long id) { - return (d->dict.tqfind(id) != 0); + return (d->dict.find(id) != 0); } bool KHTMLPageCache::isComplete(long id) { - KHTMLPageCacheEntry *entry = d->dict.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(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.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(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.tqfind(id); + KHTMLPageCacheEntry *entry = d->dict.find(id); assert(entry); int fd = entry->m_file->handle(); diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 3363c02f6..0699b799a 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -2301,7 +2301,7 @@ void KHTMLPart::checkCompleted() d->m_paUseStylesheet->setEnabled( sheets.count() > 2); if (sheets.count() > 2) { - d->m_paUseStylesheet->setCurrentItem(kMax(sheets.tqfindIndex(d->m_sheetUsed), 0)); + d->m_paUseStylesheet->setCurrentItem(kMax(sheets.findIndex(d->m_sheetUsed), 0)); slotUseStylesheet(); } @@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect() d->m_redirectURL = TQString(); // SYNC check with ecma/kjs_window.cpp::goURL ! - if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( u.find( 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().tqfind(str, d->m_findPos+1, caseSensitive); + d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive); matchLen = str.length(); } @@ -3212,7 +3212,7 @@ bool KHTMLPart::findTextNext( bool reverse ) s.truncate( d->m_findPosEnd ); if ( !s.isEmpty() ) { - newLine = s.tqfind( '\n' ) != -1; // did we just get a newline? + newLine = s.find( '\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.tqfind( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { - TQString jscode = KURL::decode_string( url.mid( url.tqfind( "javascript:", 0, false ) ) ); + if (url.find( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { + TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) ); jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long if (url.startsWith("javascript:window.open")) jscode += i18n(" (In new window)"); @@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c if ( !target.isEmpty() ) hasTarget = true; - if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) ); return false; @@ -3965,7 +3965,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c } } - if (!d->m_referrer.isEmpty() && !args.metaData().tqcontains("referrer")) + if (!d->m_referrer.isEmpty() && !args.metaData().contains("referrer")) args.metaData()["referrer"] = d->m_referrer; @@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions() { TQObject *ext = KParts::BrowserExtension::childObject( frame ); if ( ext ) - enablePrintFrame = ext->tqmetaObject()->slotNames().tqcontains( "print()" ); + enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" ); } d->m_paPrintFrame->setEnabled( enablePrintFrame ); @@ -4319,7 +4319,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con (*it)->m_params = params; // Support for - if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { KHTMLPart* p = static_cast(static_cast((*it)->m_part)); @@ -4393,7 +4393,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const child->m_args = args; child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); child->m_serviceName = TQString(); - if (!d->m_referrer.isEmpty() && !child->m_args.metaData().tqcontains( "referrer" )) + if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" )) child->m_args.metaData()["referrer"] = d->m_referrer; child->m_args.metaData().insert("PropagateHttpHeader", "true"); @@ -4655,7 +4655,7 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() ); if ( offers.isEmpty() ) { - int pos = mimetype.tqfind( "-plugin" ); + int pos = mimetype.find( "-plugin" ); if (pos < 0) return 0L; TQString stripped_mime = mimetype.left( pos ); @@ -4675,7 +4675,7 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char KParts::ReadOnlyPart *res = 0L; const char *className = "KParts::ReadOnlyPart"; - if ( service->serviceTypes().tqcontains( "Browser/View" ) ) + if ( service->serviceTypes().contains( "Browser/View" ) ) className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) @@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString urlstring = u.url(); - if ( urlstring.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlstring.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { urlstring = KURL::decode_string(urlstring); crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) ); return; @@ -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.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlStr.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) ); executeScript( DOM::Node(), script ); return; @@ -6660,7 +6660,7 @@ void KHTMLPart::slotPrintFrame() TQMetaObject *mo = ext->tqmetaObject(); - int idx = mo->tqfindSlot( "print()", true ); + int idx = mo->findSlot( "print()", true ); if ( idx >= 0 ) { TQUObject o[ 1 ]; ext->qt_invoke( idx, o ); @@ -6854,7 +6854,7 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part ) if (factory()) { factory()->removeClient( part ); } - if (childClients()->tqcontainsRef(part)) { + if (childClients()->containsRef(part)) { removeChildClient( part ); } } @@ -6999,7 +6999,7 @@ bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const if ( parent ) return parent->pluginPageQuestionAsked(mimetype); - return d->m_pluginPageQuestionAsked.tqcontains(mimetype); + return d->m_pluginPageQuestionAsked.contains(mimetype); } void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) @@ -7379,7 +7379,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart if ( enable && originPart ) { d->m_openableSuppressedPopups++; - if ( d->m_suppressedPopupOriginParts.tqfindIndex( originPart ) == -1 ) + if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 ) d->m_suppressedPopupOriginParts.append( originPart ); } diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 405fa4234..6b8649601 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.tqfind(ldomain); + PolicyMap::iterator it = d->domainPolicy.find(ldomain); if (it == d->domainPolicy.end()) { // simply copy global domain settings (they should have been initialized // by this time) @@ -161,7 +161,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice) { TQString tmp(configStr); - int splitIndex = tmp.tqfind(':'); + int splitIndex = tmp.find(':'); 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.tqfind( ':' ); + int splitIndex2 = adviceString.find( ':' ); if( splitIndex2 == -1 ) { // Java advice only javaAdvice = strToAdvice( adviceString ); @@ -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.tqfind(domain); + TQMap::Iterator pos = domainList.find(domain); if (pos == notfound) domainList.insert(domain,0); }/*next it*/ } @@ -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.tqfind(hostname); + PolicyMap::const_iterator it = d->domainPolicy.find(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.tqfind(TQChar('.'))) >= 0 ) { + while( (dot_idx = host_part.find(TQChar('.'))) >= 0 ) { host_part.remove(0,dot_idx); - it = d->domainPolicy.tqfind(host_part); + it = d->domainPolicy.find(host_part); Q_ASSERT(notfound == d->domainPolicy.end()); if( it != notfound ) { #ifdef DEBUG_SETTINGS @@ -888,7 +888,7 @@ const TQString &KHTMLSettings::availableFamilies() for ( ; f != fEnd; ++f ) { (*f).replace( foundryExp, ""); - if (!s.tqcontains(*f)) + if (!s.contains(*f)) s << *f; } s.sort(); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 2cbd99384..75ecea21f 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -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().tqfind('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>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().tqfind('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -2275,7 +2275,7 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = a; } - if( accesskey.isNull() && fallbacks.tqcontains( en )) { + if( accesskey.isNull() && fallbacks.contains( en )) { TQChar a = fallbacks[ en ].upper(); if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = TQString( "" ) + a + ""; @@ -2625,7 +2625,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const } if( ignore ) continue; - if( text.isNull() && labels.tqcontains( element )) + if( text.isNull() && labels.contains( element )) text = labels[ element ]; if( text.isNull() && text_before ) text = getElementText( element, false ); @@ -2685,7 +2685,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( TQValueList< TQPair< TQString, TQChar > >::ConstIterator it = priorities.begin(); it != priorities.end(); ++it ) - if( text == (*it).first && keys.tqcontains( (*it).second )) { + if( text == (*it).first && keys.contains( (*it).second )) { key = (*it).second; break; } @@ -2698,7 +2698,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( TQStringList::ConstIterator it = words.begin(); it != words.end(); ++it ) { - if( keys.tqcontains( (*it)[ 0 ].upper())) { + if( keys.contains( (*it)[ 0 ].upper())) { key = (*it)[ 0 ].upper(); break; } @@ -2708,7 +2708,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const for( unsigned int i = 0; i < text.length(); ++i ) { - if( keys.tqcontains( text[ i ].upper())) { + if( keys.contains( text[ i ].upper())) { key = text[ i ].upper(); break; } @@ -2757,7 +2757,7 @@ bool KHTMLView::pagedMode() const void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis) { if (vis) { - d->visibleWidgets.tqreplace(w, w->widget()); + d->visibleWidgets.replace(w, w->widget()); } else d->visibleWidgets.remove(w); @@ -3085,7 +3085,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu if (cc_number) return; TQStringList items = formCompletionItems(name); - if (!items.tqcontains(value)) + if (!items.contains(value)) items.prepend(value); while ((int)items.count() > m_part->settings()->maxFormCompletionItems()) items.remove(items.fromLast()); @@ -3125,7 +3125,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const TQStringList sites = d->formCompletions->readListEntry("Sites"); d->formCompletions->setGroup(TQString::null);//reset - return (sites.tqfind(host) != sites.end()); + return (sites.find(host) != sites.end()); } // returns true if event should be swallowed diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 8aeb2cdbd..2023c1e85 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -246,7 +246,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) { Q_ASSERT( m_nextMimeType.isNull() ); m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); - int semicolon = m_nextMimeType.tqfind( ';' ); + int semicolon = m_nextMimeType.find( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index bd831c125..f227f4014 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.tqfind("encoding"); + int pos = str.find("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.tqfind("http-equiv", pos)) == -1) break; - //if( (pos = str.tqfind("content-type", pos)) == -1) break; + //if( (pos = str.find("http-equiv", pos)) == -1) break; + //if( (pos = str.find("content-type", pos)) == -1) break; while( pos < ( int ) str.length() ) { - if( (pos = str.tqfind("charset", pos)) == -1) break; + if( (pos = str.find("charset", pos)) == -1) break; pos += 7; // skip whitespace.. while( pos < (int)str.length() && str[pos] <= ' ' ) pos++; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 460b2ceb2..220c9ea2d 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.tqfind( c ) ); + assert( m_clients.find( c ) ); Cache::flush(); @@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative) void DocLoader::insertCachedObject( CachedObject* o ) const { - if ( m_docObjects.tqfind(o) ) + if ( m_docObjects.find(o) ) return; m_docObjects.insert( o, o ); if ( m_docObjects.count() > 3 * m_docObjects.size() ) @@ -993,7 +993,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) bool reload = false; if (m_cachePolicy == KIO::CC_Verify) { - if (!m_reloadedURLs.tqcontains(fullURL)) + if (!m_reloadedURLs.contains(fullURL)) { if (existing && existing->isExpired()) { @@ -1005,7 +1005,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL) } else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh)) { - if (!m_reloadedURLs.tqcontains(fullURL)) + if (!m_reloadedURLs.contains(fullURL)) { if (existing) { @@ -1427,7 +1427,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify; TQString url = kurl.url(); - CachedObject* o = cache->tqfind(url); + CachedObject* o = cache->find(url); if ( o && o->type() != CachedType ) { removeCacheEntry( o ); @@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c if ( o && dl->needReload( o, url ) ) { o = 0; - assert( cache->tqfind( url ) == 0 ); + assert( cache->find( url ) == 0 ); } if(!o) @@ -1464,7 +1464,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data) { - CachedObject *o = cache->tqfind(url); + CachedObject *o = cache->find(url); if(o) removeCacheEntry(o); @@ -1474,7 +1474,7 @@ void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_d void Cache::preloadScript( const TQString &url, const TQString &script_data) { - CachedObject *o = cache->tqfind(url); + CachedObject *o = cache->find(url); if(o) removeCacheEntry(o); diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index fbd883457..8f60dcf02 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.tqfind(key); + List *list = dict.find(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.tqfind(key); + List *list = dict.find(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.tqfind(key); + return dict.find(key); } private: TQPtrDict dict; diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp index 3980c8eee..3a5c558ac 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -492,7 +492,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep no = no->nextSibling(); } } - if (os->selectionState() == SelectionInside && !oldSelectedInside.tqcontainsRef(os)) + if (os->selectionState() == SelectionInside && !oldSelectedInside.containsRef(os)) oldSelectedInside.append(os); os = no; @@ -550,7 +550,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep if (no) no = no->nextSibling(); } - if (o->selectionState() == SelectionInside && !newSelectedInside.tqcontainsRef(o)) + if (o->selectionState() == SelectionInside && !newSelectedInside.containsRef(o)) newSelectedInside.append(o); o=no; @@ -581,7 +581,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQPtrListIterator oldIterator(oldSelectedInside); bool firstRect = true; for (; oldIterator.current(); ++oldIterator){ - if (!newSelectedInside.tqcontainsRef(oldIterator.current())){ + if (!newSelectedInside.containsRef(oldIterator.current())){ if (firstRect){ updateRect = enclosingPositionedRect(oldIterator.current()); firstRect = false; @@ -601,7 +601,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQPtrListIterator newIterator(newSelectedInside); firstRect = true; for (; newIterator.current(); ++newIterator){ - if (!oldSelectedInside.tqcontainsRef(newIterator.current())){ + if (!oldSelectedInside.containsRef(newIterator.current())){ if (firstRect){ updateRect = enclosingPositionedRect(newIterator.current()); firstRect = false; diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index 47a433293..9f58a0a4f 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -808,7 +808,7 @@ void RenderPartObject::updateWidget() serviceType = "application/x-activex-handler"; #endif - if(classId.tqfind(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { + if(classId.find(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.tqfind(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) + else if(classId.find(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) serviceType = "audio/x-pn-realaudio-plugin"; - else if(classId.tqfind(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || - objbase->classId.tqfind(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) + else if(classId.find(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || + objbase->classId.find(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.tqfind(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) + else if(classId.find(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.tqfind(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || - classId.tqfind(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) + else if(objbase->classId.find(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || + classId.find(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) serviceType = "video/x-msvideo"; else diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index 8c4c8ab56..1fc72c7d8 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -2223,7 +2223,7 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const { TQDict* counters = document()->counters(this); if (counters) - return counters->tqfind(counter); + return counters->find(counter); else return 0; } diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 337e9399d..26e9c26d5 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -2800,7 +2800,7 @@ public: static void addBorderStyle(TQValueList& borderStyles, CollapsedBorderValue borderValue) { - if (!borderValue.exists() || borderStyles.tqcontains(borderValue)) + if (!borderValue.exists() || borderStyles.contains(borderValue)) return; TQValueListIterator it = borderStyles.begin(); diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index f80d82921..b53f20ba8 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().tqfind( "failed!" ) >= 0 ) + if ( str.qstring().lower().find( "failed!" ) >= 0 ) m_regTest->saw_failure = true; TQString res = str.qstring().replace('\007', ""); m_regTest->m_currentOutput += res + "\n"; @@ -1077,7 +1077,7 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.tqfind('/', pos); + int newpos = absBase.find('/', pos); if (newpos == -1) newpos = absBase.length(); TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index d98d875b2..4a2b2daa1 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).tqfind(".xml", 0, false) == 0) { + if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); ags.serviceType = "text/xml"; doc->browserExtension()->setURLArgs(ags); diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp index 1c13ab5ce..c49a03e78 100644 --- a/khtml/xml/dom2_eventsimpl.cpp +++ b/khtml/xml/dom2_eventsimpl.cpp @@ -499,14 +499,14 @@ public: } L toLeft(R r) { - TQMapIterator i( m_rToL.tqfind(r) ); + TQMapIterator i( m_rToL.find(r) ); if (i != m_rToL.end()) return *i; return L(); } R toRight(L l) { - TQMapIterator i = m_lToR.tqfind(l); + TQMapIterator i = m_lToR.find(l); if (i != m_lToR.end()) return *i; return R(); diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 9de636704..0f70610ef 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.tqfind(id); + ItemInfo* info = m_dict.find(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.tqfind(id); + ItemInfo* info = m_dict.find(id); info->nd = nd; } @@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.tqfind(id); + ItemInfo* info = m_dict.find(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.tqfind(id); + return m_dict.find(id); } ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id) { if (id.isEmpty()) return 0; - return m_dict.tqfind(id); + return m_dict.find(id); } static KStaticDeleter< TQPtrList > s_changedDocumentsDeleter; @@ -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.tqfind(TQRegExp("[;,]")); + int pos = str.find(TQRegExp("[;,]")); if ( pos == -1 ) - pos = str.tqfind(TQRegExp("[ \t]")); + pos = str.find(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.tqfind("url", 0, false ) == 0) str = str.mid(3); + if(str.find("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.tqfind( name ); + id = (NodeImpl::Id)(long) map->ids.find( name ); if (!id && _type != NodeImpl::NamespaceId) { - id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name ); + id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name ); } } else { - id = (NodeImpl::Id)(long) map->ids.tqfind( name ); + id = (NodeImpl::Id)(long) map->ids.find( name ); if (!readonly && id && _prefix && _prefix->l) { // we were called in registration mode... check if the alias exists TQConstString px( _prefix->s, _prefix->l ); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); - if (!map->ids.tqfind( qn )) { + if (!map->ids.find( qn )) { map->ids.insert( qn, (void*)id ); } } @@ -2143,7 +2143,7 @@ void DocumentImpl::recalcStyleSelector() title = title.replace('&', "&&"); - if ( !m_availableSheets.tqcontains( title ) ) + if ( !m_availableSheets.contains( title ) ) m_availableSheets.append( title ); } } @@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector() // or we found the sheet we selected if (sheetUsed.isEmpty() || (!canResetSheet && tokenizer()) || - m_availableSheets.tqcontains(sheetUsed)) { + m_availableSheets.contains(sheetUsed)) { break; } @@ -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.tqfind(key.hash()); + (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash()); if (cached) { if (cached->key == key) { @@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo( if (type != NodeListImpl::UNCACHEABLE) { newInfo->ref(); //Add the cache's reference - m_nodeListCache.tqreplace(key.hash(), newInfo); + m_nodeListCache.replace(key.hash(), newInfo); } return newInfo; diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h index a4aec9223..8d20f47e6 100644 --- a/khtml/xml/dom_docimpl.h +++ b/khtml/xml/dom_docimpl.h @@ -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.tqfind( qn )) { + if (!ids.find( qn )) { ids.insert( qn, (void*)id ); } } diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index 8440d4395..834f4b674 100644 --- a/khtml/xml/dom_nodeimpl.cpp +++ b/khtml/xml/dom_nodeimpl.cpp @@ -2060,7 +2060,7 @@ bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener { if (!listeners) return false; - return listeners->tqfind(listener) != listeners->end(); + return listeners->find(listener) != listeners->end(); } RegisteredListenerList::~RegisteredListenerList() { diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp index 3f904ae76..14aa4f5ea 100644 --- a/khtml/xml/dom_stringimpl.cpp +++ b/khtml/xml/dom_stringimpl.cpp @@ -286,14 +286,14 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const } str = str.simplifyWhiteSpace(); - len = str.tqcontains(' ') + 1; + len = str.contains(' ') + 1; khtml::Length* r = new khtml::Length[len]; int i = 0; int pos = 0; int pos2; - while((pos2 = str.tqfind(' ', pos)) != -1) { + while((pos2 = str.find(' ', pos)) != -1) { r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); pos = pos2+1; } @@ -307,7 +307,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const TQString str(s, l); str = str.simplifyWhiteSpace(); - len = str.tqcontains(',') + 1; + len = str.contains(',') + 1; // If we have no commas, we have no array. if( len == 1 ) @@ -319,7 +319,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const int pos = 0; int pos2; - while((pos2 = str.tqfind(',', pos)) != -1) { + while((pos2 = str.find(',', pos)) != -1) { r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); pos = pos2+1; } diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp index 37fc36f02..8f6164f51 100644 --- a/khtml/xml/xml_tokenizer.cpp +++ b/khtml/xml/xml_tokenizer.cpp @@ -152,11 +152,11 @@ 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.tqfind(':') != -1) { + if (uri.isEmpty() && qname.find(':') != -1) { TQXmlNamespaceSupport ns; TQString localName, prefix; ns.splitName(qname, prefix, localName); - if (namespaceInfo.tqcontains(prefix)) { + if (namespaceInfo.contains(prefix)) { uri = namespaceInfo[prefix].top(); } } -- cgit v1.2.1