diff options
Diffstat (limited to 'parts/documentation')
-rw-r--r-- | parts/documentation/docglobalconfigwidget.cpp | 4 | ||||
-rw-r--r-- | parts/documentation/documentation_part.cpp | 4 | ||||
-rw-r--r-- | parts/documentation/find_documentation.cpp | 4 | ||||
-rw-r--r-- | parts/documentation/interfaces/kdevdocumentationplugin.cpp | 14 | ||||
-rw-r--r-- | parts/documentation/plugins/chm/docchmplugin.cpp | 4 | ||||
-rw-r--r-- | parts/documentation/plugins/devhelp/docdevhelpplugin.cpp | 4 | ||||
-rw-r--r-- | parts/documentation/protocols/chm/chm.cpp | 20 | ||||
-rw-r--r-- | parts/documentation/searchview.cpp | 6 | ||||
-rw-r--r-- | parts/documentation/tools/htdig/htdigindex.cpp | 4 |
9 files changed, 32 insertions, 32 deletions
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 3bcefe97..69908881 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -100,7 +100,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant - if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) + if ( kapp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels @@ -195,7 +195,7 @@ void DocGlobalConfigWidget::accept() for (TQStringList::const_iterator it2 = app.constBegin(); it2 != app.constEnd(); ++it2) { - if (!locs.tqcontains(*it2)) + if (!locs.contains(*it2)) locs.append(*it2); } } diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 0d22c07a..b17216d1 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -665,7 +665,7 @@ TQCString DocumentationPart::startAssistant() kdDebug() << dcopName.data() << endl; //@fixme: is there another way to wait for the remote object to be loaded - while (!KApplication::dcopClient()->remoteObjects(dcopName).tqcontains("KDevDocumentation")) + while (!KApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation")) usleep(500); } } @@ -675,7 +675,7 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant - if ( kapp->instanceName().tqfind("kdevassistant") != -1 ) + if ( kapp->instanceName().find("kdevassistant") != -1 ) { return false; } diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 60b0bce1..5e3b72f8 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -228,7 +228,7 @@ void FindDocumentation::searchInContents() catalogItem->load(); catalogItem->plugin()->setCatalogURL(catalogItem); } - if (it.current()->text(0).tqcontains(search_term->text(),false)) + if (it.current()->text(0).contains(search_term->text(),false)) { DocumentationItem* newitem = new DocumentationItem(DocumentationItem::Document, contents_item, it.current()->text(0) ); @@ -260,7 +260,7 @@ void FindDocumentation::searchInIndex() DocumentationItem* newitem = 0; while(item) { - if(!item->text().tqcontains(search_term->text(),false)) + if(!item->text().contains(search_term->text(),false)) break; IndexItem::List urls = item->urls(); diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 22c375d2..14a72900 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -462,7 +462,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL for (TQStringList::const_iterator it = deletedConfigurationItems.constBegin(); it != deletedConfigurationItems.constEnd(); ++it) { - if (namedCatalogs.tqcontains(*it)) + if (namedCatalogs.contains(*it)) delete namedCatalogs[*it]; } deletedConfigurationItems.clear(); @@ -472,15 +472,15 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL it != entryMap.end(); ++it) { config->setGroup("Locations"); - if (restrictions.tqcontains(it.key()) || (!catalogEnabled(it.key()))) + if (restrictions.contains(it.key()) || (!catalogEnabled(it.key()))) { - if (namedCatalogs.tqcontains(it.key())) + if (namedCatalogs.contains(it.key())) delete namedCatalogs[it.key()]; } else { kdDebug() << "updating 1" << endl; - if (!namedCatalogs.tqcontains(it.key())) //create catalog if it does not exist + if (!namedCatalogs.contains(it.key())) //create catalog if it does not exist { DocumentationCatalogItem * item = createCatalog(contents, it.key(), config->readPathEntry(it.key())); loadIndex(index, item); @@ -493,7 +493,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL clearCatalogIndex(namedCatalogs[it.key()]); } else if ( (indexEnabled(namedCatalogs[it.key()])) //index is requested in configuration but does not yet exist - && (!indexes.tqcontains(namedCatalogs[it.key()])) ) + && (!indexes.contains(namedCatalogs[it.key()])) ) { kdDebug() << " index requested " << endl; loadIndex(index, namedCatalogs[it.key()]); @@ -512,7 +512,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) for (TQMap<TQString, TQString>::const_iterator it = entryMap.begin(); it != entryMap.end(); ++it) { - if (namedCatalogs.tqcontains(it.key()) + if (namedCatalogs.contains(it.key()) && namedCatalogs[it.key()]->isProjectDocumentationItem()) continue; @@ -630,7 +630,7 @@ void IndexBox::removeIndexItem(IndexItemProto *item) if (items[text].count() == 0) { items.remove(text); - TQListBoxItem *item = tqfindItem(text, TQt::CaseSensitive | TQt::ExactMatch); + TQListBoxItem *item = findItem(text, TQt::CaseSensitive | TQt::ExactMatch); if (item) delete item; } diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index fb033a7f..83263fce 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -144,9 +144,9 @@ static TQString decodeHTML(const TQString& s) { while(pos > -1) { TQString found = rx.cap(0); if(found != " ") { - out.tqreplace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); + out.replace(pos, found.length(), static_cast<char>(rx.cap(1).toInt())); }else{ - out.tqreplace(pos, found.length(), " "); + out.replace(pos, found.length(), " "); } pos = rx.search(out, pos+1); } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index 79106157..21e450a6 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -240,7 +240,7 @@ void DocDevHelpPlugin::scanDevHelpDir(const TQString &path) void DocDevHelpPlugin::pushToScanStack(TQValueStack<TQString> &stack, const TQString &value) { - if ( (!value.isEmpty()) && (!stack.tqcontains(value)) ) + if ( (!value.isEmpty()) && (!stack.contains(value)) ) { stack << value; kdDebug() << "Devhelp scan stack: +: " << value << endl; @@ -330,7 +330,7 @@ void DocDevHelpPlugin::addTocSect(DocumentationItem *tqparent, TQDomElement chil TQString name = childEl.attribute("name"); TQString url = childEl.attribute("link"); - if (name.isEmpty() && url.tqcontains("ix")) + if (name.isEmpty() && url.contains("ix")) name = "Index"; DocumentationItem *item = new DocumentationItem( diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp index 6ae9b2e2..e40ad5a9 100644 --- a/parts/documentation/protocols/chm/chm.cpp +++ b/parts/documentation/protocols/chm/chm.cpp @@ -105,7 +105,7 @@ void ChmProtocol::get( const KURL& url ) } - if (m_dirMap.tqfind(path) == m_dirMap.end()) { + if (m_dirMap.find(path) == m_dirMap.end()) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } @@ -183,13 +183,13 @@ void ChmProtocol::get( const KURL& url ) int current = 0; int old = 0, pos = 0; parents.push(0); - while ((pos = s.tqfind(object, pos)) != -1) { + while ((pos = s.find(object, pos)) != -1) { if(htmlOutput) output += s.mid(old, pos - old); if(catalog) { TQRegExp ex("<UL>|</UL>", false); ex.setMinimal(true); TQString ms = s.mid(old, pos - old); int pos = 0; - while( (pos = ms.tqfind(ex, pos)) != -1) { + while( (pos = ms.find(ex, pos)) != -1) { if(ms.mid(pos, 4) == "<UL>") { parents.push(current); } else{ @@ -206,9 +206,9 @@ void ChmProtocol::get( const KURL& url ) old = pos; TQString obj = object.cap(1); TQString name, local; - if (obj.tqfind(nameParam) != -1) { + if (obj.find(nameParam) != -1) { name = nameParam.cap(1); - if (obj.tqfind(localParam) != -1) { + if (obj.find(localParam) != -1) { local = localParam.cap(1); //output += "<a href=\"" + local + "\">" + name + "</a>"; //added by lucida lucida@users.sf.net @@ -233,10 +233,10 @@ void ChmProtocol::get( const KURL& url ) if(htmlOutput) output += name; } } - if (obj.tqfind(mergeParam) != -1 && htmlOutput) { + if (obj.find(mergeParam) != -1 && htmlOutput) { TQString link = mergeParam.cap(1); - TQString href = link.left(link.tqfind("::")); - TQString path = m_chmFile.left(m_chmFile.tqfindRev("/") + 1); + TQString href = link.left(link.find("::")); + TQString path = m_chmFile.left(m_chmFile.findRev("/") + 1); //output += " (<a href=\"" + path + href + "\">link</a>)"; m_bIndex = 1; output += " (<a target=\"browse\" href=\"" + url.url() + path + href + "\">link</a>)"; @@ -301,7 +301,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) { //kdDebug() << "ChmProtocol::checkNewFile " << fullPath << endl; - fullPath = fullPath.tqreplace(TQRegExp("::"), ""); + fullPath = fullPath.replace(TQRegExp("::"), ""); // Are we already looking at that file ? if ( !m_chmFile.isEmpty() && fullPath.startsWith(m_chmFile) ) @@ -324,7 +324,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path ) fullPath += '/'; //kdDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); //kdDebug() << fullPath << " trying " << tryPath << endl; diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index a2d688ec..51700470 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -230,8 +230,8 @@ void SearchView::search() delete proc; // modify the search result - searchResult = searchResult.tqreplace(TQRegExp("http://localhost/"), "file:/"); - searchResult = searchResult.tqreplace(TQRegExp("Content-type: text/html"), ""); + searchResult = searchResult.replace(TQRegExp("http://localhost/"), "file:/"); + searchResult = searchResult.replace(TQRegExp("Content-type: text/html"), ""); // dump the search result TQFile f(savedir + "/results.html"); @@ -268,7 +268,7 @@ void SearchView::analyseSearchResults() TQRegExp starsExp("alt=\"\\*\""); starsExp.setMinimal(true); - int stars = line.tqcontains(starsExp); + int stars = line.contains(starsExp); TQRegExp urlExp("<strong><a href=\"(.*)\">(.*)</a></strong>"); if (urlExp.search(line)==-1) diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index d0146d0e..cec37b02 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -323,12 +323,12 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len) TQString line = TQString(buffer).left(len); int cnt=0, index=-1; - while ( (index = line.tqfind("http://", index+1)) > 0) + while ( (index = line.find("http://", index+1)) > 0) cnt++; filesDigged += cnt; cnt=0, index=-1; - while ( (index = line.tqfind("not changed", index+1)) > 0) + while ( (index = line.find("not changed", index+1)) > 0) cnt++; filesDigged -= cnt; |