diff options
90 files changed, 342 insertions, 342 deletions
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 7ce7b89..744840c 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -303,7 +303,7 @@ void AtlanticDesigner::openFile(const TQString &filename) } // this for outside-of-[]-settings - int eqSign = s.tqfind("="); + int eqSign = s.find("="); if (eqSign >= 0) { TQString key = s.left(eqSign); @@ -344,8 +344,8 @@ void AtlanticDesigner::openFile(const TQString &filename) continue; } - name = s.left(s.tqfind("]")); - name = name.right(name.length() - name.tqfind("[") - 1); + name = s.left(s.find("]")); + name = name.right(name.length() - name.find("[") - 1); if (name.isEmpty()) name = i18n("No Name"); @@ -380,7 +380,7 @@ void AtlanticDesigner::openFile(const TQString &filename) if (s.left(1) == "[" || s.left(1) == "<") break; - int eqSign = s.tqfind("="); + int eqSign = s.find("="); if (eqSign < 0) continue; @@ -658,7 +658,7 @@ void AtlanticDesigner::save() for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it) { - if (writtenGroups.tqcontains((*it).name()) > 0) + if (writtenGroups.contains((*it).name()) > 0) continue; if ((*it).name() == "Default") diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 407e03d..4cf95ed 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -784,7 +784,7 @@ void CardView::selected(int i) newChooseWidget->show(); - newChooseWidget->typeChanged(types.tqfindIndex(*it)); + newChooseWidget->typeChanged(types.findIndex(*it)); newChooseWidget->valueChanged(*vit); newChooseWidget->estateChanged(*vit); diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index 9cc67a8..bc69af0 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -279,7 +279,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << addr->familyName() << DELIM // Lastname << addr->title() << DELIM // Title << dateString(addr->birthday()) << DELIM // Birthday - << addr->note() /*.tqreplace('\n',"\r\n")*/ << DELIM // Comments + << addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments << dateString(addr->revision()) << DELIM // Change_date << "1##0\n"; // tqStatus, Address_link_id, Categories } diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp index c99d455..b66c7fc 100644 --- a/kate/cppsymbolviewer/cpp_parser.cpp +++ b/kate/cppsymbolviewer/cpp_parser.cpp @@ -67,21 +67,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) cl = cl.stripWhiteSpace(); func_close = 0; if(cl.at(0) == '/' && cl.at(1) == '/') continue; - if(cl.tqfind("/*") == 0 && (cl.tqfind("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( - if(cl.tqfind("/*") >= 0 && graph == 0) comment = 1; - if(cl.tqfind("*/") >= 0 && graph == 0) comment = 0; - if(cl.tqfind("#") >= 0 && graph == 0 ) macro = 1; + if(cl.find("/*") == 0 && (cl.find("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( + if(cl.find("/*") >= 0 && graph == 0) comment = 1; + if(cl.find("*/") >= 0 && graph == 0) comment = 0; + if(cl.find("#") >= 0 && graph == 0 ) macro = 1; if (comment != 1) { /* *********************** MACRO PARSING *****************************/ if(macro == 1) { - //macro_pos = cl.tqfind("#"); + //macro_pos = cl.find("#"); for (j = 0; j < cl.length(); j++) { if(cl.at(j)=='/' && cl.at(j+1)=='/') { macro = 4; break; } - if( (uint)cl.tqfind("define") == j && - !((uint)cl.tqfind("defined") == j)) + if( (uint)cl.find("define") == j && + !((uint)cl.find("defined") == j)) { macro = 2; j += 6; // skip the word "define" @@ -99,7 +99,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) if(j == cl.length() && macro == 1) macro = 0; if(macro == 4) { - //stripped.tqreplace(0x9, " "); + //stripped.replace(0x9, " "); stripped = stripped.stripWhiteSpace(); if (macro_on == true) { @@ -129,7 +129,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) /* ******************************************************************** */ - if ((cl.tqfind("class") >= 0 && graph == 0 && block == 0)) + if ((cl.find("class") >= 0 && graph == 0 && block == 0)) { mclass = 1; for (j = 0; j < cl.length(); j++) @@ -158,19 +158,19 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } if (mclass == 3) { - if (cl.tqfind('{') >= 0) + if (cl.find('{') >= 0) { - cl = cl.right(cl.tqfind('{')); + cl = cl.right(cl.find('{')); mclass = 4; } } - if(cl.tqfind("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) + if(cl.find("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) { structure = false; block = 1; } - if((cl.tqfind("typedef") >= 0 || cl.tqfind("struct") >= 0) && + if((cl.find("typedef") >= 0 || cl.find("struct") >= 0) && graph == 0 && block == 0) { structure = true; block = 2; stripped = ""; } - //if(cl.tqfind(";") >= 0 && graph == 0) + //if(cl.find(";") >= 0 && graph == 0) // block = 0; if(block > 0 && mclass != 1 ) @@ -216,21 +216,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) break; } - if(cl.at(j)=='{' && structure == false && cl.tqfind(";") < 0 || - cl.at(j)=='{' && structure == false && cl.tqfind('}') > (int)j) + if(cl.at(j)=='{' && structure == false && cl.find(";") < 0 || + cl.at(j)=='{' && structure == false && cl.find('}') > (int)j) { - stripped.tqreplace(0x9, " "); + stripped.replace(0x9, " "); if(func_on == true) { if (types_on == false) { - while (stripped.tqfind('(') >= 0) - stripped = stripped.left(stripped.tqfind('(')); - while (stripped.tqfind("::") >= 0) - stripped = stripped.mid(stripped.tqfind("::") + 2); + while (stripped.find('(') >= 0) + stripped = stripped.left(stripped.find('(')); + while (stripped.find("::") >= 0) + stripped = stripped.mid(stripped.find("::") + 2); stripped = stripped.stripWhiteSpace(); - while (stripped.tqfind(0x20) >= 0) - stripped = stripped.mid(stripped.tqfind(0x20, 0) + 1); + while (stripped.find(0x20) >= 0) + stripped = stripped.mid(stripped.find(0x20, 0) + 1); } //kdDebug(13000)<<"Function -- Inserted: "<<stripped<<" at row: "<<tmpPos<<" mclass: "<<(uint)mclass<<endl; if (treeMode) @@ -290,9 +290,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if(cl.at(j) == ';') { - //stripped.tqreplace(0x9, " "); + //stripped.replace(0x9, " "); stripped.remove('{'); - stripped.tqreplace('}', " "); + stripped.replace('}', " "); if(struct_on == true) { if (treeMode) @@ -319,9 +319,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } // BLOCK > 0 if (mclass == 4 && block == 0 && func_close == 0) { - if (cl.tqfind('}') >= 0) + if (cl.find('}') >= 0) { - cl = cl.right(cl.tqfind('}')); + cl = cl.right(cl.find('}')); mclass = 0; } } diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp index fca2a5d..3402b67 100644 --- a/kate/cppsymbolviewer/tcl_parser.cpp +++ b/kate/cppsymbolviewer/tcl_parser.cpp @@ -80,8 +80,8 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) { stripped = currline.right(currline.length() - 3); stripped = stripped.simplifyWhiteSpace(); - int fnd = stripped.tqfind(' '); - //fnd = stripped.tqfind(";"); + int fnd = stripped.find(' '); + //fnd = stripped.find(";"); if(fnd > 0) stripped = stripped.left(fnd); if (treeMode) diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 33639ce..2bae5f8 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -192,7 +192,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d) TQString fname = (*it).section( '/', -1 ); // skip if hidden - if ( hidden.tqcontains( fname ) ) + if ( hidden.contains( fname ) ) continue; // Read the first line of the file, to get the group/name @@ -284,7 +284,7 @@ TQStringList KateFileTemplates::groups() for ( uint i = 0; i < m_templates.count(); i++ ) { s = m_templates.at( i )->group; - if ( ! l.tqcontains( s ) ) + if ( ! l.contains( s ) ) l.append( s ); } @@ -332,7 +332,7 @@ void KateFileTemplates::refreshMenu( PluginView *v ) w.prepend( "<p>" ); if ( ! w.isEmpty() ) - submenus[m_templates.at( i )->group]->tqfindItem( i )->setWhatsThis( w ); + submenus[m_templates.at( i )->group]->findItem( i )->setWhatsThis( w ); } } @@ -412,7 +412,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( reName.search( tmp ) > -1 ) { docname = reName.cap( 1 ); - docname = docname.tqreplace( "%N", "%1" ); + docname = docname.replace( "%N", "%1" ); doneheader |= 1; } } @@ -458,7 +458,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ! isTemplate ) { - int d = filename.tqfindRev('.'); + int d = filename.findRev('.'); docname = i18n("Untitled %1"); if ( d > 0 ) docname += filename.mid( d ); } else if ( docname.isEmpty() ) @@ -467,8 +467,8 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) // check for other documents matching this naming scheme, // and do a count before chosing a name for this one TQString p = docname; - p.tqreplace( "%1", "\\d+" ); - p.tqreplace( ".", "\\." ); + p.replace( "%1", "\\d+" ); + p.replace( ".", "\\." ); p.prepend( "^" ); p.append( "$" ); TQRegExp reName( p ); @@ -478,7 +478,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url ) if ( ( reName.search ( application()->documentManager()->document( i )->docName() ) > -1 ) ) count++; - if ( docname.tqcontains( "%1" ) ) + if ( docname.contains( "%1" ) ) docname = docname.tqarg( count ); doc->setDocName( docname ); @@ -578,7 +578,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *tqparent, TemplateInfo l->setBuddy( leDocumentName ); TQWhatsThis::add( leDocumentName, i18n("<p>This string will be used to set a name " "for the new document, to display in the title bar and file list.</p>" - "<p>If the string tqcontains '%N', that will be replaced with a number " + "<p>If the string contains '%N', that will be replaced with a number " "increasing with each similarly named file.</p><p> For example, if the " "Document Name is 'New shellscript (%N).sh', the first document will be " "named 'New shellscript (1).sh', the second 'New shellscipt (2).sh', and " @@ -908,7 +908,7 @@ void KateTemplateWizard::accept() else suggestion = kti->leTemplate->text(); - suggestion.tqreplace(" ", ""); + suggestion.replace(" ", ""); if ( ! suggestion.endsWith(".katetemplate") ) suggestion.append(".katetemplate"); @@ -1005,16 +1005,16 @@ void KateTemplateWizard::accept() { // 3) if the file is not already a template, escape any "%" and "^" in it, // and try do do some replacement of the authors username, name and email. - tmp.tqreplace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); - tmp.tqreplace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); - //tmp.tqreplace( "^", "\\^" ); + tmp.replace( TQRegExp("%(?=\\{[^}]+\\})"), "\\%" ); + tmp.replace( TQRegExp("\\$(?=\\{[^}]+\\})"), "\\$" ); + //tmp.replace( "^", "\\^" ); if ( cbRRealname->isChecked() && ! sFullname.isEmpty() ) - tmp.tqreplace( sFullname, "%{realname}" ); + tmp.replace( sFullname, "%{realname}" ); if ( cbREmail->isChecked() && ! sEmail.isEmpty() ) - tmp.tqreplace( sEmail, "%{email}" ); + tmp.replace( sEmail, "%{email}" ); } str += tmp; @@ -1249,6 +1249,6 @@ void KateTemplateManager::slotDownload() //END KateTemplateManager -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; #include "filetemplates.moc" diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index e6fef30..ec3134c 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -260,4 +260,4 @@ class KateTemplateManager : public TQWidget }; #endif // _PLUGIN_KATE_FILETEMPLATES_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/filetemplates/plugin/katetemplate.xml b/kate/filetemplates/plugin/katetemplate.xml index 78647d4..0748481 100644 --- a/kate/filetemplates/plugin/katetemplate.xml +++ b/kate/filetemplates/plugin/katetemplate.xml @@ -84,4 +84,4 @@ <keywords casesensitive="0"/> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; --> diff --git a/kate/filetemplates/templates/language.xml.katetemplate b/kate/filetemplates/templates/language.xml.katetemplate index 65d677a..420ba84 100644 --- a/kate/filetemplates/templates/language.xml.katetemplate +++ b/kate/filetemplates/templates/language.xml.katetemplate @@ -57,4 +57,4 @@ katetemplate: Description=This template will create the basics of a kate highlig --> </general> </language> -<!-- kate: space-indent on; indent-width 2; tqreplace-tabs on; indent-mode xml; --> +<!-- kate: space-indent on; indent-width 2; replace-tabs on; indent-mode xml; --> diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index a71c91c..ba7c530 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -142,7 +142,7 @@ void PluginKateHtmlTools::slipInHTMLtag (Kate::View & view, TQString text) // // when we try to reselect. TODO: fix those bugs, and we can // un-break this if... - if (preDeleteLine == line && -1 == marked.tqfind ('\n')) + if (preDeleteLine == line && -1 == marked.find ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 2b8e80e..74f857e 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -173,7 +173,7 @@ void PluginKateInsertCommand::slotInsertCommand() sh->start( KProcess::NotifyOnExit, KProcess::All ); // add command to history - if ( cmdhist.tqcontains( d->command() ) ) { + if ( cmdhist.contains( d->command() ) ) { cmdhist.remove( d->command() ); } cmdhist.prepend( d->command() ); @@ -414,4 +414,4 @@ void InsertCommandConfigPage::apply() emit configPageApplyRequest( this ); } //END InsertCommandConfigPage -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 5765a9b..9a33cbe 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -170,4 +170,4 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage }; #endif // _PLUGIN_KATE_INSERT_COMMAND_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index aeddbbc..bf6ec28 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -390,7 +390,7 @@ void Kate::JS::RefCountedObjectDict::decRef() { } KJS::Object Kate::JS::RefCountedObjectDict::jsObject(KJS::ExecState *exec, TQObject *obj, KJSEmbed::JSObjectProxy *proxy) { - ObjectEntry *oe=tqfind(obj); + ObjectEntry *oe=find(obj); if (oe==0) { oe=new ObjectEntry; oe->obj=proxy->part()->factory()->createProxy(exec,obj,proxy); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 483a677..e69205f 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -290,7 +290,7 @@ KPyBrowser::parseText (TQString & pytext) //strip out the beginning class and ending colon class_sig = line->stripWhiteSpace ().mid (6); class_sig = class_sig.left (class_sig.length () - 1); - paren_i = class_sig.tqfind ("("); + paren_i = class_sig.find ("("); class_name = class_sig.left (paren_i); last_class_node = @@ -305,8 +305,8 @@ KPyBrowser::parseText (TQString & pytext) { //strip off the leading def and the ending colon method_sig = line->stripWhiteSpace ().mid (4); - method_sig = method_sig.left (method_sig.tqfind (":")); - paren_i = method_sig.tqfind ("("); + method_sig = method_sig.left (method_sig.find (":")); + paren_i = method_sig.find ("("); method_name = method_sig.left (paren_i); last_method_node = new PyBrowseNode (last_class_node, method_name, method_sig, @@ -320,8 +320,8 @@ KPyBrowser::parseText (TQString & pytext) { //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no)); function_sig = line->stripWhiteSpace ().mid (4); - function_sig = function_sig.left (function_sig.tqfind (":")); - paren_i = function_sig.tqfind ("("); + function_sig = function_sig.left (function_sig.find (":")); + paren_i = function_sig.find ("("); function_name = function_sig.left (paren_i); last_function_node = new PyBrowseNode (function_root, function_name, function_sig, diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index bd9f791..1cff538 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -82,7 +82,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) done = 1; if (forward_line < numlines) { - if (doc->textLine(forward_line).tqfind(name) > -1) + if (doc->textLine(forward_line).find(name) > -1) { apiline = forward_line; break; @@ -92,7 +92,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line) } if (backward_line > -1) { - if (doc->textLine(backward_line).tqfind(name) > -1) + if (doc->textLine(backward_line).find(name) > -1) { apiline = backward_line; break; diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index 73f61cb..f61cfe0 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -132,7 +132,7 @@ public: (lineno > 0 ? TQString::number(lineno) : TQString()), message) { - m_isError = !message.tqcontains(TQString::tqfromLatin1("warning")); + m_isError = !message.contains(TQString::tqfromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } @@ -403,21 +403,21 @@ void PluginKateMakeView::processLine(const TQString &l) kdDebug() << "Got line " << l ; - if (!filenameDetector && l.tqfind(source_prefix)!=0) + if (!filenameDetector && l.find(source_prefix)!=0) { /* ErrorMessage *e = */ (void) new ErrorMessage(this,l); return; } - if (filenameDetector && l.tqfind(*filenameDetector)<0) + if (filenameDetector && l.find(*filenameDetector)<0) { ErrorMessage *e = new ErrorMessage(this,l); kdDebug() << "Got message(1) #" << e->serial() << endl; return; } - int ofs1 = l.tqfind(':'); - int ofs2 = l.tqfind(':',ofs1+1); + int ofs1 = l.find(':'); + int ofs2 = l.find(':',ofs1+1); // TQString m = l.mid(ofs2+1); m.remove('\n'); @@ -452,7 +452,7 @@ void PluginKateMakeView::slotReceivedProcStderr(KProcess *, char *result, int le output_line += l; int nl_p = -1; - while ((nl_p = output_line.tqfind('\n')) > 1) + while ((nl_p = output_line.find('\n')) > 1) { processLine(output_line.left(nl_p+1)); output_line.remove(0,nl_p+1); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index e3d22a1..3cf73c4 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -97,25 +97,25 @@ void ModelinePlugin::applyModeline() options = vim2.cap(1); } else if( doc->searchText( 0, 0, vim1, &foundAtLine, &foundAtCol, &matchLen ) ) { options = vim1.cap(1); - options.tqreplace( TQRegExp( ":" ), " " ); + options.replace( TQRegExp( ":" ), " " ); } uint configFlags = doc->configFlags(); kdDebug() << "Found modeline: " << options << endl; - if( options.tqfind( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { + if( options.find( TQRegExp( "\\bnoet\\b" ) ) >= 0 ) { kdDebug() << "Clearing replace tabs" << endl; configFlags &= ~Kate::Document::cfReplaceTabs; - } else if( options.tqfind( TQRegExp( "\\bet\\b" ) ) >= 0 ) { + } else if( options.find( TQRegExp( "\\bet\\b" ) ) >= 0 ) { kdDebug() << "Setting replace tabs" << endl; configFlags |= Kate::Document::cfReplaceTabs; } TQRegExp ts( "ts=(\\d+)" ); - if( options.tqfind( ts ) >= 0 ) { + if( options.find( ts ) >= 0 ) { uint tabWidth = ts.cap(1).toUInt(); kdDebug() << "Setting tab width " << tabWidth << endl; view->setTabWidth( tabWidth ); } TQRegExp tw( "tw=(\\d+)" ); - if( options.tqfind( tw ) >= 0 ) { + if( options.find( tw ) >= 0 ) { uint textWidth = tw.cap(1).toUInt(); kdDebug() << "Setting text width " << textWidth << endl; doc->setWordWrap( true ); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index 15dbb77..eade8e8 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -91,9 +91,9 @@ void PluginKateOpenHeader::slotOpenHeader () TQStringList headers( TQStringList() << "h" << "H" << "hh" << "hpp" ); TQStringList sources( TQStringList() << "c" << "cpp" << "cc" << "cp" << "cxx" ); - if( sources.tqfind( extension ) != sources.end() ) { + if( sources.find( extension ) != sources.end() ) { tryOpen( url, headers ); - } else if ( headers.tqfind( extension ) != headers.end() ) { + } else if ( headers.find( extension ) != headers.end() ) { tryOpen( url, sources ); } } diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 8e0d6cb..018faf8 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -170,9 +170,9 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { kv->keyDelete(); } - sText.tqreplace( TQRegExp("<mark/>"), sSelection ); - sText.tqreplace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); - sText.tqreplace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); + sText.replace( TQRegExp("<mark/>"), sSelection ); + sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); kv->insertText ( sText ); } kv->setFocus(); diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index c003beb..0b53f45 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -95,7 +95,7 @@ splitString (TQString q, char c, TQStringList &list) // PCP int pos; TQString item; - while ( (pos = q.tqfind(c)) >= 0) + while ( (pos = q.find(c)) >= 0) { item = q.left(pos); list.append(item); @@ -130,7 +130,7 @@ slipInNewText (Kate::View & view, TQString pre, TQString marked, TQString post, // TODO: fix OnceAndOnlyOnce between this module and plugin_katehtmltools.cpp - if (reselect && preDeleteLine == line && -1 == marked.tqfind ('\n')) + if (reselect && preDeleteLine == line && -1 == marked.find ('\n')) if (preDeleteLine == line && preDeleteCol == col) { view.setCursorPosition (line, col + pre.length () + marked.length () - 1); @@ -333,4 +333,4 @@ bool PluginKateTextFilter::exec( Kate::View *v, const TQString &cmd, TQString &m return true; } //END -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index a3aed2c..772a30d 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -63,4 +63,4 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa }; #endif // _PLUGIN_KANT_TEXTFILTER_H -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 2f94759..1345d46 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -189,10 +189,10 @@ void PluginKateXMLCheckView::slotProcExited(KProcess*) for(TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { TQString line = *it; line_count++; - int semicolon_1 = line.tqfind(':'); - int semicolon_2 = line.tqfind(':', semicolon_1+1); - int semicolon_3 = line.tqfind(':', semicolon_2+2); - int caret_pos = line.tqfind('^'); + int semicolon_1 = line.find(':'); + int semicolon_2 = line.find(':', semicolon_1+1); + int semicolon_3 = line.find(':', semicolon_2+2); + int caret_pos = line.find('^'); if( semicolon_1 != -1 && semicolon_2 != -1 && semicolon_3 != -1 ) { linenumber = line.mid(semicolon_1+1, semicolon_2-semicolon_1-1).stripWhiteSpace(); linenumber = linenumber.rightJustify(6, ' '); // for sorting numbers @@ -317,7 +317,7 @@ bool PluginKateXMLCheckView::slotValidate() // and needs to be ignored then): TQRegExp re("<!--.*-->"); re.setMinimal(true); - text_start.tqreplace(re, ""); + text_start.replace(re, ""); TQRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", false); re_doctype.setMinimal(true); @@ -336,7 +336,7 @@ bool PluginKateXMLCheckView::slotValidate() m_validating = true; *m_proc << "--valid"; } - } else if( text_start.tqfind("<!DOCTYPE") != -1 ) { + } else if( text_start.find("<!DOCTYPE") != -1 ) { // DTD is inside the XML file m_validating = true; *m_proc << "--valid"; diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml index 06b7a1e..e1611e9 100644 --- a/kate/xmltools/kde-docbook.dtd.xml +++ b/kate/xmltools/kde-docbook.dtd.xml @@ -845,7 +845,7 @@ <entity name="ulcorn" type="gen"> <text-expanded>&#x231C;</text-expanded> </entity> -<entity name="ktqfind" type="gen"> +<entity name="kfind" type="gen"> <text-expanded> <application>KFind</application> </text-expanded> diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index b3eea59..e8936b8 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -440,8 +440,8 @@ void PluginKateXMLTools::getDTD() else if ( doctype == "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" ) filename = "kde-docbook.dtd.xml"; } - else if( documentStart.tqfind("<xsl:stylesheet" ) != -1 && - documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) + else if( documentStart.find("<xsl:stylesheet" ) != -1 && + documentStart.find( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) { /* XSLT doesn't have a doctype/DTD. We look for an xsl:stylesheet tag instead. Example: @@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { - m_docDtds.tqreplace( doc->documentNumber(), dtd ); + m_docDtds.replace( doc->documentNumber(), dtd ); connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); @@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement() if ( dtd && dtd->allowedAttributes(list[0]).count() ) adjust++; // the ">" - if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") ) + if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") ) { pre = "<" + text + "/>"; if ( adjust ) @@ -708,7 +708,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, T // anders: if the tag is marked EMPTY, insert in form <tagname/> TQString str; int docNumber = kv->document()->documentNumber(); - bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).tqcontains( "__EMPTY" ); + bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" ); if ( isEmptyTag ) str = "/>"; else @@ -1076,7 +1076,7 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQString str = *it; - if( mapList.tqcontains(str.lower()) ) + if( mapList.contains(str.lower()) ) { // do not override a previous value, e.g. "Auml" and "auml" are two different // entities, but they should be sorted next to each other. @@ -1138,4 +1138,4 @@ TQString InsertElement::showDialog( TQStringList &completions ) return TQString(); } //END InsertElement dialog -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index e3a6c51..892a142 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -149,4 +149,4 @@ class InsertElement : public KDialogBase }; #endif // _PLUGIN_KANT_XMLTOOLS_H -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index e0376d4..51d1fe3 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) { - TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) ); + TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); if( it != subelementList.end() ) subelementList.remove(it); } @@ -208,7 +208,7 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement ) return it.data(); } } - else if( m_elementsList.tqcontains(parentElement) ) + else if( m_elementsList.contains(parentElement) ) return m_elementsList[parentElement]; return TQStringList(); @@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element ) } } } - else if( m_attributesList.tqcontains(element) ) + else if( m_attributesList.contains(element) ) return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes; return TQStringList(); @@ -292,7 +292,7 @@ TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const return it.data().requiredAttributes; } } - else if( m_attributesList.tqcontains(element) ) + else if( m_attributesList.contains(element) ) return m_attributesList[element].requiredAttributes; return TQStringList(); @@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute ) } } } - else if( m_attributevaluesList.tqcontains(element) ) + else if( m_attributevaluesList.contains(element) ) { TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element]; - if( attrVals.tqcontains(attribute) ) + if( attrVals.contains(attribute) ) return attrVals[attribute]; } @@ -411,14 +411,14 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) TQString exp = expandedElem.text(); // TODO: support more than one &#...; in the expanded text /* TODO include do this when the tqunicode font problem is solved: - if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { + if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" - uint end = exp.tqfind( ";" ); + uint end = exp.find( ";" ); exp = exp.mid( 3, end-3 ); exp = TQChar(); - } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) { + } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) { // decimal numbers, e.g. "ì" - uint end = exp.tqfind( ";" ); + uint end = exp.find( ";" ); exp = exp.mid( 2, end-2 ); exp = TQChar( exp.toInt() ); } @@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start ) return entities; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index 912ec4b..5da444c 100644 --- a/kate/xmltools/pseudo_dtd.h +++ b/kate/xmltools/pseudo_dtd.h @@ -73,4 +73,4 @@ class PseudoDTD }; #endif // _PLUGIN_KANT_XMLTOOLS_DTD_H -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kfile-plugins/cert/kfile_cert.cpp b/kfile-plugins/cert/kfile_cert.cpp index 4175240..3ffd163 100644 --- a/kfile-plugins/cert/kfile_cert.cpp +++ b/kfile-plugins/cert/kfile_cert.cpp @@ -110,10 +110,10 @@ static KSSLCertificate *readCertFromFile(const TQString &path) KOSSL::self()->ERR_clear_error(); const char *begin_line = "-----BEGIN CERTIFICATE-----\n"; const char *end_line = "\n-----END CERTIFICATE-----"; - int begin_pos = file_string.tqfind(begin_line); + int begin_pos = file_string.find(begin_line); if (begin_pos >= 0) { begin_pos += strlen(begin_line); - int end_pos = file_string.tqfind(end_line, begin_pos); + int end_pos = file_string.find(end_line, begin_pos); if (end_pos >= 0) { // read the data between begin and end lines TQCString body = file_string.mid(begin_pos, end_pos - begin_pos); diff --git a/kfile-plugins/html/kfile_html.cpp b/kfile-plugins/html/kfile_html.cpp index d49d184..3711e46 100644 --- a/kfile-plugins/html/kfile_html.cpp +++ b/kfile-plugins/html/kfile_html.cpp @@ -151,7 +151,7 @@ bool KHtmlPlugin::readInfo( KFileMetaInfo& info, uint ) // find out if it contains javascript exp.setPattern("<script>"); - appendItem(group, "Javascript", TQVariant( s.tqfind(exp)!=-1, 42)); + appendItem(group, "Javascript", TQVariant( s.find(exp)!=-1, 42)); return true; } diff --git a/kfile-plugins/lnk/lnkforward.cpp b/kfile-plugins/lnk/lnkforward.cpp index 9eb6af0..af4492b 100644 --- a/kfile-plugins/lnk/lnkforward.cpp +++ b/kfile-plugins/lnk/lnkforward.cpp @@ -72,7 +72,7 @@ int LNKForwarder::run(KCmdLineArgs *args) bool ret = readLNK(args->arg(0), info); if ( ! ret ) return 1; - info.path.tqreplace(TQChar('\\'), TQChar('/')); + info.path.replace(TQChar('\\'), TQChar('/')); TQString path; diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/kfile-plugins/mhtml/kfile_mhtml.cpp index 96da46e..895d969 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.cpp +++ b/kfile-plugins/mhtml/kfile_mhtml.cpp @@ -120,21 +120,21 @@ bool mhtmlPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) } TQString mhtmlPlugin::decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater){ - int st=msg.tqfind("=?"); + int st=msg.find("=?"); int en=-1; TQString msgCopy=msg; TQString decodedText=msgCopy.left(st); TQString encodedText=msgCopy.mid(st); - st=encodedText.tqfind("=?"); + st=encodedText.find("=?"); while(st!=-1){ - en=encodedText.tqfind("?="); - while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) en=encodedText.tqfind("?=",en+1); + en=encodedText.find("?="); + while(encodedText.mid(en+2,1)!=" " && en+2<(int)encodedText.length()) en=encodedText.find("?=",en+1); if(en==-1) break; decodedText+=encodedText.left(st); TQString tmp=encodedText.mid(st,en-st+2); encodedText=encodedText.mid(en+2); decodedText+=decodeRFC2047String(tmp); - st=encodedText.tqfind("=?",st+1); + st=encodedText.find("=?",st+1); } decodedText += encodedText; // remove unwanted '<' and '>' @@ -147,12 +147,12 @@ TQString mhtmlPlugin::decodeRFC2047Phrase(const TQString &msg, bool removeLessGr TQString dec=decodedText; TQString tmp; - st=decodedText.tqfind("<"); + st=decodedText.find("<"); while(st!=-1){ - st=dec.tqfind("<",st); + st=dec.find("<",st); if(st==0 || (st!=0 && (dec.mid(st-2,2)==", "))){ - en=dec.tqfind(">",st); - if(en==-1 && dec.tqfind(",",st)<en){ + en=dec.find(">",st); + if(en==-1 && dec.find(",",st)<en){ st++; continue; } @@ -172,17 +172,17 @@ TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){ TQString encodedText; TQString decodedText; int encEnd=0; - if(msg.startsWith("=?") && (encEnd=msg.tqfindRev("?="))!=-1){ + if(msg.startsWith("=?") && (encEnd=msg.findRev("?="))!=-1){ notEncodedText=msg.mid(encEnd+2); encodedText=msg.left(encEnd); encodedText=encodedText.mid(2,encodedText.length()-2); - int questionMark=encodedText.tqfind('?'); + int questionMark=encodedText.find('?'); if(questionMark==-1) return msg; charset=encodedText.left(questionMark).lower(); encoding=encodedText.mid(questionMark+1,1).lower(); if(encoding!="b" && encoding!="q") return msg; encodedText=encodedText.mid(questionMark+3); - if(charset.tqfind(" ")!=-1 && encodedText.tqfind(" ")!=-1) return msg; + if(charset.find(" ")!=-1 && encodedText.find(" ")!=-1) return msg; TQCString tmpIn; TQCString tmpOut; tmpIn = encodedText.local8Bit(); @@ -192,8 +192,8 @@ TQString mhtmlPlugin::decodeRFC2047String(const TQString &msg){ TQTextCodec *codec = TQTextCodec::codecForName(charset.local8Bit()); if(!codec) return msg; decodedText=codec->toUnicode(tmpOut); - decodedText=decodedText.tqreplace("_"," "); - }else decodedText=tmpOut.tqreplace("_"," "); + decodedText=decodedText.replace("_"," "); + }else decodedText=tmpOut.replace("_"," "); return decodedText + notEncodedText; }else return msg; } diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index b415032..101bd42 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -157,7 +157,7 @@ void KolourPicker::slotHistory() conf->sync(); } else if (id != -1) - setClipboard(popup.tqfindItem(id)->text()); + setClipboard(popup.findItem(id)->text()); } void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) @@ -174,7 +174,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) TQColor color(img.pixel(0, 0)); // eventually remove a dupe - TQValueListIterator<TQColor> dupe = m_history.tqfind(color); + TQValueListIterator<TQColor> dupe = m_history.find(color); if (dupe != m_history.end()) m_history.remove(dupe); @@ -198,7 +198,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e) TQPopupMenu *popup = copyPopup(color, true); int id = popup->exec(e->globalPos()); if (id != -1) - setClipboard( popup->tqfindItem(id)->text() ); + setClipboard( popup->findItem(id)->text() ); delete popup; } else @@ -294,7 +294,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // HTML, lower case hex chars value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue()); popup->insertItem(SmallIcon("html"), value); - if (value.tqfind(TQRegExp("[a-f]")) >= 0) + if (value.find(TQRegExp("[a-f]")) >= 0) { // HTML, upper case hex chars value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue()); @@ -303,7 +303,7 @@ TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const // lower case hex chars value.sprintf( "%.2x%.2x%.2x", c.red(), c.green(), c.blue() ); popup->insertItem( SmallIcon( "html" ), value ); - if ( value.tqfind( TQRegExp( "[a-f]" ) ) >= 0 ) + if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 ) { // upper case hex chars value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() ); diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 4b791ff..c13cfbc 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -164,7 +164,7 @@ void KTimeMon::paintRect(int x, int y, int w, int h, TQColor c, TQPainter *p) void KTimeMon::maybeTip(const TQPoint& p) { if (sample == 0) return; // no associated sample... - if(!TQT_TQRECT_OBJECT(rect()).tqcontains(p)) return; + if(!TQT_TQRECT_OBJECT(rect()).contains(p)) return; KSample::Sample s = sample->getSample(100); // scale to 100(%) int idle = 100 - s.kernel - s.user - s.nice; diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp index d8592a2..e1dee3e 100644 --- a/kicker-applets/math/parser.cpp +++ b/kicker-applets/math/parser.cpp @@ -243,9 +243,9 @@ int Parser::addfkt(TQString str) err=0; errpos=1; str.remove(" " ); - const int p1=str.tqfind('('); - int p2=str.tqfind(','); - const int p3=str.tqfind(")="); + const int p1=str.find('('); + int p2=str.find(','); + const int p3=str.find(")="); //insert '*' when it is needed for(int i=p1+3; i < (int) str.length();i++) diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp index a89e693..b77b5d2 100644 --- a/kicker-applets/mediacontrol/amarokInterface.cpp +++ b/kicker-applets/mediacontrol/amarokInterface.cpp @@ -68,7 +68,7 @@ void AmarokInterface::myInit() void AmarokInterface::appRegistered ( const TQCString &appId ) { - if(appId.tqcontains("amarok",false) ) + if(appId.contains("amarok",false) ) { mAppId = appId; emit playerStarted(); @@ -78,7 +78,7 @@ void AmarokInterface::appRegistered ( const TQCString &appId ) void AmarokInterface::appRemoved ( const TQCString &appId ) { - if ( appId.tqcontains("amarok",false) ) + if ( appId.contains("amarok",false) ) { // is there still another amarok alive? if ( findRunningAmarok() ) @@ -264,7 +264,7 @@ bool AmarokInterface::findRunningAmarok() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).tqcontains("amarok",false)) + if ((*iterator).contains("amarok",false)) { if (kapp->dcopClient()->call((*iterator), "player", "interfaces()", data, replyType, replyData) ) { @@ -274,7 +274,7 @@ bool AmarokInterface::findRunningAmarok() QCStringList list; reply >> list; - if ( list.tqcontains("AmarokPlayerInterface") ) + if ( list.contains("AmarokPlayerInterface") ) { kdDebug(90200) << "mediacontrol: amarok found" << endl; mAppId = *iterator; diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp index 6ac8b49..b055424 100644 --- a/kicker-applets/mediacontrol/jukInterface.cpp +++ b/kicker-applets/mediacontrol/jukInterface.cpp @@ -68,7 +68,7 @@ void JuKInterface::myInit() void JuKInterface::appRegistered ( const TQCString &appId ) { - if(appId.tqcontains("juk",false) ) + if(appId.contains("juk",false) ) { mAppId = appId; @@ -93,7 +93,7 @@ void JuKInterface::appRegistered ( const TQCString &appId ) void JuKInterface::appRemoved ( const TQCString &appId ) { - if ( appId.tqcontains("juk",false) ) + if ( appId.contains("juk",false) ) { // is there still another juk alive? if ( findRunningJuK() ) @@ -282,7 +282,7 @@ bool JuKInterface::findRunningJuK() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).tqcontains("juk",false)) + if ((*iterator).contains("juk",false)) { mAppId = *iterator; return true; diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index 9068aeb..cb94759 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -78,7 +78,7 @@ class MediaControlToolTip : public TQToolTip virtual void maybeTip(const TQPoint &pt) { TQRect rc( mWidget->rect()); - if (rc.tqcontains(pt)) + if (rc.contains(pt)) { tip ( rc, mPlayer->getTrackTitle() ); } diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 5f5d06a..2636398 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -106,7 +106,7 @@ void MediaControlConfig::load() // find the playerstring from config in the playerlist and select it if found TQListBoxItem *item = 0; - item = _child->playerListBox->tqfindItem( _configFrontend->player() ); + item = _child->playerListBox->findItem( _configFrontend->player() ); if ( item ) _child->playerListBox->setCurrentItem ( item ); else @@ -118,7 +118,7 @@ void MediaControlConfig::load() _child->mWheelScrollAmount->setValue( _configFrontend->mouseWheelSpeed() ); // Select the used Theme - item = _child->themeListBox->tqfindItem( _configFrontend->theme() ); + item = _child->themeListBox->findItem( _configFrontend->theme() ); if ( item ) _child->themeListBox->setCurrentItem( item ); else diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp index e9be885..ea350d2 100644 --- a/kicker-applets/mediacontrol/mpdInterface.cpp +++ b/kicker-applets/mediacontrol/mpdInterface.cpp @@ -452,7 +452,7 @@ void MpdInterface::dropEvent(TQDropEvent* event) while (!path.empty()) { if (dispatch((TQString("add \"") - +path.join("/").tqreplace("\"","\\\"") + +path.join("/").replace("\"","\\\"") +TQString("\"\n")).latin1())) { if (fetchOk()) break; diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp index 4047eb6..4ba4333 100644 --- a/kicker-applets/mediacontrol/noatunInterface.cpp +++ b/kicker-applets/mediacontrol/noatunInterface.cpp @@ -66,7 +66,7 @@ void NoatunInterface::myInit() void NoatunInterface::appRegistered(const TQCString &appId) { - if (appId.tqcontains("noatun",false)) + if (appId.contains("noatun",false)) { mAppId = appId; emit playerStarted(); @@ -76,7 +76,7 @@ void NoatunInterface::appRegistered(const TQCString &appId) void NoatunInterface::appRemoved(const TQCString &appId) { - if (appId.tqcontains("noatun",false)) + if (appId.contains("noatun",false)) { // is there still another noatun alive? if (findRunningNoatun()) @@ -273,7 +273,7 @@ bool NoatunInterface::findRunningNoatun() for (iterator = allApps.constBegin(); iterator != allApps.constEnd(); ++iterator) { - if ((*iterator).tqcontains("noatun", false)) + if ((*iterator).contains("noatun", false)) { mAppId = *iterator; return true; diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 9d0fdb3..74d07cd 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -176,7 +176,7 @@ void AdBlock::fillWithImages(AdElementList &elements) if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, "image", "IMG", false); - if (!elements.tqcontains( element )) + if (!elements.contains( element )) elements.append( element); } } @@ -203,7 +203,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, tagName.string(), category, false); - if (!elements.tqcontains( element )) + if (!elements.contains( element )) elements.append( element); } } diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 4402cd4..684bc20 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -103,16 +103,16 @@ AkregatorMenu::~AkregatorMenu() bool AkregatorMenu::isFeedUrl(const TQString &url) { - if (url.tqcontains(".htm", false) != 0) return false; - if (url.tqcontains("rss", false) != 0) return true; - if (url.tqcontains("rdf", false) != 0) return true; - if (url.tqcontains("xml", false) != 0) return true; + if (url.contains(".htm", false) != 0) return false; + if (url.contains("rss", false) != 0) return true; + if (url.contains("rdf", false) != 0) return true; + if (url.contains("xml", false) != 0) return true; return false; } bool AkregatorMenu::isFeedUrl(const KFileItem * item) { - if ( m_feedMimeTypes.tqcontains( item->mimetype() ) ) + if ( m_feedMimeTypes.contains( item->mimetype() ) ) return true; else { diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index a1b993e..f8cedbd 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound() for (unsigned int j = 0; j < node.attributes().length(); j++) { doc += node.attributes().item(j).nodeName().string() + "=\""; - doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).tqreplace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); doc += "\" "; } doc += "/>"; diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index c1d18a1..6c49555 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -73,7 +73,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis while ( ( item = it.current() ) != 0 ) { ++it; - if ( m_extractMimeTypes.tqcontains( item->mimetype() ) ) + if ( m_extractMimeTypes.contains( item->mimetype() ) ) { hasArchives = true; } @@ -442,7 +442,7 @@ void ArkMenu::stripExtension( TQString & name ) ext = (*it).remove( '*' ); if ( name.endsWith( ext ) ) { - name = name.left( name.tqfindRev( ext ) ) + '/'; + name = name.left( name.findRev( ext ) ) + '/'; break; } } @@ -456,13 +456,13 @@ void ArkMenu::slotCompressAs( int pos ) TQStringList filelist( m_urlStringList ); //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase - if ( m_extensionList[ pos ].tqcontains ( ".ZIP" ) ) + if ( m_extensionList[ pos ].contains ( ".ZIP" ) ) m_extensionList[ pos ] = ".zip"; - if ( m_extensionList[ pos ].tqcontains ( ".RAR" ) ) + if ( m_extensionList[ pos ].contains ( ".RAR" ) ) m_extensionList[ pos ] = ".rar"; - if ( m_extensionList[ pos ].tqcontains ( ".7Z" ) ) + if ( m_extensionList[ pos ].contains ( ".7Z" ) ) m_extensionList[ pos ] = ".7z"; if ( filelist.count() == 1) diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index ea5fe77..eb06bbc 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -438,11 +438,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) continue; TQString mimeType = mime->name(); - if (!m_pMimeInfo.tqcontains (mimeType)) + if (!m_pMimeInfo.contains (mimeType)) { MimeInfo& mimeInfo = m_pMimeInfo[mimeType]; TQStringList filters = m_part->mimeFilter (); - mimeInfo.useAsFilter = (!filters.isEmpty () && filters.tqcontains (mimeType)); + mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType)); mimeInfo.mimeComment = mime->comment(); mimeInfo.iconName = mime->icon(KURL(), false); mimeInfo.filenames.insert(name, false); @@ -474,7 +474,7 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) TQString mimeType = item->mimetype().stripWhiteSpace(); - if (m_pMimeInfo.tqcontains (mimeType)) { + if (m_pMimeInfo.contains (mimeType)) { MimeInfo info = m_pMimeInfo [mimeType]; if (info.filenames.size () > 1) diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index e8f8f05..7eef49d 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -401,8 +401,8 @@ void ChangeCDataCommand::apply() if (!shouldReapply()) { oldValue = cdata.data(); has_newlines = - TQConstString(value.tqunicode(), value.length()).string().tqcontains('\n') - || TQConstString(oldValue.tqunicode(), oldValue.length()).string().tqcontains('\n'); + TQConstString(value.tqunicode(), value.length()).string().contains('\n') + || TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n'); } cdata.setData(value); addChangedNode(cdata); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index fb0760a..84f78ac 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -503,7 +503,7 @@ void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& sea bool caseSensitive) { const TQString text(cur_item->text(0)); - if (text.tqcontains(searchText, caseSensitive) > 0) { + if (text.contains(searchText, caseSensitive) > 0) { cur_item->setUnderline(true); cur_item->setItalic(true); m_listView->setCurrentItem(cur_item); @@ -1168,7 +1168,7 @@ void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int co slotItemRenamed(lvi, attrName, 0); // Reget, item may have been changed - lvi = nodeAttributes->tqfindItem(attrName, 0); + lvi = nodeAttributes->findItem(attrName, 0); } if (lvi && lvi->text(1) != attrValue) diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 48d97f7..a22e8b2 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -133,7 +133,7 @@ void FSView::setPath(TQString p) if (!fi.isDir()) { _path = fi.dirPath(true); } - _pathDepth = _path.tqcontains('/'); + _pathDepth = _path.contains('/'); KURL u; u.setPath(_path); @@ -170,7 +170,7 @@ bool FSView::getDirMetric(const TQString& k, { TQMap<TQString, MetricEntry>::iterator it; - it = _dirMetric.tqfind(k); + it = _dirMetric.find(k); if (it == _dirMetric.end()) return false; s = (*it).size; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 285230d..f77b37f 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1093,7 +1093,7 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) - if (r->tqcontains(pos)) + if (r->contains(pos)) tip(*r, p->tipString(i)); } } @@ -1433,10 +1433,10 @@ void TreeMapWidget::setMinimalArea(int area) void TreeMapWidget::deletingItem(TreeMapItem* i) { // remove any references to the item to be deleted - while(_selection.tqfindRef(i) > -1) + while(_selection.findRef(i) > -1) _selection.remove(); - while(_tmpSelection.tqfindRef(i) > -1) + while(_tmpSelection.findRef(i) > -1) _tmpSelection.remove(); if (_current == i) _current = 0; @@ -1478,7 +1478,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0; + if (!TQT_TQRECT_OBJECT(rect()).contains(x, y)) return 0; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { @@ -1495,7 +1495,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const << "-" << i->tqitemRect().width() << "x" << i->tqitemRect().height() << ")" << endl; - if (i->tqitemRect().tqcontains(x, y)) { + if (i->tqitemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1546,7 +1546,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const (i->tqitemRect().height() <1))) { TreeMapItem* p = i->tqparent(); if (!p) break; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); idx--; if (idx<0) i = p; @@ -1596,12 +1596,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItem* item; while ( (item = it1.current()) != 0 ) { ++it1; - if (l2.tqcontainsRef(item) > 0) continue; + if (l2.containsRef(item) > 0) continue; l.append(item); } while ( (item = it2.current()) != 0 ) { ++it2; - if (l1.tqcontainsRef(item) > 0) continue; + if (l1.containsRef(item) > 0) continue; l.append(item); } @@ -1668,12 +1668,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) bool TreeMapWidget::isSelected(TreeMapItem* i) const { - return _selection.tqcontainsRef(i)>0; + return _selection.containsRef(i)>0; } bool TreeMapWidget::isTmpSelected(TreeMapItem* i) { - return _tmpSelection.tqcontainsRef(i)>0; + return _tmpSelection.containsRef(i)>0; } @@ -1938,7 +1938,7 @@ int nextVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx < (int)p->tqchildren()->count()-1) { @@ -1956,7 +1956,7 @@ int prevVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 47665ea..8ce6aca 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -321,7 +321,7 @@ public: virtual double sum() const; virtual double value() const; - // tqreplace "Default" position with setting from TreeMapWidget + // replace "Default" position with setting from TreeMapWidget virtual Position position(int) const; virtual const TQFont& font() const; virtual bool isMarked(int) const; diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py index f056b51..ea65c6e 100755 --- a/konq-plugins/imagerotation/exif.py +++ b/konq-plugins/imagerotation/exif.py @@ -763,7 +763,7 @@ class EXIF_header: # special case: null-terminated ASCII string if count != 0: self.file.seek(self.offset+offset) - values=self.file.read(count).strip().tqreplace('\x00','') + values=self.file.read(count).strip().replace('\x00','') else: values='' elif tag == 0x927C or tag == 0x9286: # MakerNote or UserComment diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 1174ee3..22d45b4 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -76,10 +76,10 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { KIcon::DefaultState, 0, true); if(icon.isNull()) icon = CICON("folder"); - insertItem( icon, escapedPath.tqreplace( "&", "&&" ), submenu ); + insertItem( icon, escapedPath.replace( "&", "&&" ), submenu ); } else - insertItem( folder, escapedPath.tqreplace( "&", "&&" ), submenu ); + insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); tqchildren.append( submenu ); connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), this, TQT_SLOT(slotFileSelected(const TQString &))); diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 451f127..90682ac 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -85,7 +85,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, } if ( url.isLocalFile() - && dirList.tqfind( url.path() ) == dirList.end() + && dirList.find( url.path() ) == dirList.end() && TQFileInfo( url.path() ).isWritable() && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, continue; } TQString escapedDir = *it; - KAction *action = new KAction(escapedDir.tqreplace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); + KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 27152e7..9ea88a8 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -82,7 +82,7 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); TQString text = popup->text( id ); - if( text.tqcontains("kuick_plugin") ) { + if( text.contains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) { diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index e77e1e3..d3576d7 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -91,7 +91,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - kaction_map["search"] = new KAction( i18n("&Search"), "filetqfind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- @@ -310,7 +310,7 @@ void RelLinksPlugin::updateToolbar() { // escape ampersand before settings as action title, otherwise the menu entry will interpret it as an // accelerator - title.tqreplace('&', "&&"); + title.replace('&', "&&"); // -- Menus activation -- @@ -561,7 +561,7 @@ void RelLinksPlugin::disableAll() { TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // Relations to ignore... - if (lrel.tqcontains("stylesheet") + if (lrel.contains("stylesheet") || lrel == "script" || lrel == "icon" || lrel == "shortcut icon" @@ -583,7 +583,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) { return "last"; if (lrel == "toc") return "contents"; - if (lrel == "tqfind") + if (lrel == "find") return "search"; if (lrel == "alternative stylesheet") return "alternate stylesheet"; diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index b223a93..a0987ff 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -521,7 +521,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && ((pos = buf.tqfind('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { + while (childPid && ((pos = buf.find('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { if (m_progressDialogExists == true) { tqApp->processEvents(); } @@ -530,8 +530,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { buf = buf.mid(pos); if (str == "\n") continue; - //if (str.tqcontains("rsync error:")) { - if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { + //if (str.contains("rsync error:")) { + if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -590,20 +590,20 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } if (m_progressDialogExists == true) { - if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { + if (str.contains("exit()") && str.contains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setValue(m_progressDialog->progressBar()->totalSteps()); } } else { - if (str.tqcontains(", to-check=")) { + if (str.contains(", to-check=")) { // Parse the to-check output TQString tocheck_out_cur; TQString tocheck_out_tot; - tocheck_out_cur = str.mid(str.tqfind(", to-check=") + 11, str.length()); - tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.tqfind("/") + 1, tocheck_out_cur.length()); - tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.tqfind("/")); - tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.tqfind(")")); + tocheck_out_cur = str.mid(str.find(", to-check=") + 11, str.length()); + tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.find("/") + 1, tocheck_out_cur.length()); + tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.find("/")); + tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.find(")")); m_progressDialog->progressBar()->setTotalSteps(tocheck_out_tot.toInt()-1); m_progressDialog->progressBar()->setValue(tocheck_out_tot.toInt()-tocheck_out_cur.toInt()-2); } @@ -629,7 +629,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && (((pos = buf.tqfind('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { + while (childPid && (((pos = buf.find('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { if (m_progressDialogExists == true) { tqApp->processEvents(); } @@ -638,8 +638,8 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, buf = buf.mid(pos); if (str == "\n") continue; - //if (str.tqcontains("rsync error:")) { - if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { + //if (str.contains("rsync error:")) { + if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -686,7 +686,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, return 0; } else if (buf.endsWith("?") || buf.endsWith("? []")) { - buf.tqreplace("[]", ""); + buf.replace("[]", ""); if (buf.endsWith("? []")) { int rc = KMessageBox::questionYesNo(NULL, buf); if (rc == KMessageBox::Yes) { @@ -717,8 +717,8 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } TQString file_name; file_name = buf; - file_name.tqreplace("[]", ""); - file_name.tqreplace(TQString("changed "), ""); + file_name.replace("[]", ""); + file_name.replace(TQString("changed "), ""); //file_name = file_name.simplifyWhiteSpace(); KDialogBase *dialog= new KDialogBase(i18n("User Intervention Required"), KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes, KDialogBase::Cancel, NULL, "warningYesNoCancel", true, true, i18n("Use &Local File"), i18n("Use &Remote File"), i18n("&Ignore")); int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString(), NULL, 1); @@ -735,7 +735,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } if (m_progressDialogExists == true) { - if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { + if (str.contains("exit()") && str.contains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(2); @@ -822,7 +822,7 @@ TQString RsyncPlugin::findLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -841,7 +841,7 @@ TQString RsyncPlugin::findSyncMethodByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -860,7 +860,7 @@ TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -879,7 +879,7 @@ TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -898,7 +898,7 @@ TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -917,7 +917,7 @@ int RsyncPlugin::deleteLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i=cfgfolderlist.remove(i); @@ -937,7 +937,7 @@ int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQ { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); cfgfolderlist.append(folderurl); cfgfolderlist.append(remoteurl); cfgfolderlist.append(syncmethod); diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index b4cf210..aa9dc27 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); it++; if(it==m_searchEngines.end()) { @@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); if(it==m_searchEngines.begin()) { m_searchMode = FindInThisPage; @@ -318,7 +318,7 @@ void SearchBarPlugin::setIcon() TQString hinttext; if(m_searchMode == FindInThisPage) { - m_searchIcon = SmallIcon("tqfind"); + m_searchIcon = SmallIcon("find"); hinttext = i18n("Find in This Page"); } else @@ -382,7 +382,7 @@ void SearchBarPlugin::showSelectionMenu() list << "kurisearchfilter" << "kuriikwsfilter"; m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("tqfind"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); + m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; @@ -681,12 +681,12 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) if (((KIO::TransferJob*)job)->error() == 0) { TQString temp; - temp = m_gsData.mid(m_gsData.tqfind('(') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); - temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); + temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); + temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); TQStringList compList1 = TQStringList::split(',', temp); - temp = m_gsData.mid(m_gsData.tqfind(')') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); - temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); + temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); + temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); temp.remove(','); temp.remove('s'); @@ -723,7 +723,7 @@ void SearchBarPlugin::gsSetCompletedText(const TQString& text) currentText = m_searchCombo->currentText(); if (currentText == text.left(currentText.length())) { - m_searchCombo->lineEdit()->setText(text.left(text.tqfind('(') - 1)); + m_searchCombo->lineEdit()->setText(text.left(text.find('(') - 1)); m_searchCombo->lineEdit()->setCursorPosition(currentText.length()); m_searchCombo->lineEdit()->setSelection(currentText.length(), m_searchCombo->currentText().length() - currentText.length()); } diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index a95ae83..436b678 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -100,7 +100,7 @@ void KSB_MediaWidget::playerTimeout() Position->setRange(0, range); if (needLengthUpdate) { - int counter = player->lengthString().length() - (player->lengthString().tqfind("/")+1); + int counter = player->lengthString().length() - (player->lengthString().find("/")+1); TQString length=player->lengthString().right(counter); needLengthUpdate=false; } diff --git a/konq-plugins/sidebar/metabar/Doxyfile b/konq-plugins/sidebar/metabar/Doxyfile index 4dfd560..586093d 100644 --- a/konq-plugins/sidebar/metabar/Doxyfile +++ b/konq-plugins/sidebar/metabar/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - tqcontains \ + contains \ represents \ a \ an \ diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index ebcf170..e6acdbd 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -222,7 +222,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -236,7 +236,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -576,7 +576,7 @@ void ConfigDialog::loadThemes() theme_list.remove(".."); themes->insertStringList(theme_list); - if(theme_list.tqfind(theme) != theme_list.end()){ + if(theme_list.find(theme) != theme_list.end()){ foundTheme = true; } } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 5839a64..3f2f7c9 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -418,7 +418,7 @@ bool DefaultPlugin::handleRequest(const KURL &url) if(protocol == "exec"){ int id = url.host().toInt(); - TQMap<int,KService::Ptr>::Iterator it = runMap.tqfind(id); + TQMap<int,KService::Ptr>::Iterator it = runMap.find(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index b90852d..aa09cd3 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -60,10 +60,10 @@ void HTTPPlugin::killJobs() void HTTPPlugin::loadInformation(DOM::HTMLElement node) { /*DOM::DOMString innerHTML; - innerHTML += "<form action=\"tqfind:///\" method=\"GET\">"; + innerHTML += "<form action=\"find:///\" method=\"GET\">"; innerHTML += "<ul>"; innerHTML += i18n("Keyword"); - innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"tqfind\" id=\"find_text\" value=\""; + innerHTML += " <input onFocus=\"this.value = ''\" type=\"text\" name=\"find\" id=\"find_text\" value=\""; innerHTML += i18n("Web search"); innerHTML += "\"></ul>"; innerHTML += "<ul><input type=\"submit\" id=\"find_button\" value=\""; @@ -99,8 +99,8 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node) bool HTTPPlugin::handleRequest(const KURL &url) { - if(url.protocol() == "tqfind"){ - TQString keyword = url.queryItem("tqfind"); + if(url.protocol() == "find"){ + TQString keyword = url.queryItem("find"); TQString type = url.queryItem("type"); if(!keyword.isNull() && !keyword.isEmpty()){ diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 965319e..2b01a02 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -319,7 +319,7 @@ void MetabarWidget::loadCompleted() TQString tmp = stream.read(); cssfile.close(); - tmp.tqreplace("./", KURL::fromPathOrURL(file).directory(false)); + tmp.replace("./", KURL::fromPathOrURL(file).directory(false)); html->setUserStyleSheet(tmp); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index c9ac8b4..8ef445c 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -52,7 +52,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int KURL url = item.url(); TQString mimeType = item.mimetype(); - TQString mimeGroup = mimeType.left(mimeType.tqfind('/')); + TQString mimeGroup = mimeType.left(mimeType.find('/')); urlList.clear(); urlList.append(url); @@ -96,7 +96,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(cfg.hasKey("X-KDE-Require")){ const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); - if (capabilities.tqcontains( "Write" )){ + if (capabilities.contains( "Write" )){ continue; } } @@ -123,7 +123,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int // if we have a mimetype, see if we have an exact or a type globbed match if(!ok && (!mimeType.isEmpty() && *it == mimeType) || - (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).tqfind('/')) == mimeGroup))) + (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).find('/')) == mimeGroup))) { checkTheMimetypes = true; } @@ -132,7 +132,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int ok = true; for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ - if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) || + if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || ((*itex) == mimeType)) { ok = false; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 9c29b7c..f8a1c92 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,7 +169,7 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { TQImage image = pixmap.convertToImage(); @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - TQWidget *sv = pages.tqfind(nsp); + TQWidget *sv = pages.find(nsp); // Change visible page if (currentPage != sv) { @@ -352,7 +352,7 @@ namespace KSB_News { bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); - if (m_our_rsssources.tqfindIndex(key) == -1) + if (m_our_rsssources.findIndex(key) == -1) return false; else return true; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 97f24e3..d59413d 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -191,7 +191,7 @@ namespace KSB_News { if (NSPanel *nsp = getNSPanelByKey(key)) { newswidget->delStackTab(nsp); - delete nspanelptrlist.take(nspanelptrlist.tqfindRef(nsp)); + delete nspanelptrlist.take(nspanelptrlist.findRef(nsp)); } else kdWarning() << "removedSource called for non-existing id" << endl; diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index fb5d840..f76f0de 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -101,10 +101,10 @@ void UAChangerPlugin::parseDescFiles() TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.tqfind(TQFL1("C")); + TQStringList::Iterator it = languageList.find(TQFL1("C")); if( it != languageList.end() ) { - if( languageList.tqcontains( TQFL1("en") ) > 0 ) + if( languageList.contains( TQFL1("en") ) > 0 ) languageList.remove( it ); else (*it) = TQFL1("en"); @@ -124,14 +124,14 @@ void UAChangerPlugin::parseDescFiles() if ( (*it)->property("X-KDE-UA-DYNAMIC-ENTRY").toBool() ) { - tmp.tqreplace( TQFL1("appSysName"), TQFL1(utsn.sysname) ); - tmp.tqreplace( TQFL1("appSysRelease"), TQFL1(utsn.release) ); - tmp.tqreplace( TQFL1("appMachineType"), TQFL1(utsn.machine) ); - tmp.tqreplace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) ); - tmp.tqreplace( TQFL1("appPlatform"), TQFL1("X11") ); + tmp.replace( TQFL1("appSysName"), TQFL1(utsn.sysname) ); + tmp.replace( TQFL1("appSysRelease"), TQFL1(utsn.release) ); + tmp.replace( TQFL1("appMachineType"), TQFL1(utsn.machine) ); + tmp.replace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) ); + tmp.replace( TQFL1("appPlatform"), TQFL1("X11") ); } - if ( m_lstIdentity.tqcontains(tmp) ) + if ( m_lstIdentity.contains(tmp) ) continue; // Ignore dups! m_lstIdentity << tmp; diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 3ee1f91..6bd4fee 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -181,7 +181,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { KMessageBox::sorry( m_part->widget(), - i18n("<qt>The selected URL cannot be verified because it tqcontains " + i18n("<qt>The selected URL cannot be verified because it contains " "a password. Sending this URL to <b>%1</b> would put the security " "of <b>%2</b> at risk.</qt>") .tqarg(validatorUrl.host()).tqarg(partUrl.host())); diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 77ca40d..802b2fe 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas ((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") || ((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) { // Some people use carriage return in file names and browsers support that! - attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), "")); + attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), "")); } /* * ## Make recursion level configurable @@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext() TQString tarFileName; // Only download file once - if (m_downloadedURLDict.tqcontains(url.url())) { + if (m_downloadedURLDict.contains(url.url())) { tarFileName = m_downloadedURLDict[url.url()]; #ifdef DEBUG_WAR kdDebug(90110) << "File already downloaded: " << url.url() @@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName) kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl; #endif - while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(uniqueFileName)) + while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName)) uniqueFileName = TQString::number(id++) + fileName; return uniqueFileName; @@ -532,14 +532,14 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str int endUrl = 0; int length = string.length(); while (pos < length && pos >= 0) { - pos = str.tqfind("url(", pos); + pos = str.find("url(", pos); if (pos!=-1) { pos += 4; // url( if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature' pos++; startUrl = pos; - pos = str.tqfind(")",startUrl); + pos = str.find(")",startUrl); endUrl = pos; if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature' endUrl--; @@ -555,7 +555,7 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str kdDebug () << "url: " << url << endl; #endif - str = str.tqreplace(startUrl, endUrl-startUrl, url); + str = str.replace(startUrl, endUrl-startUrl, url); pos++; } } diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 280b0e2..0b6ed68 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -78,12 +78,12 @@ void PluginWebArchiver::slotSaveToArchive() // Replace space with underscore, proposed Frank Pieczynski <pieczy@knuut.de> - archiveName.tqreplace( "\\s:", " "); + archiveName.replace( "\\s:", " "); archiveName = archiveName.simplifyWhiteSpace(); - archiveName.tqreplace( "?", ""); - archiveName.tqreplace( ":", ""); - archiveName.tqreplace( "/", ""); - archiveName = archiveName.tqreplace( TQRegExp("\\s+"), "_"); + archiveName.replace( "?", ""); + archiveName.replace( ":", ""); + archiveName.replace( "/", ""); + archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; diff --git a/ksig/ksig.spec b/ksig/ksig.spec index 8844a6a..19d77a3 100644 --- a/ksig/ksig.spec +++ b/ksig/ksig.spec @@ -33,8 +33,8 @@ make -j$numprocs %install make prefix=$RPM_BUILD_ROOT%{prefix} install cd $RPM_BUILD_ROOT -tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list -tqfind . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list +find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list +find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list %clean #rm -rf $RPM_BUILD_ROOT diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp index d0aecdd..e2ef5ea 100644 --- a/ksig/siglistviewitem.cpp +++ b/ksig/siglistviewitem.cpp @@ -81,7 +81,7 @@ SigListViewItem::SigListViewItem(TQListView *tqparent, TQDomDocument document, T doc = document; element = signatureElement; nodeToText(element, elementText); - elementText.tqreplace(TQRegExp("\n$"), ""); + elementText.replace(TQRegExp("\n$"), ""); dirty = false; refreshText(); diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index e6b6c81..046ba17 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(TQPtrList<KFileItem> & items) return lastFile; } -bool Dub::Linear_Seq::tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file) +bool Dub::Linear_Seq::find(TQPtrList<KFileItem> & items, KFileItem* a_file) { // find file for (KFileItem *file=items.first(); file; file=items.next() ) @@ -192,7 +192,7 @@ KFileItem* Dub::Linear_Seq::next(TQPtrList<KFileItem> & items, assert(active_file); bool found = false; if (*active_file) { - if (tqfind(items, *active_file)) { + if (find(items, *active_file)) { KFileItem* next = items.next(); for (; next && !next->isFile(); next = items.next()) ; // find next file if (next && next->isFile()) @@ -219,7 +219,7 @@ KFileItem* Dub::Linear_Seq::prev(TQPtrList<KFileItem> & items, bool found = false; if (*active_file) { // locate current item - if (tqfind(items, *active_file)) { + if (find(items, *active_file)) { KFileItem* prev = items.prev(); for (; prev && !prev->isFile(); prev = items.prev()) ; // find prev file if (prev && prev->isFile()) { diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h index a114248..40c8fdc 100644 --- a/noatun-plugins/dub/dub/dub.h +++ b/noatun-plugins/dub/dub/dub.h @@ -111,7 +111,7 @@ private: KFileItem* last(TQPtrList<KFileItem> & items); KFileItem* next(TQPtrList<KFileItem> & items, KFileItem** active_file); KFileItem* prev(TQPtrList<KFileItem> & items, KFileItem** active_file); - bool tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file); + bool find(TQPtrList<KFileItem> & items, KFileItem* a_file); }; // sequencer that traverses current directory in view order diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp index db7a2f2..62d2e5c 100644 --- a/noatun-plugins/dub/dub/dubplaylistitem.cpp +++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp @@ -40,8 +40,8 @@ DubPlaylistItem::~DubPlaylistItem(){ TQString DubPlaylistItem::property(const TQString &key, const TQString &def) const { // kdDebug(90010) << "property " << key << endl; if (isProperty(key)) { - kdDebug(90010) << key << " -> " << property_map.tqfind(key).data() << endl; - return property_map.tqfind(key).data(); + kdDebug(90010) << key << " -> " << property_map.find(key).data() << endl; + return property_map.find(key).data(); } else return def; @@ -69,7 +69,7 @@ TQStringList DubPlaylistItem::properties() const { bool DubPlaylistItem::isProperty(const TQString &key) const { // kdDebug(90010) << "is property? " << key << endl; - return (property_map.tqfind(key) != property_map.end()); + return (property_map.find(key) != property_map.end()); } KURL DubPlaylistItem::url() const { diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 73f2685..7e92f48 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -52,8 +52,8 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor // make sure we're on the desktop if ( - !desktop.tqcontains(rect().topLeft()) - || !desktop.tqcontains(rect().bottomRight()) + !desktop.contains(rect().topLeft()) + || !desktop.contains(rect().bottomRight()) ) { move(at); diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp index 11694bc..1c75958 100644 --- a/noatun-plugins/luckytag/parsedmp3filename.cpp +++ b/noatun-plugins/luckytag/parsedmp3filename.cpp @@ -31,22 +31,22 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path) TQString fileName = url.fileName(false); m_directories = TQStringList::split("/", url.directory()); - if (fileName.startsWith("(") && fileName.tqcontains(")")) + if (fileName.startsWith("(") && fileName.contains(")")) { - m_artist = fileName.mid(1, fileName.tqfind(")") - 1); - m_title = fileName.right(fileName.length() - fileName.tqfind(")") - 1); + m_artist = fileName.mid(1, fileName.find(")") - 1); + m_title = fileName.right(fileName.length() - fileName.find(")") - 1); validateArtist(); } - else if (fileName.startsWith("[") && fileName.tqcontains("]")) + else if (fileName.startsWith("[") && fileName.contains("]")) { - m_artist = fileName.mid(1, fileName.tqfind("]") - 1); - m_title = fileName.right(fileName.length() - fileName.tqfind("]") - 1); + m_artist = fileName.mid(1, fileName.find("]") - 1); + m_title = fileName.right(fileName.length() - fileName.find("]") - 1); validateArtist(); } - else if (fileName.tqcontains("-")) + else if (fileName.contains("-")) { - m_artist = fileName.left(fileName.tqfind("-") - 1); - m_title = fileName.right(fileName.length() - fileName.tqfind("-") - 1); + m_artist = fileName.left(fileName.find("-") - 1); + m_title = fileName.right(fileName.length() - fileName.find("-") - 1); validateArtist(); } else @@ -56,10 +56,10 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path) m_artist = m_directories[m_directories.count() - 2]; } - if (m_title.tqcontains("(") && m_title.tqfind(")", m_title.tqfind("("))) + if (m_title.contains("(") && m_title.find(")", m_title.find("("))) { - unsigned int start = m_title.tqfind("("); - unsigned int end = m_title.tqfind(")"); + unsigned int start = m_title.find("("); + unsigned int end = m_title.find(")"); m_comment = m_title.mid(start + 1, end - start - 1); m_title.truncate(start); } @@ -86,10 +86,10 @@ TQString ParsedMP3FileName::beautifyString(const TQString &s) temp[0] = temp[0].upper(); - unsigned int numSpaces = temp.tqcontains(" "); + unsigned int numSpaces = temp.contains(" "); unsigned int spacePos = 0; while (numSpaces > 0) { - spacePos = temp.tqfind(" ", spacePos == 0? 0 : spacePos + 1); + spacePos = temp.find(" ", spacePos == 0? 0 : spacePos + 1); temp[spacePos + 1] = temp[spacePos + 1].upper(); numSpaces--; } diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index f0c9ebd..91e49c1 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -32,7 +32,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) //(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection()); //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); - //(void)KStdAction::tqfind(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection()); + //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection()); attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); @@ -192,7 +192,7 @@ void Lyrics::viewLyrics(int index) int pos = props_regexp.search(url); while (pos >= 0) { TQString property = props_regexp.cap(1); - url.tqreplace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); + url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property)); pos = props_regexp.search(url); } TQString title(napp->player()->current().property("title")); @@ -213,7 +213,7 @@ void Lyrics::viewLyrics(int index) if (napp->player()->current().property("Lyrics::URL").isEmpty()) { /* Use the query one */ _url = url; - _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the query url" << endl; attach_act->setChecked(false); site_act->setEnabled(true); @@ -221,7 +221,7 @@ void Lyrics::viewLyrics(int index) htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); - _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+")); + _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); kdDebug(90020) << "I'm using the stored url" << endl; attach_act->setChecked(true); site_act->setEnabled(false); diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index d483a22..ae6952b 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -35,7 +35,7 @@ public: afterRenderer=after->mRenderer; list->lock(); - int pos=list->renderers().tqfindRef(afterRenderer); + int pos=list->renderers().findRef(afterRenderer); if (pos==-1) pos=list->renderers().count(); list->renderers().insert((uint)pos, mRenderer=nex->renderer(creator->text(0))); diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp index 81fa2c4..7027029 100644 --- a/noatun-plugins/noatunmadness/madness.cpp +++ b/noatun-plugins/noatunmadness/madness.cpp @@ -55,7 +55,7 @@ void Madness::update() for (; it != mWindowList.end(); ++it) { TQRect area=KWin::info(*it).frameGeometry; - if (!mOriginalPositions.tqcontains(*it)) + if (!mOriginalPositions.contains(*it)) mOriginalPositions.insert(*it, area.topLeft()); } } diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp index 6288f20..3cb5633 100644 --- a/noatun-plugins/oblique/base.cpp +++ b/noatun-plugins/oblique/base.cpp @@ -133,7 +133,7 @@ File Base::add(const TQString &file) return File(); } -File Base::tqfind(FileId id) +File Base::find(FileId id) { if (id == 0) return File(); @@ -155,7 +155,7 @@ void Base::clear() { for (FileId id = high(); id >= 1; id--) { - File f = tqfind(id); + File f = find(id); if (f) f.remove(); } @@ -171,7 +171,7 @@ File Base::first(FileId first) { if (first > high()) return File(); - while (!tqfind(first)) + while (!find(first)) { ++first; if (first > high()) @@ -183,8 +183,8 @@ File Base::first(FileId first) TQString Base::property(FileId id, const TQString &property) const { loadIntoCache(id); - if (!d->cachedProperties.tqcontains(property)) return TQString(); - TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property); + if (!d->cachedProperties.contains(property)) return TQString(); + TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property); return i.data(); } diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h index 948ec78..4652343 100644 --- a/noatun-plugins/oblique/base.h +++ b/noatun-plugins/oblique/base.h @@ -32,7 +32,7 @@ public: File add(const TQString &file); - File tqfind(FileId id); + File find(FileId id); void clear(); @@ -96,7 +96,7 @@ private: // friends for Slice private: /** - * load the xml that lives at the head of the db and tqcontains + * load the xml that lives at the head of the db and contains * potentially lots of structured data **/ void loadMetaXML(const TQString &xml); diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index 5df19b0..d97c21f 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -272,7 +272,7 @@ void SchemaConfig::save() TQString SchemaConfig::nameToFilename(const TQString &_name) { TQString name = _name; - name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_"); + name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_"); return name; } @@ -288,7 +288,7 @@ void SchemaConfig::newSchema() TQString filename = nameToFilename(str); - if (mQueries.tqcontains(nameToFilename(filename))) return; + if (mQueries.contains(nameToFilename(filename))) return; QueryItem queryitem; queryitem.query = Query(); @@ -312,7 +312,7 @@ void SchemaConfig::copySchema() TQString filename = nameToFilename(str); - if (mQueries.tqcontains(nameToFilename(filename))) return; + if (mQueries.contains(nameToFilename(filename))) return; QueryItem queryitem; queryitem.query = currentQuery()->query; @@ -621,7 +621,7 @@ void SliceConfig::addSibling() void SliceConfig::removeSelf() { SliceListItem *r = currentItem(); - if (mAddedItems.tqcontains(r)) + if (mAddedItems.contains(r)) { mAddedItems.remove(r); } diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp index fc92093..aacb765 100644 --- a/noatun-plugins/oblique/kdatacollection.cpp +++ b/noatun-plugins/oblique/kdatacollection.cpp @@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const { TQFileInfo fi(*i); TQString name = fi.fileName(); - if (!n.tqcontains(name)) + if (!n.contains(name)) { total.append(name); } @@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name) } TQStringList n = g.readListEntry(mEntry); - if (n.tqcontains(name)) return; + if (n.contains(name)) return; n.append(name); g.writeEntry(mEntry, n); } diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp index e297e2b..234833a 100644 --- a/noatun-plugins/oblique/oblique.cpp +++ b/noatun-plugins/oblique/oblique.cpp @@ -215,7 +215,7 @@ void Loader::loadItemsDeferred() return; } - File f = mBase->tqfind(mDeferredLoaderAt); + File f = mBase->find(mDeferredLoaderAt); if (f) { diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index 0727ca6..dd73d66 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const uint len=counter.cap(1).length()-1; // and half them, and remove one more - format.tqreplace(start-1, len/2+1, ""); + format.replace(start-1, len/2+1, ""); start=start-1+len/2+find.cap(1).length()+3; continue; } @@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const uint len=counter.cap(1).length(); // and half them - format.tqreplace(start, len/2, ""); + format.replace(start, len/2, ""); start=start+len/2; } @@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const if (propval.length()) { propval = prefix+propval+suffix; - format.tqreplace(start, i+2, propval); + format.replace(start, i+2, propval); start += propval.length(); } else { - format.tqreplace(start, i+2, ""); + format.replace(start, i+2, ""); } } return format; @@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename) // scourge elimination TQString data = doc.toString(); TQString old = data; - while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) + while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old) { old = data; } diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp index 004cf91..f28c333 100644 --- a/noatun-plugins/oblique/selector.cpp +++ b/noatun-plugins/oblique/selector.cpp @@ -129,7 +129,7 @@ Item *SequentialSelector::current() void SequentialSelector::setCurrent(const Item &item) { - TreeItem *current = mTree->tqfind(item.itemFile()); + TreeItem *current = mTree->find(item.itemFile()); setCurrent(current); } @@ -210,7 +210,7 @@ Item *RandomSelector::current() void RandomSelector::setCurrent(const Item &item) { - setCurrent(mTree->tqfind(item.itemFile()), 0); + setCurrent(mTree->find(item.itemFile()), 0); } void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous) diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index a8aaf67..fdf210e 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -258,14 +258,14 @@ TQString TreeItem::presentation() const return text(0); } -TreeItem *TreeItem::tqfind(File item) +TreeItem *TreeItem::find(File item) { TreeItem *i = firstChild(); while (i) { if (i->file() == item) return i; - TreeItem *found = i->tqfind(item); + TreeItem *found = i->find(item); if (found and found->playable()) return found; i = i->nextSibling(); } @@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match) { if (match.length()) { - if (!text(0).tqcontains(match, false)) + if (!text(0).contains(match, false)) { setHidden(true); return false; @@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match) if (match.length()) { - visible = text(0).tqcontains(match, false); + visible = text(0).contains(match, false); } if (visible) @@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> & TreeItem *Tree::firstChild() { return static_cast<TreeItem*>(KListView::firstChild()); } -TreeItem *Tree::tqfind(File item) +TreeItem *Tree::find(File item) { TreeItem *i = firstChild(); @@ -543,7 +543,7 @@ TreeItem *Tree::tqfind(File item) { if (i->file() == item) return i; - TreeItem *found = i->tqfind(item); + TreeItem *found = i->find(item); if (found) return found; i = i->nextSibling(); @@ -551,19 +551,19 @@ TreeItem *Tree::tqfind(File item) return i; } -void Tree::insert(TreeItem *tqreplace, File file) +void Tree::insert(TreeItem *replace, File file) { - TreeItem *created = collate(tqreplace, file); - if (mCurrent == tqreplace) + TreeItem *created = collate(replace, file); + if (mCurrent == replace) { mCurrent = created; repaintItem(created); - if (isSelected(tqreplace)) + if (isSelected(replace)) setSelected(created, true); } - if (created != tqreplace) + if (created != replace) { - delete tqreplace; + delete replace; } } @@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f) void Tree::update(File file) { - if (TreeItem *item = tqfind(file)) + if (TreeItem *item = find(file)) { insert(item, file); } diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index af14f95..bdc557d 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -45,7 +45,7 @@ public: void setOpen(bool o); - TreeItem *tqfind(File item); + TreeItem *find(File item); bool playable() const; @@ -107,7 +107,7 @@ public: Tree(Oblique *oblique, TQWidget *tqparent=0); ~Tree(); TreeItem *firstChild(); - TreeItem *tqfind(File item); + TreeItem *find(File item); TreeItem *current() { return mCurrent; } Query *query() { return &mQuery; } Oblique *oblique() { return mOblique; } @@ -133,7 +133,7 @@ protected: void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme); public slots: - void insert(TreeItem *tqreplace, File file); + void insert(TreeItem *replace, File file); void insert(File file); void remove(File file); void update(File file); diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 4a617ee..b33b71d 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -82,7 +82,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) void SynaeScope::read(KProcess *, char *buf, int) { TQString num = TQString::tqfromLatin1(buf); - num = num.left(num.tqfind(TQRegExp("\\s"))); + num = num.left(num.find(TQRegExp("\\s"))); id = num.toInt(); embed->embed(id); } |