From 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kio/bookmarks/dptrtemplate.h | 4 +-- kio/bookmarks/kbookmark.h | 4 +-- kio/bookmarks/kbookmarkimporter_crash.cc | 2 +- kio/bookmarks/kbookmarkimporter_kde1.cc | 2 +- kio/bookmarks/kbookmarkimporter_ns.cc | 12 +++---- kio/bookmarks/kbookmarkmenu.cc | 4 +-- kio/kfile/images.h | 2 +- kio/kfile/kacleditwidget.cpp | 8 ++--- kio/kfile/kdiroperator.cpp | 4 +-- kio/kfile/kdirselectdialog.cpp | 2 +- kio/kfile/kdiskfreesp.cpp | 22 ++++++------ kio/kfile/kfiledialog.cpp | 32 ++++++++--------- kio/kfile/kfilefiltercombo.cpp | 8 ++--- kio/kfile/kfileiconview.cpp | 6 ++-- kio/kfile/kfilemetapreview.cpp | 14 ++++---- kio/kfile/kfiletreebranch.cpp | 2 +- kio/kfile/kfiletreeview.cpp | 4 +-- kio/kfile/kicondialog.cpp | 2 +- kio/kfile/kmetaprops.cpp | 2 +- kio/kfile/knotifydialog.cpp | 10 +++--- kio/kfile/kopenwith.cpp | 14 ++++---- kio/kfile/kpreviewwidgetbase.h | 2 +- kio/kfile/kpropertiesdialog.cpp | 28 +++++++-------- kio/kfile/kurlcombobox.cpp | 2 +- kio/kio/authinfo.cpp | 2 +- kio/kio/dataprotocol.cpp | 2 +- kio/kio/global.cpp | 4 +-- kio/kio/global.h | 2 +- kio/kio/job.cpp | 28 +++++++-------- kio/kio/kacl.cpp | 4 +-- kio/kio/kar.cpp | 2 +- kio/kio/karchive.cpp | 8 ++--- kio/kio/kdatatool.cpp | 4 +-- kio/kio/kdirlister.cpp | 22 ++++++------ kio/kio/kdirwatch.cpp | 10 +++--- kio/kio/kfileitem.cpp | 6 ++-- kio/kio/kfilemetainfo.cpp | 60 ++++++++++++++++---------------- kio/kio/kfileshare.cpp | 6 ++-- kio/kio/kimageio.cpp | 4 +-- kio/kio/kmimemagic.cpp | 6 ++-- kio/kio/kmimetype.cpp | 6 ++-- kio/kio/kmimetypechooser.cpp | 8 ++--- kio/kio/knfsshare.cpp | 8 ++--- kio/kio/kprotocolmanager.cpp | 4 +-- kio/kio/krun.cpp | 16 ++++----- kio/kio/ksambashare.cpp | 4 +-- kio/kio/kservice.cpp | 36 +++++++++---------- kio/kio/kservicegroup.cpp | 6 ++-- kio/kio/kservicetype.cpp | 12 +++---- kio/kio/kservicetypefactory.cpp | 4 +-- kio/kio/kshellcompletion.cpp | 8 ++--- kio/kio/ktar.cpp | 4 +-- kio/kio/ktraderparsetree.cpp | 10 +++--- kio/kio/kurifilter.cpp | 2 +- kio/kio/kurlcompletion.cpp | 12 +++---- kio/kio/kuserprofile.cpp | 8 ++--- kio/kio/kzip.cpp | 4 +-- kio/kio/metainfojob.cpp | 2 +- kio/kio/netaccess.cpp | 8 ++--- kio/kio/passdlg.cpp | 2 +- kio/kio/previewjob.cpp | 14 ++++---- kio/kio/renamedlg.cpp | 4 +-- kio/kio/scheduler.cpp | 42 +++++++++++----------- kio/kio/sessiondata.cpp | 10 +++--- kio/kio/slavebase.cpp | 10 +++--- kio/kio/slaveconfig.cpp | 16 ++++----- kio/kio/tcpslavebase.cpp | 2 +- kio/kpasswdserver/kpasswdserver.cpp | 26 +++++++------- kio/kssl/kopenssl.cc | 2 +- kio/kssl/ksslcertificate.cc | 2 +- kio/kssl/ksslsettings.cc | 2 +- kio/kssl/ksslx509map.cc | 10 +++--- kio/misc/kdesasl/kdesasl.cpp | 8 ++--- kio/misc/kpac/discovery.cpp | 2 +- kio/misc/kpac/proxyscout.cpp | 4 +-- kio/misc/ksendbugmail/smtp.cpp | 12 +++---- kio/misc/kssld/kssld.cpp | 14 ++++---- kio/misc/kwalletd/ktimeout.cpp | 6 ++-- kio/misc/kwalletd/kwalletd.cpp | 56 ++++++++++++++--------------- kio/misc/uiserver.cpp | 6 ++-- kio/tests/dataprotocoltest.cpp | 2 +- kio/tests/kurlcompletiontest.cpp | 8 ++--- 82 files changed, 392 insertions(+), 392 deletions(-) (limited to 'kio') diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h index a34f021be..2a69d6a54 100644 --- a/kio/bookmarks/dptrtemplate.h +++ b/kio/bookmarks/dptrtemplate.h @@ -34,10 +34,10 @@ public: d_ptr = new TQPtrDict; qAddPostRoutine( cleanup_d_ptr ); } - PrivateData* ret = d_ptr->tqfind( (void*) instance ); + PrivateData* ret = d_ptr->find( (void*) instance ); if ( ! ret ) { ret = new PrivateData; - d_ptr->tqreplace( (void*) instance, ret ); + d_ptr->replace( (void*) instance, ret ); } return ret; } diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 0046eb689..84f177522 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -130,13 +130,13 @@ public: * @return address of parent */ static TQString parentAddress( const TQString & address ) - { return address.left( address.tqfindRev('/') ); } + { return address.left( address.findRev('/') ); } /** * @return position in parent (e.g. /4/5/2 -> 2) */ static uint positionInParent( const TQString & address ) - { return address.mid( address.tqfindRev('/') + 1 ).toInt(); } + { return address.mid( address.findRev('/') + 1 ).toInt(); } /** * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1) diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index 7e0831e83..988e1f673 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() int count = 0; for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) { - bool stillAlive = activeLogs.tqcontains( fi->absFilePath() ); + bool stillAlive = activeLogs.contains( fi->absFilePath() ); if ( !stillAlive ) crashFiles << fi->absFilePath(); } diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 79568be02..49999e675 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.cc +++ b/kio/bookmarks/kbookmarkimporter_kde1.cc @@ -48,7 +48,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & TQDir dir( _path ); TQString canonical = dir.canonicalPath(); - if ( m_lstParsedDirs.tqcontains(canonical) ) + if ( m_lstParsedDirs.contains(canonical) ) { kdWarning() << "Directory " << canonical << " already parsed" << endl; return; diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc index f7b438f78..e4e074107 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.cc +++ b/kio/bookmarks/kbookmarkimporter_ns.cc @@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse() TQCString t = s.stripWhiteSpace(); if(t.left(12).upper() == "

', secondQuotes+1); + int endTag = t.find('>', secondQuotes+1); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); if ( name.right(4) == "" ) name = name.left( name.length() - 4 ); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); @@ -79,9 +79,9 @@ void KNSBookmarkImporterImpl::parse() } } else if(t.left(7).upper() == "
', 7); + int endTag = t.find('>', 7); TQCString name = t.mid(endTag+1); - name = name.left(name.tqfindRev('<')); + name = name.left(name.findRev('<')); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); TQCString additionalInfo = t.mid( 8, endTag-8 ); bool folded = (additionalInfo.left(6) == "FOLDED"); diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index a4195409b..0c7965a16 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder() TQString title = i18n( "&New Bookmark Folder..." ); int p; - while ( ( p = title.tqfind( '&' ) ) >= 0 ) + while ( ( p = title.find( '&' ) ) >= 0 ) title.remove( p, 1 ); KAction * paNewFolder = new KAction( title, @@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n // make sure list includes type config.setGroup("Bookmarks"); - if (elist.tqcontains(id) < 1) { + if (elist.contains(id) < 1) { elist << id; config.writeEntry("DynamicMenus", elist); } diff --git a/kio/kfile/images.h b/kio/kfile/images.h index 62e42afeb..f544e2f0a 100644 --- a/kio/kfile/images.h +++ b/kio/kfile/images.h @@ -248,7 +248,7 @@ static struct EmbedImage { static const TQImage& qembed_findImage( const TQString& name ) { static TQDict dict; - TQImage* img = dict.tqfind( name ); + TQImage* img = dict.find( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 0e58aee6e..37b06da44 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups() m_groupsCombo->clear(); if ( m_defaultCB && m_defaultCB->isChecked() ) { m_usersCombo->insertStringList( m_defaultUsers ); - if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() ) + if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_defaultGroups ); - if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() ) + if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } else { m_usersCombo->insertStringList( m_users ); - if ( m_users.tqfind( oldUser ) != m_users.end() ) + if ( m_users.find( oldUser ) != m_users.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_groups ); - if ( m_groups.tqfind( oldGroup ) != m_groups.end() ) + if ( m_groups.find( oldGroup ) != m_groups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } } diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 6c38e5ef7..f84be90ea 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -590,7 +590,7 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT text = text.stripWhiteSpace(); // if the argument is no URL (the check is quite fragil) and it's // no absolute path, we add the current directory to get a correct url - if (text.tqfind(':') < 0 && text[0] != '/') + if (text.find(':') < 0 && text[0] != '/') text.insert(0, currUrl); // in case we have a selection defined and someone patched the file- @@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const { TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? - if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 ) + if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) return false; TQStringList mimeTypes = dir->mimeFilters(); diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index d33f7fadf..10238ad93 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) { while ( pos > 0 ) { - pos = path.tqfindRev( '/', pos -1 ); + pos = path.findRev( '/', pos -1 ); if ( pos >= 0 ) { dirToList.setPath( path.left( pos +1 ) ); diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 5fe26f696..2a2f6f0f2 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -109,7 +109,7 @@ void KDiskFreeSp::dfDone() if ( !s.isEmpty() ) { //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl; - if (s.tqfind(BLANK)<0) // devicename was too long, rest in next line + if (s.find(BLANK)<0) // devicename was too long, rest in next line if ( !t.eof() ) { // just appends the next line v=t.readLine(); s=s.append(v); @@ -119,30 +119,30 @@ void KDiskFreeSp::dfDone() //kdDebug(kfile_area) << "[" << s << "]" << endl; - //TQString deviceName = s.left(s.tqfind(BLANK)); - s=s.remove(0,s.tqfind(BLANK)+1 ); + //TQString deviceName = s.left(s.find(BLANK)); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) - s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type + s=s.remove(0,s.find(BLANK)+1 ); // eat fs type - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBSize = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBUsed = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; - u=s.left(s.tqfind(BLANK)); + u=s.left(s.find(BLANK)); unsigned long kBAvail = u.toULong(); - s=s.remove(0,s.tqfind(BLANK)+1 ); + s=s.remove(0,s.find(BLANK)+1 ); //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; - s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94% + s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 227bcffea..a1668693d 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text) void KFileDialog::setFilter(const TQString& filter) { - int pos = filter.tqfind('/'); + int pos = filter.find('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. @@ -219,7 +219,7 @@ void KFileDialog::setFilter(const TQString& filter) // escaped '/' characters. TQString copy (filter); - for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); ops->clearFilter(); @@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged() TQString filter = filterWidget->currentFilter(); ops->clearFilter(); - if ( filter.tqfind( '/' ) > -1 ) { + if ( filter.find( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); ops->setMimeFilter( types ); @@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url) } else { TQString filename = u.url(); - int sep = filename.tqfindRev('/'); + int sep = filename.findRev('/'); if (sep >= 0) { // there is a / in it if ( KProtocolInfo::supportsListing( u )) { KURL dir(u); @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename static const TQString &prot = KGlobal::staticQString(":/"); KURL u; - if ( d->filenames.tqfind( prot ) != -1 ) + if ( d->filenames.find( prot ) != -1 ) u = d->filenames; else u.setPath( d->filenames ); @@ -1504,7 +1504,7 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const KURL u( ops->url() ); TQString name; - int count = line.tqcontains( '"' ); + int count = line.contains( '"' ); if ( count == 0 ) { // no " " -> assume one single file u.setFileName( line ); if ( u.isValid() ) @@ -1526,8 +1526,8 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const int start = 0; int index1 = -1, index2 = -1; while ( true ) { - index1 = line.tqfind( '"', start ); - index2 = line.tqfind( '"', index1 + 1 ); + index1 = line.find( '"', start ); + index2 = line.find( '"', index1 + 1 ); if ( index1 < 0 ) break; @@ -1885,7 +1885,7 @@ static TQString getExtensionFromPatternList (const TQStringList &patternList) // *.JP? if ((*it).startsWith ("*.") && (*it).length () > 2 && - (*it).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0) + (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0) { ret = (*it).mid (1); break; @@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void) if (!filter.isEmpty ()) { // e.g. "*.cpp" - if (filter.tqfind ('/') < 0) + if (filter.find ('/') < 0) { d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower (); kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'" @@ -2056,10 +2056,10 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) KURL url = getCompleteURL (urlStr); kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl; - const int fileNameOffset = urlStr.tqfindRev ('/') + 1; + const int fileNameOffset = urlStr.findRev ('/') + 1; TQString fileName = urlStr.mid (fileNameOffset); - const int dot = fileName.tqfindRev ('.'); + const int dot = fileName.findRev ('.'); const int len = fileName.length (); if (dot > 0 && // has an extension already and it's not a hidden file // like ".hidden" (but we do accept ".hidden.ext") @@ -2115,7 +2115,7 @@ void KFileDialog::updateFilter () KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true); if (mime && mime->name() != KMimeType::defaultMimeType()) { if (filterWidget->currentFilter() != mime->name() && - filterWidget->filters.tqfindIndex(mime->name()) != -1) { + filterWidget->filters.findIndex(mime->name()) != -1) { filterWidget->setCurrentFilter(mime->name()); } } @@ -2135,7 +2135,7 @@ void KFileDialog::appendExtension (KURL &url) kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl; const int len = fileName.length (); - const int dot = fileName.tqfindRev ('.'); + const int dot = fileName.findRev ('.'); const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); @@ -2361,11 +2361,11 @@ void KFileDialog::setNonExtSelection() TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.tqat( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.tqat( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { - int lastDot = filename.tqfindRev( '.' ); + int lastDot = filename.findRev( '.' ); if ( lastDot > 0 ) locationEdit->lineEdit()->setSelection( 0, lastDot ); } diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index 117097c98..625321f1a 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -68,11 +68,11 @@ void KFileFilterCombo::setFilter(const TQString& filter) if (!filter.isEmpty()) { TQString tmp = filter; - int index = tmp.tqfind('\n'); + int index = tmp.find('\n'); while (index > 0) { filters.append(tmp.left(index)); tmp = tmp.mid(index + 1); - index = tmp.tqfind('\n'); + index = tmp.find('\n'); } filters.append(tmp); } @@ -82,7 +82,7 @@ void KFileFilterCombo::setFilter(const TQString& filter) TQStringList::ConstIterator it; TQStringList::ConstIterator end(filters.end()); for (it = filters.begin(); it != end; ++it) { - int tab = (*it).tqfind('|'); + int tab = (*it).find('|'); insertItem((tab < 0) ? *it : (*it).mid(tab + 1)); } @@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const } } - int tab = f.tqfind('|'); + int tab = f.find('|'); if (tab < 0) return f; else diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index c5c2ac697..7a176bcc6 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -866,7 +866,7 @@ void KFileIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast(findItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? d->dropItem = item; d->autoOpenTimer.start( autoOpenDelay() ); // restart timer @@ -889,7 +889,7 @@ void KFileIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast(findItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? if (d->dropItem != item) { @@ -921,7 +921,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e ) } e->acceptAction(); // Yes - KFileIconViewItem *item = dynamic_cast(tqfindItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast(findItem( contentsToViewport( e->pos() ) )); KFileItem * fileItem = 0; if (item) fileItem = item->fileInfo(); diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 676549a29..3c73387b4 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -62,7 +62,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT if ( mimeType == "inode/directory" ) return 0L; - KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType ); + KPreviewWidgetBase *provider = m_previewProviders.find( mimeType ); if ( provider ) return provider; @@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT } // with the new mimetypes from the audio-preview, try again - provider = m_previewProviders.tqfind( mimeType ); + provider = m_previewProviders.find( mimeType ); if ( provider ) return provider; // ### mimetype may be image/* for example, try that - int index = mimeType.tqfind( '/' ); + int index = mimeType.find( '/' ); if ( index > 0 ) { - provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" ); + provider = m_previewProviders.find( mimeType.left( index + 1 ) + "*" ); if ( provider ) return provider; } @@ -107,7 +107,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT TQString parentMimeType = mimeInfo->parentMimeType(); while ( !parentMimeType.isEmpty() ) { - provider = m_previewProviders.tqfind( parentMimeType ); + provider = m_previewProviders.find( parentMimeType ); if ( provider ) return provider; @@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT { if ( textProperty.toBool() ) { - provider = m_previewProviders.tqfind( "text/plain" ); + provider = m_previewProviders.find( "text/plain" ); if ( provider ) return provider; - provider = m_previewProviders.tqfind( "text/*" ); + provider = m_previewProviders.find( "text/*" ); if ( provider ) return provider; } diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp index 4f7539490..352bd875e 100644 --- a/kio/kfile/kfiletreebranch.cpp +++ b/kio/kfile/kfiletreebranch.cpp @@ -182,7 +182,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) if( !m_showExtensions && !currItem->isDir() ) /* Need to cut the extension */ { TQString name = currItem->text(); - int mPoint = name.tqfindRev( '.' ); + int mPoint = name.findRev( '.' ); if( mPoint > 0 ) name = name.left( mPoint ); newKFTVI->setText( 0, name ); diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index 14a365392..06bce2881 100644 --- a/kio/kfile/kfiletreeview.cpp +++ b/kio/kfile/kfiletreeview.cpp @@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches() bool KFileTreeView::removeBranch( KFileTreeBranch *branch ) { - if(m_branches.tqcontains(branch)) + if(m_branches.contains(branch)) { delete (branch->root()); m_branches.remove( branch ); @@ -558,7 +558,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) kdDebug(250) << "Stoping Animation !" << endl; - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); if ( it != m_mapCurrentOpeningFolders.end() ) { if( item->isDir() && isOpen( item) ) diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index ae83e880a..e600f2679 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -68,7 +68,7 @@ protected: public: IconPath(const TQString &ip) : TQString (ip) { - int n = tqfindRev('/'); + int n = findRev('/'); m_iconName = (n==-1) ? static_cast(*this) : mid(n+1); } diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index d3d3f7c41..38906bbd3 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -216,7 +216,7 @@ void KFileMetaPropsPlugin::createLayout() d->m_add->setEnabled(false); for (TQStringList::Iterator it = sk.begin(); it!=sk.end(); ++it) { - if ( l.tqfind(*it)==l.end() ) + if ( l.find(*it)==l.end() ) { d->m_add->setEnabled(true); kdDebug(250) << "**first addable key is " << (*it).latin1() << "**" <readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); - int index = path.tqfind( '/' ); + int index = path.find( '/' ); if ( index >= 0 ) m_appname = path.left( index ); else diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 8d79dadae..1822a0fc7 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -634,12 +634,12 @@ void KOpenWithDlg::slotOK() { TQString exec = serv->exec(); fullExec = exec; - exec.tqreplace("%u", "", false); - exec.tqreplace("%f", "", false); - exec.tqreplace("-caption %c", ""); - exec.tqreplace("-caption \"%c\"", ""); - exec.tqreplace("%i", ""); - exec.tqreplace("%m", ""); + exec.replace("%u", "", false); + exec.replace("%f", "", false); + exec.replace("-caption %c", ""); + exec.replace("-caption \"%c\"", ""); + exec.replace("%i", ""); + exec.replace("%m", ""); exec = exec.simplifyWhiteSpace(); if (exec == typedExec) { @@ -760,7 +760,7 @@ void KOpenWithDlg::slotOK() if (bRemember || d->saveNewApps) { TQStringList mimeList = desktop->readListEntry("MimeType", ';'); - if (!qServiceType.isEmpty() && !mimeList.tqcontains(qServiceType)) + if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType)) mimeList.append(qServiceType); desktop->writeEntry("MimeType", mimeList, ';'); diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index e8f2ca48c..05176964f 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -84,7 +84,7 @@ protected: private: class KPreviewWidgetBasePrivate; KPreviewWidgetBasePrivate * d() const { - return s_private->tqfind( const_cast( this ) ); + return s_private->find( const_cast( this ) ); } static TQPtrDict * s_private; }; diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index d953f830b..a3c1739ad 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -759,8 +759,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) { TQString path; if ( !m_bFromTemplate ) { - isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 ); - if ( properties->kurl().protocol().tqfind("device", 0, false)==0) + isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 ); + if ( properties->kurl().protocol().find("device", 0, false)==0) isDevice = true; // Extract the full name, but without file: for local files if ( isReallyLocal ) @@ -908,11 +908,11 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.tqfind('*',1)==-1) + if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = filename.tqfindRev('.'); + int lastDot = filename.findRev('.'); if (lastDot > 0) d->m_lined->setSelection(0, lastDot); } @@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType() #ifdef Q_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { - int pos = d->oldFileName.tqfindRev( '.' ); + int pos = d->oldFileName.findRev( '.' ); if ( pos != -1 ) mime = "*" + d->oldFileName.mid(pos); else @@ -1563,7 +1563,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQString path = properties->kurl().path(-1); TQString fname = properties->kurl().fileName(); bool isLocal = properties->kurl().isLocalFile(); - bool isTrash = ( properties->kurl().protocol().tqfind("trash", 0, false)==0 ); + bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 ); bool IamRoot = (geteuid() == 0); KFileItem * item = properties->item(); @@ -1805,11 +1805,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQString name = TQString::tqfromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); - if (groupList.tqfind(name) == groupList.end()) + if (groupList.find(name) == groupList.end()) groupList += name; } - bool isMyGroup = groupList.tqcontains(strGroup); + bool isMyGroup = groupList.contains(strGroup); /* add the group the file currently belongs to .. * .. if its not there already @@ -1843,7 +1843,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr { grpCombo = new TQComboBox(gb, "combogrouplist"); grpCombo->insertStringList(groupList); - grpCombo->setCurrentItem(groupList.tqfindIndex(strGroup)); + grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); connect( grpCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( changed() ) ); @@ -2945,7 +2945,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device->setEditText( deviceStr ); if ( !deviceStr.isEmpty() ) { // Set default options for this device (first matching entry) - int index = m_devicelist.tqfindIndex(deviceStr); + int index = m_devicelist.findIndex(deviceStr); if (index != -1) { //kdDebug(250) << "found it " << index << endl; @@ -3020,7 +3020,7 @@ void KDevicePropsPlugin::slotActivated( int index ) void KDevicePropsPlugin::slotDeviceChanged() { // Update mountpoint so that it matches the typed device - int index = m_devicelist.tqfindIndex( device->currentText() ); + int index = m_devicelist.findIndex( device->currentText() ); if ( index != -1 ) mountpoint->setText( d->mountpointlist[index] ); else @@ -3255,11 +3255,11 @@ void KDesktopPropsPlugin::slotAddFiletype() TQString mimetype = (*it)->name(); if (mimetype == KMimeType::defaultMimeType()) continue; - int index = mimetype.tqfind("/"); + int index = mimetype.find("/"); TQString maj = mimetype.left(index); TQString min = mimetype.mid(index+1); - TQMapIterator mit = majorMap.tqfind( maj ); + TQMapIterator mit = majorMap.find( maj ); if ( mit == majorMap.end() ) { majorGroup = new TQListViewItem( mw->listView, maj ); majorGroup->setExpandable(true); @@ -3274,7 +3274,7 @@ void KDesktopPropsPlugin::slotAddFiletype() TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment()); item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small))); } - TQMapIterator mit = majorMap.tqfind( "all" ); + TQMapIterator mit = majorMap.find( "all" ); if ( mit != majorMap.end()) { mw->listView->setCurrentItem(mit.data()); diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 0449795f5..d772cf431 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -152,7 +152,7 @@ void KURLComboBox::setURLs( TQStringList urls, OverLoadResolving remove ) // kill duplicates TQString text; while ( it != urls.end() ) { - while ( urls.tqcontains( *it ) > 1 ) { + while ( urls.contains( *it ) > 1 ) { it = urls.remove( it ); continue; } diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp index 318e99277..b2449f79f 100644 --- a/kio/kio/authinfo.cpp +++ b/kio/kio/authinfo.cpp @@ -146,7 +146,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, return false; } - if ( !loginMap.tqcontains( type ) ) + if ( !loginMap.contains( type ) ) return false; LoginList l = loginMap[type]; diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp index bcbd3191e..35bed5235 100644 --- a/kio/kio/dataprotocol.cpp +++ b/kio/kio/dataprotocol.cpp @@ -190,7 +190,7 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) { int raw_url_len = (int)raw_url.length(); // jump over scheme part (must be "data:", we don't even check that) - header_info.data_offset = raw_url.tqfind(':'); + header_info.data_offset = raw_url.find(':'); header_info.data_offset++; // jump over colon or to begin if scheme was missing // read mime type diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 6cf30c505..9c0ae5e81 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -167,12 +167,12 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) TQString str( _str ); int i = 0; - while ( ( i = str.tqfind( "%", i ) ) != -1 ) + while ( ( i = str.find( "%", i ) ) != -1 ) { str.replace( i, 1, "%%"); i += 2; } - while ( ( i = str.tqfind( "/" ) ) != -1 ) + while ( ( i = str.find( "/" ) ) != -1 ) str.replace( i, 1, "%2f"); return str; } diff --git a/kio/kio/global.h b/kio/kio/global.h index ea42f3e1d..03fb61dcc 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -536,7 +536,7 @@ public: it != metaData.end(); ++it) { - tqreplace(it.key(), it.data()); + replace(it.key(), it.data()); } return *this; } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index 867d4004f..411604aba 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -392,7 +392,7 @@ MetaData Job::metaData() const TQString Job::queryMetaData(const TQString &key) { - if (!m_incomingMetaData.tqcontains(key)) + if (!m_incomingMetaData.contains(key)) return TQString::null; return m_incomingMetaData[key]; } @@ -821,8 +821,8 @@ StatJob::StatJob( const KURL& url, int command, void StatJob::start(Slave *slave) { - m_outgoingMetaData.tqreplace( "statSide", m_bSource ? "source" : "dest" ); - m_outgoingMetaData.tqreplace( "details", TQString::number(m_details) ); + m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); + m_outgoingMetaData.replace( "details", TQString::number(m_details) ); connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ), TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) ); @@ -946,7 +946,7 @@ void TransferJob::slotRedirection( const KURL &url) // Some websites keep redirecting to themselves where each redirection // acts as the stage in a state-machine. We define "endless redirections" // as 5 redirections to the same URL. - if (m_redirectionList.tqcontains(url) > 5) + if (m_redirectionList.contains(url) > 5) { kdDebug(7007) << "TransferJob::slotRedirection: CYCLIC REDIRECTION!" << endl; m_error = ERR_CYCLIC_LINK; @@ -1328,7 +1328,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool for( TQValueList< int >::ConstIterator it = overriden_ports->begin(); it != overriden_ports->end(); ++it ) - if( overriden_ports->tqcontains( url.port())) + if( overriden_ports->contains( url.port())) _error = 0; } @@ -2571,11 +2571,11 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) KProtocolInfo::fileNameUsedForCopying( url ) == KProtocolInfo::FromURL ) { //destFileName = url.fileName(); // Doesn't work for recursive listing // Count the number of prefixes used by the recursive listjob - int numberOfSlashes = displayName.tqcontains( '/' ); // don't make this a find()! + int numberOfSlashes = displayName.contains( '/' ); // don't make this a find()! TQString path = url.path(); int pos = 0; for ( int n = 0; n < numberOfSlashes + 1; ++n ) { - pos = path.tqfindRev( '/', pos - 1 ); + pos = path.findRev( '/', pos - 1 ); if ( pos == -1 ) { // error kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl; break; @@ -2789,7 +2789,7 @@ void CopyJob::skip( const KURL & sourceUrl ) // Check if this is one if toplevel sources // If yes, remove it from m_srcList, for a correct FilesRemoved() signal //kdDebug(7007) << "CopyJob::skip: looking for " << sourceUrl << endl; - KURL::List::Iterator sit = m_srcList.tqfind( sourceUrl ); + KURL::List::Iterator sit = m_srcList.find( sourceUrl ); if ( sit != m_srcList.end() ) { //kdDebug(7007) << "CopyJob::skip: removing " << sourceUrl << " from list" << endl; @@ -2967,7 +2967,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamedirit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.tqreplace( 0, oldPath.length(), newPath ); + n.replace( 0, oldPath.length(), newPath ); kdDebug(7007) << "dirs list: " << (*renamedirit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -2981,7 +2981,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamefileit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.tqreplace( 0, oldPath.length(), newPath ); + n.replace( 0, oldPath.length(), newPath ); kdDebug(7007) << "files list: " << (*renamefileit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -4305,7 +4305,7 @@ void DeleteJob::slotResult( Job *job ) { // Add toplevel dir in list of dirs dirs.append( url ); - if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.path(-1) ) ) + if ( url.isLocalFile() && !m_parentDirs.contains( url.path(-1) ) ) m_parentDirs.append( url.path(-1) ); if ( !KProtocolInfo::canDeleteRecursive( url ) ) { @@ -4334,7 +4334,7 @@ void DeleteJob::slotResult( Job *job ) //kdDebug(7007) << " Target is a file" << endl; files.append( url ); } - if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.directory(false) ) ) + if ( url.isLocalFile() && !m_parentDirs.contains( url.directory(false) ) ) m_parentDirs.append( url.directory(false) ); ++m_currentStat; statNextSrc(); @@ -4585,12 +4585,12 @@ TQString CacheInfo::cachedFileName() TQString CEF = m_url.path(); - int p = CEF.tqfind('/'); + int p = CEF.find('/'); while(p != -1) { CEF[p] = separator; - p = CEF.tqfind('/', p); + p = CEF.find('/', p); } TQString host = m_url.host().lower(); diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 5dd138b05..d05098102 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -619,7 +619,7 @@ TQString KACL::asString() const TQString KACL::KACLPrivate::getUserName( uid_t uid ) const { TQString *temp; - temp = m_usercache.tqfind( uid ); + temp = m_usercache.find( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); if ( user ) { @@ -637,7 +637,7 @@ TQString KACL::KACLPrivate::getUserName( uid_t uid ) const TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const { TQString *temp; - temp = m_groupcache.tqfind( gid ); + temp = m_groupcache.find( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index a68df7a85..376a748a4 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -140,7 +140,7 @@ bool KAr::openArchive( int mode ) return false; } name = &ar_longnames[name.mid(1, 15).toInt()]; - name = name.left(name.tqfind("/")); + name = name.left(name.find("/")); } } if (skip_entry) continue; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index 6eca7f2db..c5b9cad66 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -406,7 +406,7 @@ KArchiveDirectory * KArchive::findOrCreate( const TQString & path ) } // Otherwise go up and try again - int pos = path.tqfindRev( '/' ); + int pos = path.findRev( '/' ); KArchiveDirectory * parent; TQString dirname; if ( pos == -1 ) // no more slash => create in root dir @@ -548,13 +548,13 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) // not "const TQString & name" since we want a local copy // (to remove leading slash if any) { - int pos = name.tqfind( '/' ); + int pos = name.find( '/' ); if ( pos == 0 ) // ouch absolute path (see also KArchive::findOrCreate) { if (name.length()>1) { name = name.mid( 1 ); // remove leading slash - pos = name.tqfind( '/' ); // look again + pos = name.find( '/' ); // look again } else // "/" return this; @@ -563,7 +563,7 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) if ( pos != -1 && pos == (int)name.length()-1 ) { name = name.left( pos ); - pos = name.tqfind( '/' ); // look again + pos = name.find( '/' ); // look again } if ( pos != -1 ) { diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 9708234d1..339b95136 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -47,7 +47,7 @@ KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance m_service = service; m_instance = instance; - if ( !!m_service && !m_service->serviceTypes().tqcontains( "KDataTool" ) ) + if ( !!m_service && !m_service->serviceTypes().contains( "KDataTool" ) ) { kdDebug(30003) << "The service " << m_service->name().latin1() << " does not feature the service type KDataTool" << endl; @@ -196,7 +196,7 @@ TQValueList KDataToolInfo::query( const TQString& datatype, const { // Temporary replacement for the non-working trader query above if ( !instance || !(*it)->property("ExcludeFrom").toStringList() - .tqcontains( instance->instanceName() ) ) + .contains( instance->instanceName() ) ) lst.append( KDataToolInfo( *it, instance ) ); else kdDebug() << (*it)->entryPath() << " excluded." << endl; diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 749c80b03..652101310 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -113,7 +113,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, lister->d->rootFileItem = 0; } - else if ( lister->d->lstDirs.tqfind( _url ) != lister->d->lstDirs.end() ) + else if ( lister->d->lstDirs.find( _url ) != lister->d->lstDirs.end() ) { // stop the job listing _url for this lister stop( lister, _url ); @@ -311,7 +311,7 @@ void KDirListerCache::stop( KDirLister *lister ) TQPtrList *listers; while ( (listers = it.current()) ) { - if ( listers->tqfindRef( lister ) > -1 ) + if ( listers->findRef( lister ) > -1 ) { // lister is listing url TQString url = it.currentKey(); @@ -457,7 +457,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // that itemsInUse doesn't. When emitting the canceled signals lstDirs must // not contain anything that itemsInUse does not contain. (otherwise it // might crash in findByName()). - lister->d->lstDirs.remove( lister->d->lstDirs.tqfind( url ) ); + lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) ); DirItem *item = itemsInUse[urlStr]; @@ -670,7 +670,7 @@ KFileItem *KDirListerCache::findByURL( const KDirLister *lister, const KURL& _u parentDir.setPath( parentDir.directory() ); // If lister is set, check that it contains this dir - if ( lister && !lister->d->lstDirs.tqcontains( parentDir ) ) + if ( lister && !lister->d->lstDirs.contains( parentDir ) ) return 0L; KFileItemList *itemList = itemsForDir( parentDir ); @@ -760,7 +760,7 @@ void KDirListerCache::FilesChanged( const KURL::List &fileList ) // Let's update the dir. KURL dir( *it ); dir.setPath( dir.directory( true ) ); - if ( dirsToUpdate.tqfind( dir ) == dirsToUpdate.end() ) + if ( dirsToUpdate.find( dir ) == dirsToUpdate.end() ) dirsToUpdate.prepend( dir ); } } @@ -1110,7 +1110,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; + *kdl->d->lstDirs.find( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1147,7 +1147,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; + *kdl->d->lstDirs.find( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1429,7 +1429,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url ) // And notify the dirlisters of the redirection for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() ) { - *kdl->d->lstDirs.tqfind( oldUrl ) = url; + *kdl->d->lstDirs.find( oldUrl ) = url; if ( kdl->d->lstDirs.count() == 1 ) emit kdl->redirection( url ); @@ -1478,7 +1478,7 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) if ( listers ) for ( kdl = tmpLst->first(); kdl; kdl = tmpLst->next() ) { - Q_ASSERT( listers->tqcontainsRef( kdl ) == 0 ); + Q_ASSERT( listers->containsRef( kdl ) == 0 ); listers->append( kdl ); } else @@ -2095,8 +2095,8 @@ void KDirLister::setMimeFilter( const TQStringList& mimeFilter ) if ( !(d->changes & MIME_FILTER) ) d->oldMimeFilter = d->mimeFilter; - if ( mimeFilter.tqfind("all/allfiles") != mimeFilter.end() || - mimeFilter.tqfind("all/all") != mimeFilter.end() ) + if ( mimeFilter.find("all/allfiles") != mimeFilter.end() || + mimeFilter.find("all/all") != mimeFilter.end() ) d->mimeFilter.clear(); else d->mimeFilter = mimeFilter; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index c9418ef9d..cd32440b5 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -135,7 +135,7 @@ void KDirWatchPrivate::dnotify_handler(int, siginfo_t *si, void *) // (Richard Stevens, Advanced programming in the Unix Environment) int saved_errno = errno; - Entry* e = dwp_self->fd_Entry.tqfind(si->si_fd); + Entry* e = dwp_self->fd_Entry.find(si->si_fd); // kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path " // << TQString(e ? e->path:"unknown") << endl; @@ -551,7 +551,7 @@ KDirWatchPrivate::Entry* KDirWatchPrivate::entry(const TQString& _path) if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.tqfind( path ); + EntryMap::Iterator it = m_mapEntries.find( path ); if ( it == m_mapEntries.end() ) return 0; else @@ -684,7 +684,7 @@ bool KDirWatchPrivate::useDNotify(Entry* e) return false; } - fd_Entry.tqreplace(fd, e); + fd_Entry.replace(fd, e); e->dn_fd = fd; kdDebug(7001) << " Setup DNotify (fd " << fd @@ -782,7 +782,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.tqfind( path ); + EntryMap::Iterator it = m_mapEntries.find( path ); if ( it != m_mapEntries.end() ) { if (sub_entry) { @@ -923,7 +923,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, if (delayRemove) { // removeList is allowed to contain any entry at most once - if (removeList.tqfindRef(e)==-1) + if (removeList.findRef(e)==-1) removeList.append(e); // now e->isValid() is false return; diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 6574ba012..363ab2752 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -973,12 +973,12 @@ void KFileItem::setExtraData( const void *key, void *value ) if ( !key ) return; - m_extra.tqreplace( key, value ); + m_extra.replace( key, value ); } const void * KFileItem::extraData( const void *key ) const { - TQMapConstIterator it = m_extra.tqfind( key ); + TQMapConstIterator it = m_extra.find( key ); if ( it != m_extra.end() ) return it.data(); return 0L; @@ -986,7 +986,7 @@ const void * KFileItem::extraData( const void *key ) const void * KFileItem::extraData( const void *key ) { - TQMapIterator it = m_extra.tqfind( key ); + TQMapIterator it = m_extra.find( key ); if ( it != m_extra.end() ) return it.data(); return 0L; diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index ee79e72a2..3c85363c4 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -410,7 +410,7 @@ TQStringList KFileMetaInfo::preferredGroups() const // move all keys from the preferred groups that are in our list to a new list for ( pref = preferred.begin(); pref != preferred.end(); ++pref ) { - TQStringList::Iterator group = list.tqfind(*pref); + TQStringList::Iterator group = list.find(*pref); if ( group != list.end() ) { newlist.append( *group ); @@ -440,7 +440,7 @@ TQStringList KFileMetaInfo::preferredKeys() const KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const { - TQMapIterator it = d->groups.tqfind( key ); + TQMapIterator it = d->groups.find( key ); if ( it != d->groups.end() ) return it.data(); else @@ -450,8 +450,8 @@ KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const bool KFileMetaInfo::addGroup( const TQString& name ) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && - ! d->groups.tqcontains(name) ) + if ( d->mimeTypeInfo->supportedGroups().contains(name) && + ! d->groups.contains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); @@ -486,7 +486,7 @@ bool KFileMetaInfo::addGroup( const TQString& name ) bool KFileMetaInfo::removeGroup( const TQString& name ) { - TQMapIterator it = d->groups.tqfind(name); + TQMapIterator it = d->groups.find(name); if ( (it==d->groups.end()) || !((*it).attributes() & KFileMimeTypeInfo::Removable)) return false; @@ -608,7 +608,7 @@ bool KFileMetaInfo::contains(const TQString& key) const bool KFileMetaInfo::containsGroup(const TQString& key) const { - return groups().tqcontains(key); + return groups().contains(key); } KFileMetaInfoItem KFileMetaInfo::item( const TQString& key) const @@ -642,15 +642,15 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, // try the preferred groups first if ( !preferredGroup.isEmpty() ) { TQMapIterator it = - d->groups.tqfind( preferredGroup ); + d->groups.find( preferredGroup ); // try to create the preferred group, if necessary if ( it == d->groups.end() && createGroup ) { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( preferredGroup ); - if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) { + if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { if ( addGroup( preferredGroup ) ) - it = d->groups.tqfind( preferredGroup ); + it = d->groups.find( preferredGroup ); } } @@ -668,7 +668,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, TQStringList::ConstIterator groupIt = groups.begin(); for ( ; groupIt != groups.end(); ++groupIt ) { - TQMapIterator it = d->groups.tqfind( *groupIt ); + TQMapIterator it = d->groups.find( *groupIt ); if ( it != d->groups.end() ) { KFileMetaInfoGroup group = it.data(); @@ -680,7 +680,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( *groupIt ); - if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) + if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { if ( addGroup( *groupIt ) ) { @@ -717,8 +717,8 @@ KFileMetaInfoItem KFileMetaInfo::findEditableItem( KFileMetaInfoGroup& group, KFileMetaInfoGroup KFileMetaInfo::appendGroup(const TQString& name) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && - ! d->groups.tqcontains(name) ) + if ( d->mimeTypeInfo->supportedGroups().contains(name) && + ! d->groups.contains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); d->groups.insert(name, group); @@ -986,7 +986,7 @@ KFilePlugin* KFileMetaInfoProvider::loadAndRegisterPlugin( const TQString& mimeT first = false; } // Hopefully the above includes the mimetype we asked for! - if ( m_pendingMimetypeInfos.tqfind( mimeType ) == 0 ) + if ( m_pendingMimetypeInfos.find( mimeType ) == 0 ) kdWarning(7033) << plugin->className() << " was created for " << mimeType << " but doesn't call addMimeTypeInfo for it!" << endl; } m_pendingMimetypeInfos.clear(); @@ -1003,7 +1003,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt //kdDebug(7033) << "plugin() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.tqfind( protocol ); + CachedPluginInfo *cache = m_plugins.find( protocol ); if ( cache && cache->plugin ) { return cache->plugin; } @@ -1014,7 +1014,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt } } - CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); + CachedPluginInfo *cache = m_plugins.find( mimeType ); if ( cache ) { return cache->plugin; } @@ -1072,27 +1072,27 @@ const KFileMimeTypeInfo * KFileMetaInfoProvider::mimeTypeInfo( const TQString& m { //kdDebug(7033) << "mimeTypeInfo() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.tqfind( protocol ); + CachedPluginInfo *cache = m_plugins.find( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } if ( !cache ) { loadAndRegisterPlugin( TQString::null, protocol ); - cache = m_plugins.tqfind( protocol ); + cache = m_plugins.find( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } } } - CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); + CachedPluginInfo *cache = m_plugins.find( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } loadAndRegisterPlugin( mimeType, TQString::null ); - cache = m_plugins.tqfind( mimeType ); + cache = m_plugins.find( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } @@ -1103,7 +1103,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo( const TQString& mimeType ) { - KFileMimeTypeInfo *info = m_pendingMimetypeInfos.tqfind( mimeType ); + KFileMimeTypeInfo *info = m_pendingMimetypeInfos.find( mimeType ); Q_ASSERT( !info ); if ( !info ) { @@ -1129,7 +1129,7 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const const TQStringList mimeTypes = (*it)->serviceTypes(); TQStringList::ConstIterator it2 = mimeTypes.begin(); for ( ; it2 != mimeTypes.end(); ++it2 ) - if ( allMimeTypes.tqfind( *it2 ) == allMimeTypes.end() && + if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() && *it2 != kfilePlugin ) // also in serviceTypes() allMimeTypes.append( *it2 ); } @@ -1235,7 +1235,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const // move all keys from the preferred keys that are in our list to a new list for ( pref = begin; pref!=end; ++pref ) { - TQStringList::Iterator item = list.tqfind(*pref); + TQStringList::Iterator item = list.find(*pref); if ( item != list.end() ) { newlist.append( *item ); @@ -1288,12 +1288,12 @@ bool KFileMetaInfoGroup::supportsVariableKeys() const bool KFileMetaInfoGroup::contains( const TQString& key ) const { - return d->items.tqcontains(key); + return d->items.contains(key); } KFileMetaInfoItem KFileMetaInfoGroup::item( const TQString& key) const { - TQMapIterator it = d->items.tqfind( key ); + TQMapIterator it = d->items.find( key ); if ( it != d->items.end() ) return it.data(); @@ -1356,7 +1356,7 @@ void KFileMetaInfoGroup::deref() KFileMetaInfoItem KFileMetaInfoGroup::addItem( const TQString& key ) { assert(isValid()); - TQMapIterator it = d->items.tqfind( key ); + TQMapIterator it = d->items.find( key ); if ( it != d->items.end() ) return it.data(); @@ -1395,7 +1395,7 @@ bool KFileMetaInfoGroup::removeItem( const TQString& key ) return false; } - TQMapIterator it = d->items.tqfind(key); + TQMapIterator it = d->items.find(key); if ( it==d->items.end() ) { kdDebug(7033) << "trying to remove the non existant item " << key << "\n"; @@ -1482,7 +1482,7 @@ KFileMimeTypeInfo::~KFileMimeTypeInfo() const KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::groupInfo( const TQString& group ) const { - return m_groups.tqfind( group ); + return m_groups.find( group ); } KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::addGroupInfo( @@ -1523,7 +1523,7 @@ TQStringList KFileMimeTypeInfo::supportedKeys() const for ( ; it.current(); ++it ) { // need to nuke dupes TQStringList list = it.current()->supportedKeys(); for ( lit = list.begin(); lit != list.end(); ++lit ) { - if ( keys.tqfind( *lit ) == keys.end() ) + if ( keys.find( *lit ) == keys.end() ) keys.append( *lit ); } } @@ -1564,7 +1564,7 @@ KFileMimeTypeInfo::GroupInfo::~GroupInfo() const KFileMimeTypeInfo::ItemInfo * KFileMimeTypeInfo::GroupInfo::itemInfo( const TQString& key ) const { - ItemInfo* item = m_itemDict.tqfind( key ); + ItemInfo* item = m_itemDict.find( key ); // if we the item isn't found and variable keys are supported, we need to // return the default variable key iteminfo. diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 8fea509d7..62b5e6ddb 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -105,7 +105,7 @@ void KFileShare::readConfig() // static else { // check if current user is in fileshare group KUserGroup shareGroup(s_fileShareGroup); - if (shareGroup.users().tqfindIndex(KUser()) > -1 ) + if (shareGroup.users().findIndex(KUser()) > -1 ) s_authorization = Authorized; else s_authorization = UserNotAllowed; @@ -221,9 +221,9 @@ int KFileShare::isDirectoryShared( const TQString& _path ) if ( path[path.length()-1] != '/' ) path += '/'; //return s_shareList && s_shareList->contains( path ); - if( (*s_shareMap).tqcontains(path) && !((*s_shareMap)[path].isEmpty()) ) { + if( (*s_shareMap).contains(path) && !((*s_shareMap)[path].isEmpty()) ) { ret+=1; - if( (*s_shareMap)[path].tqfind("readwrite") != -1 ) + if( (*s_shareMap)[path].find("readwrite") != -1 ) ret+=2; } diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 87bbf6879..72cc13f1f 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -489,7 +489,7 @@ TQString KImageIO::type(const TQString& filename) { KImageIOFormatList *formatList = KImageIOFactory::self()->formatList; TQString suffix = filename; - int dot = suffix.tqfindRev('.'); + int dot = suffix.findRev('.'); if (dot >= 0) suffix = suffix.mid(dot + 1); @@ -500,7 +500,7 @@ TQString KImageIO::type(const TQString& filename) ++it ) { KImageIOFormat *format = (*it); - if (format->mSuffices.tqcontains(suffix)) + if (format->mSuffices.contains(suffix)) return format->mType; } } diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index f59ee9d10..09615d9a7 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -565,8 +565,8 @@ public: bool restoreAccessTime( const TQString & file ) const { - TQString dir = file.left( file.tqfindRev( '/' ) ); - bool res = tmpDirs.tqcontains( dir ); + TQString dir = file.left( file.findRev( '/' ) ); + bool res = tmpDirs.contains( dir ); //kdDebug(7018) << "restoreAccessTime " << file << " dir=" << dir << " result=" << res << endl; return res; } @@ -2270,7 +2270,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) else if ( tmp == "application/x-sharedlib" ) { - if ( _filename.tqfind( ".so" ) == -1 ) + if ( _filename.find( ".so" ) == -1 ) { tmp = "application/x-executable"; r->setMimeType( tmp ); diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index ab65c4c24..f62a7d2a8 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -632,9 +632,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const entries.append( ep->d_name ); if ( readdir( dp ) == 0 ) { // only three // check if we got "." ".." and ".directory" - isempty = entries.tqfind( "." ) != entries.end() && - entries.tqfind( ".." ) != entries.end() && - entries.tqfind( ".directory" ) != entries.end(); + isempty = entries.find( "." ) != entries.end() && + entries.find( ".." ) != entries.end() && + entries.find( ".directory" ) != entries.end(); } } if (!isempty && !strcmp(ep->d_name, ".directory")) diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index 7f041b722..f55b17caf 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -134,15 +134,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) for (; it != mimetypes.end(); ++it) { TQString mimetype = (*it)->name(); - int index = mimetype.tqfind("/"); + int index = mimetype.find("/"); TQString maj = mimetype.left(index); - if ( d->groups.count() && !d->groups.tqcontains( maj ) ) + if ( d->groups.count() && !d->groups.contains( maj ) ) continue; TQString min = mimetype.right(mimetype.length() - (index+1)); - TQMapIterator mit = groups.tqfind( maj ); + TQMapIterator mit = groups.find( maj ); if ( mit == groups.end() ) { groupItem = new TQListViewItem( d->lvMimeTypes, maj ); @@ -167,7 +167,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) if ( d->visuals & Patterns ) item->setText( cl, (*it)->patterns().join("; ") ); - if ( selMimeTypes.tqcontains(mimetype) ) + if ( selMimeTypes.contains(mimetype) ) { item->setOn( true ); groupItem->setOpen( true ); diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index faf7448ee..f0fdfce6d 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -123,7 +123,7 @@ bool KNFSSharePrivate::readExportsFile() { // Handle quotation marks if ( completeLine[0] == '"' ) { - int i = completeLine.tqfind('"',1); + int i = completeLine.find('"',1); if (i == -1) { kdError() << "KNFSShare: Parse error: Missing quotation mark: " << completeLine << endl; continue; @@ -131,9 +131,9 @@ bool KNFSSharePrivate::readExportsFile() { path = completeLine.mid(1,i-1); } else { // no quotation marks - int i = completeLine.tqfind(' '); + int i = completeLine.find(' '); if (i == -1) - i = completeLine.tqfind('\t'); + i = completeLine.find('\t'); if (i == -1) path = completeLine; @@ -180,7 +180,7 @@ bool KNFSShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.tqfind(fixedPath) != 0; + return d->sharedPaths.find(fixedPath) != 0; } TQStringList KNFSShare::sharedDirectories() const { diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index 8b333da07..40aa7b236 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -471,10 +471,10 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) if( modifiers.contains('l') ) { TQStringList languageList = KGlobal::locale()->languageList(); - TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else (*it) = TQString::tqfromLatin1("en"); diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 64932b2a3..133c686b9 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -391,7 +391,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List TQChar c = exec.tqunicode()[pos]; if (c != '\'' && c != '"') goto synerr; // what else can we do? after normal parsing the substs would be insecure - int pos2 = exec.tqfind( c, pos + 1 ) - 1; + int pos2 = exec.find( c, pos + 1 ) - 1; if (pos2 < 0) goto synerr; // quoting error memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); @@ -545,7 +545,7 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) if (!(*it).contains('=')) // Remove path if wanted - return removePath ? (*it).mid(TQString(*it).tqfindRev('/') + 1) : *it; + return removePath ? (*it).mid(TQString(*it).findRev('/') + 1) : *it; return TQString(); } @@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service { // compat mode: assume KIO if not set and it's a KDE app TQStringList categories = _service.property("Categories").toStringList(); - if (( categories.tqfind("TDE") != categories.end() ) && ( categories.tqfind("KDE") != categories.end() )) + if (( categories.find("TDE") != categories.end() ) && ( categories.find("KDE") != categories.end() )) supportedProtocols.append( "KIO" ); else { // if no KDE app, be a bit over-generic supportedProtocols.append( "http"); @@ -719,10 +719,10 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl; KURL::List urls( _urls ); - if ( supportedProtocols.tqfind( "KIO" ) == supportedProtocols.end() ) { + if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) { for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL url = *it; - bool supported = url.isLocalFile() || supportedProtocols.tqfind( url.protocol().lower() ) != supportedProtocols.end(); + bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end(); kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl; if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" ) { @@ -861,7 +861,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); TQString bin = binaryName( cmd, false ); - int pos = bin.tqfindRev( '/' ); + int pos = bin.findRev( '/' ); if (pos != -1) { proc->setWorkingDirectory( bin.mid(0, pos) ); } @@ -927,7 +927,7 @@ void KRun::init() if (m_strURL.url().startsWith("$(")) { // check for environment variables and make necessary translations TQString aValue = m_strURL.url(); - int nDollarPos = aValue.tqfind( '$' ); + int nDollarPos = aValue.find( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast(aValue.length())) { // there is at least one $ @@ -983,7 +983,7 @@ void KRun::init() aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.tqfind( '$', nDollarPos ); + nDollarPos = aValue.find( '$', nDollarPos ); } m_strURL = KURL(aValue); bypassErrorMessage = true; diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index 3eea9e145..08da8352c 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -144,7 +144,7 @@ bool KSambaSharePrivate::readSmbConf() { } // parameter - int i = completeLine.tqfind('='); + int i = completeLine.find('='); if (i>-1) { @@ -203,7 +203,7 @@ bool KSambaShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.tqfind(fixedPath) != 0; + return d->sharedPaths.find(fixedPath) != 0; } TQStringList KSambaShare::sharedDirectories() const { diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index 8581c362c..fb6deb27c 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -128,9 +128,9 @@ KService::init( KDesktopFile *config ) } // Try to make up a name. m_strName = entryPath(); - int i = m_strName.tqfindRev('/'); + int i = m_strName.findRev('/'); m_strName = m_strName.mid(i+1); - i = m_strName.tqfindRev('.'); + i = m_strName.findRev('.'); if (i != -1) m_strName = m_strName.left(i); } @@ -189,10 +189,10 @@ KService::init( KDesktopFile *config ) } TQString name = entryPath(); - int pos = name.tqfindRev('/'); + int pos = name.findRev('/'); if (pos != -1) name = name.mid(pos+1); - pos = name.tqfind('.'); + pos = name.find('.'); if (pos != -1) name = name.left(pos); @@ -200,7 +200,7 @@ KService::init( KDesktopFile *config ) if (kde4application && !m_strExec.startsWith("/")) { m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; } else if (config->readBoolEntry("X-KDE-SubstituteUID")) { - int space = m_strExec.tqfind(" "); + int space = m_strExec.find(" "); if (space==-1) m_strExec = KStandardDirs::findExe(m_strExec); else { @@ -253,7 +253,7 @@ KService::init( KDesktopFile *config ) m_lstServiceTypes += config->readListEntry( "MimeType", ';' ); entryMap.remove("MimeType"); - if ( m_strType == "Application" && !m_lstServiceTypes.tqcontains("Application") ) + if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") ) // Applications implement the service type "Application" ;-) m_lstServiceTypes += "Application"; @@ -572,7 +572,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const // Then we use a homebuild class based on KConfigBase to convert the TQString. // For some often used property types we do the conversion ourselves. - TQMap::ConstIterator it = m_mapProps.tqfind( _name ); + TQMap::ConstIterator it = m_mapProps.find( _name ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { //kdDebug(7012) << "Property not found " << _name << endl; @@ -684,7 +684,7 @@ KService::Ptr KService::serviceByStorageId( const TQString& _storageId ) return new KService(_storageId); TQString tmp = _storageId; - tmp = tmp.mid(tmp.tqfindRev('/')+1); // Strip dir + tmp = tmp.mid(tmp.findRev('/')+1); // Strip dir if (tmp.endsWith(".desktop")) tmp.truncate(tmp.length()-8); @@ -720,7 +720,7 @@ TQString KService::username() const { } bool KService::noDisplay() const { - TQMap::ConstIterator it = m_mapProps.tqfind( "NoDisplay" ); + TQMap::ConstIterator it = m_mapProps.find( "NoDisplay" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString().lower(); @@ -728,21 +728,21 @@ bool KService::noDisplay() const { return true; } - it = m_mapProps.tqfind( "OnlyShowIn" ); + it = m_mapProps.find( "OnlyShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if ((!aList.tqcontains("TDE")) && (!aList.tqcontains("KDE"))) + if ((!aList.contains("TDE")) && (!aList.contains("KDE"))) return true; } - it = m_mapProps.tqfind( "NotShowIn" ); + it = m_mapProps.find( "NotShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if ((aList.tqcontains("TDE")) || (aList.tqcontains("KDE"))) + if ((aList.contains("TDE")) || (aList.contains("KDE"))) return true; } @@ -758,7 +758,7 @@ TQString KService::untranslatedGenericName() const { } bool KService::SuSEunimportant() const { - TQMap::ConstIterator it = m_mapProps.tqfind( "X-SuSE-Unimportant" ); + TQMap::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return false; @@ -772,7 +772,7 @@ bool KService::SuSEunimportant() const { } TQString KService::parentApp() const { - TQMap::ConstIterator it = m_mapProps.tqfind( "X-KDE-ParentApp" ); + TQMap::ConstIterator it = m_mapProps.find( "X-KDE-ParentApp" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return TQString::null; @@ -783,8 +783,8 @@ TQString KService::parentApp() const { bool KService::allowMultipleFiles() const { // Can we pass multiple files on the command line or do we have to start the application for every single file ? - if ( m_strExec.tqfind( "%F" ) != -1 || m_strExec.tqfind( "%U" ) != -1 || - m_strExec.tqfind( "%N" ) != -1 || m_strExec.tqfind( "%D" ) != -1 ) + if ( m_strExec.find( "%F" ) != -1 || m_strExec.find( "%U" ) != -1 || + m_strExec.find( "%N" ) != -1 || m_strExec.find( "%D" ) != -1 ) return true; else return false; @@ -836,7 +836,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName else result = base + TQString("-%1.desktop").arg(i); - if (reservedMenuIds && reservedMenuIds->tqcontains(result)) + if (reservedMenuIds && reservedMenuIds->contains(result)) continue; // Lookup service by menu-id diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index 5efb23937..6758ca1c0 100644 --- a/kio/kio/kservicegroup.cpp +++ b/kio/kio/kservicegroup.cpp @@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp TQStringList tmpList; if (config.hasKey("OnlyShowIn")) { - if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))) + if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))) d->m_bNoDisplay = true; } if (config.hasKey("NotShowIn")) { - if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) || (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))) + if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE"))) d->m_bNoDisplay = true; } @@ -103,7 +103,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp m_strCaption = _relpath; if (m_strCaption.right(1) == "/") m_strCaption = m_strCaption.left(m_strCaption.length()-1); - int i = m_strCaption.tqfindRev('/'); + int i = m_strCaption.findRev('/'); if (i > 0) m_strCaption = m_strCaption.mid(i+1); } diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp index b8b4e4659..f11cb99b9 100644 --- a/kio/kio/kservicetype.cpp +++ b/kio/kio/kservicetype.cpp @@ -82,7 +82,7 @@ KServiceType::init( KDesktopFile *config) for( ; gIt != tmpList.end(); ++gIt ) { - if ( (*gIt).tqfind( "Property::" ) == 0 ) + if ( (*gIt).find( "Property::" ) == 0 ) { config->setGroup( *gIt ); TQVariant v = config->readPropertyEntry( "Value", @@ -95,7 +95,7 @@ KServiceType::init( KDesktopFile *config) gIt = tmpList.begin(); for( ; gIt != tmpList.end(); ++gIt ) { - if( (*gIt).tqfind( "PropertyDef::" ) == 0 ) + if( (*gIt).find( "PropertyDef::" ) == 0 ) { config->setGroup( *gIt ); m_mapPropDefs.insert( (*gIt).mid( 13 ), @@ -129,7 +129,7 @@ KServiceType::load( TQDataStream& _str ) _str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs >> b; m_bValid = b; - m_bDerived = m_mapProps.tqcontains("X-KDE-Derived"); + m_bDerived = m_mapProps.contains("X-KDE-Derived"); } void @@ -182,7 +182,7 @@ KServiceType::property( const TQString& _name ) const else if ( _name == "Comment" ) v = TQVariant( m_strComment ); else { - TQMap::ConstIterator it = m_mapProps.tqfind( _name ); + TQMap::ConstIterator it = m_mapProps.find( _name ); if ( it != m_mapProps.end() ) v = it.data(); } @@ -209,7 +209,7 @@ KServiceType::propertyNames() const TQVariant::Type KServiceType::propertyDef( const TQString& _name ) const { - TQMap::ConstIterator it = m_mapPropDefs.tqfind( _name ); + TQMap::ConstIterator it = m_mapPropDefs.find( _name ); if ( it == m_mapPropDefs.end() ) return TQVariant::Invalid; return it.data(); @@ -239,7 +239,7 @@ static void addUnique(KService::List &lst, TQDict &dict, const KServic for( ; it != newLst.end(); ++it ) { KService *service = static_cast(*it); - if (dict.tqfind(service->desktopEntryPath())) + if (dict.find(service->desktopEntryPath())) continue; dict.insert(service->desktopEntryPath(), service); lst.append(service); diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index cb0f66fa1..393526eff 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -102,7 +102,7 @@ TQVariant::Type KServiceTypeFactory::findPropertyTypeByName(const TQString &_nam assert (!KSycoca::self()->isBuilding()); - TQMapConstIterator it = m_propertyTypeDict.tqfind(_name); + TQMapConstIterator it = m_propertyTypeDict.find(_name); if (it != m_propertyTypeDict.end()) { return (TQVariant::Type)it.data(); } @@ -134,7 +134,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt TQ_INT32 right = nrOfEntries - 1; TQ_INT32 middle; // Extract extension - int lastDot = _filename.tqfindRev('.'); + int lastDot = _filename.findRev('.'); int ext_len = _filename.length() - lastDot - 1; if (lastDot != -1 && ext_len <= 4) // if no '.', skip the extension lookup { diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp index bd3c43be7..2fb67a31f 100644 --- a/kio/kio/kshellcompletion.cpp +++ b/kio/kio/kshellcompletion.cpp @@ -217,22 +217,22 @@ bool KShellCompletion::quoteText(TQString *text, bool force, bool skip_last) con int pos = 0; if ( !force ) { - pos = text->tqfind( m_word_break_char ); + pos = text->find( m_word_break_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_quote_char1 ); + pos = text->find( m_quote_char1 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_quote_char2 ); + pos = text->find( m_quote_char2 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->tqfind( m_escape_char ); + pos = text->find( m_escape_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index 7d646d8f3..a9bd1faca 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -385,7 +385,7 @@ bool KTar::openArchive( int mode ) name = name.left( name.length() - 1 ); } - int pos = name.tqfindRev( '/' ); + int pos = name.findRev( '/' ); if ( pos == -1 ) nm = name; else @@ -853,7 +853,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, if ( dirName.right(1) != "/" ) dirName += "/"; - if ( d->dirList.tqcontains( dirName ) ) + if ( d->dirList.contains( dirName ) ) return true; // already there char buffer[ 0x201 ]; diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp index 969599db6..711ec5356 100644 --- a/kio/kio/ktraderparsetree.cpp +++ b/kio/kio/ktraderparsetree.cpp @@ -415,7 +415,7 @@ bool ParseTreeMATCH::eval( ParseContext *_context ) const if ( c1.type != ParseContext::T_STRING || c2.type != ParseContext::T_STRING ) return false; - _context->b = ( c2.str.tqfind( c1.str ) != -1 ); + _context->b = ( c2.str.find( c1.str ) != -1 ); return true; } @@ -465,7 +465,7 @@ bool ParseTreeIN::eval( ParseContext *_context ) const if ( c1.type == ParseContext::T_STRING && c2.type == ParseContext::T_STR_SEQ ) { - _context->b = ( c2.strSeq.tqfind( c1.str ) != c2.strSeq.end() ); + _context->b = ( c2.strSeq.find( c1.str ) != c2.strSeq.end() ); return true; } @@ -535,7 +535,7 @@ bool ParseTreeMIN2::eval( ParseContext *_context ) const if ( !_context->initMaxima( m_strId ) ) return false; - TQMap::Iterator it = _context->maxima.tqfind( m_strId ); + TQMap::Iterator it = _context->maxima.find( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -568,7 +568,7 @@ bool ParseTreeMAX2::eval( ParseContext *_context ) const return false; // Find extrema - TQMap::Iterator it = _context->maxima.tqfind( m_strId ); + TQMap::Iterator it = _context->maxima.find( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -651,7 +651,7 @@ bool ParseContext::initMaxima( const TQString& _prop ) return false; // Did we cache the result ? - TQMap::Iterator it = maxima.tqfind( _prop ); + TQMap::Iterator it = maxima.find( _prop ); if ( it != maxima.end() ) return ( it.data().type == PreferencesMaxima::PM_DOUBLE || it.data().type == PreferencesMaxima::PM_INT ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index e4b885ce5..ab65e0c66 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -171,7 +171,7 @@ TQString KURIFilterData::iconName() case KURIFilterData::EXECUTABLE: { TQString exeName = m_pURI.url(); - exeName = exeName.mid( exeName.tqfindRev( '/' ) + 1 ); // strip path if given + exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given KService::Ptr service = KService::serviceByDesktopName( exeName ); if (service && service->icon() != TQString::tqfromLatin1( "unknown" )) m_strIconName = service->icon(); diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 85429a6db..e09ce2ed8 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -786,7 +786,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) while ( *env ) { TQString s = TQString::fromLocal8Bit( *env ); - int pos = s.tqfind('='); + int pos = s.find('='); if ( pos == -1 ) pos = s.length(); @@ -1407,7 +1407,7 @@ static bool expandEnv( TQString &text ) bool expanded = false; - while ( (pos = text.tqfind('$', pos)) != -1 ) { + while ( (pos = text.find('$', pos)) != -1 ) { // Skip escaped '$' // @@ -1419,8 +1419,8 @@ static bool expandEnv( TQString &text ) else { // Find the end of the variable = next '/' or ' ' // - int pos2 = text.tqfind( ' ', pos+1 ); - int pos_tmp = text.tqfind( '/', pos+1 ); + int pos2 = text.find( ' ', pos+1 ); + int pos_tmp = text.find( '/', pos+1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; @@ -1467,8 +1467,8 @@ static bool expandTilde(TQString &text) // Find the end of the user name = next '/' or ' ' // - int pos2 = text.tqfind( ' ', 1 ); - int pos_tmp = text.tqfind( '/', 1 ); + int pos2 = text.find( ' ', 1 ); + int pos_tmp = text.find( '/', 1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index 8fddf763d..b7ef68c76 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -165,7 +165,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers( const TQString& _ser if (_genericServiceType.isEmpty() /*no constraint*/ || (*it)->hasServiceType( _genericServiceType )) { // Check that we don't already have it ;) - if ( serviceList.tqfind( (*it)->desktopEntryPath() ) == serviceList.end() ) + if ( serviceList.find( (*it)->desktopEntryPath() ) == serviceList.end() ) { bool allow = (*it)->allowAsDefault(); KServiceOffer o( (*it), (*it)->initialPreferenceForMimeType(_servicetype), allow ); @@ -215,7 +215,7 @@ int KServiceTypeProfile::preference( const TQString& _service ) const KService::Ptr service = KService::serviceByName( _service ); if (!service) return 0; - TQMap::ConstIterator it = m_mapServices.tqfind( service->storageId() ); + TQMap::ConstIterator it = m_mapServices.find( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -233,7 +233,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const return false; // Look what the user says ... - TQMap::ConstIterator it = m_mapServices.tqfind( service->storageId() ); + TQMap::ConstIterator it = m_mapServices.find( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -270,7 +270,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers() const if ( m_strGenericServiceType.isEmpty() || (*it)->hasServiceType( m_strGenericServiceType ) ) { // Now look into the profile, to find this service's preference. - TQMap::ConstIterator it2 = m_mapServices.tqfind( (*it)->storageId() ); + TQMap::ConstIterator it2 = m_mapServices.find( (*it)->storageId() ); if( it2 != m_mapServices.end() ) { diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index 01d2dc4c9..ccc573697 100644 --- a/kio/kio/kzip.cpp +++ b/kio/kio/kzip.cpp @@ -736,7 +736,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; else Q_ASSERT(access & S_IFDIR); } - int pos = name.tqfindRev( '/' ); + int pos = name.findRev( '/' ); if ( pos == -1 ) entryName = name; else @@ -1133,7 +1133,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // Find or create parent dir KArchiveDirectory* parentDir = rootDir(); TQString fileName( name ); - int i = name.tqfindRev( '/' ); + int i = name.findRev( '/' ); if ( i != -1 ) { TQString dir = name.left( i ); diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 28bc23633..3998584e3 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -86,7 +86,7 @@ void MetaInfoJob::removeItem(const KFileItem* item) determineNextFile(); } - d->items.remove(d->items.tqfind(item)); + d->items.remove(d->items.find(item)); } void MetaInfoJob::determineNextFile() diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index 975a42c10..d32396a00 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -293,7 +293,7 @@ void NetAccess::removeTempFile(const TQString& name) { if (!tmpfiles) return; - if (tmpfiles->tqcontains(name)) + if (tmpfiles->contains(name)) { unlink(TQFile::encodeName(name)); tmpfiles->remove(name); @@ -403,7 +403,7 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman remoteTempFileName = tmpFile.name(); // only need the filename KTempFile adds some KDE specific dirs // that probably does not exist on the remote side - int pos = remoteTempFileName.tqfindRev('/'); + int pos = remoteTempFileName.findRev('/'); remoteTempFileName = "/tmp/fishexec_" + remoteTempFileName.mid(pos + 1); tempPathUrl.setPath( remoteTempFileName ); bJobOK = true; // success unless further error occurs @@ -465,13 +465,13 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* TQMetaObject *meta = job->tqmetaObject(); static const char dataSignal[] = "data(KIO::Job*,const TQByteArray&)"; - if ( meta->tqfindSignal( dataSignal ) != -1 ) { + if ( meta->findSignal( dataSignal ) != -1 ) { connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)"; - if ( meta->tqfindSignal( redirSignal ) != -1 ) { + if ( meta->findSignal( redirSignal ) != -1 ) { connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)), this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) ); } diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 1670e83bb..3b2a1058f 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -321,7 +321,7 @@ void PasswordDialog::setKnownLogins( const TQMap& knownLogin void PasswordDialog::slotActivated( const TQString& userName ) { - TQMap::ConstIterator it = d->knownLogins.tqfind( userName ); + TQMap::ConstIterator it = d->knownLogins.find( userName ); if ( it != d->knownLogins.end() ) setPassword( it.data() ); } diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 34735c26d..0fc13b4b2 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -163,7 +163,7 @@ void PreviewJob::startPreview() TQMap mimeMap; for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!d->enabledPlugins || d->enabledPlugins->tqcontains((*it)->desktopEntryName())) + if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName())) { TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) @@ -176,7 +176,7 @@ void PreviewJob::startPreview() { PreviewItem item; item.item = it.current(); - TQMap::ConstIterator plugin = mimeMap.tqfind(it.current()->mimetype()); + TQMap::ConstIterator plugin = mimeMap.find(it.current()->mimetype()); if (plugin == mimeMap.end() && (it.current()->mimetype() != "application/x-desktop") && (it.current()->mimetype() != "media/builtin-mydocuments") @@ -187,7 +187,7 @@ void PreviewJob::startPreview() && (it.current()->mimetype() != "media/builtin-webbrowser")) { TQString mimeType = it.current()->mimetype(); - plugin = mimeMap.tqfind(mimeType.replace(TQRegExp("/.*"), "/*")); + plugin = mimeMap.find(mimeType.replace(TQRegExp("/.*"), "/*")); if (plugin == mimeMap.end()) { @@ -196,7 +196,7 @@ void PreviewJob::startPreview() TQString parentMimeType = mimeInfo->parentMimeType(); while (!parentMimeType.isEmpty()) { - plugin = mimeMap.tqfind(parentMimeType); + plugin = mimeMap.find(parentMimeType); if (plugin != mimeMap.end()) break; KMimeType::Ptr parentMimeInfo = KMimeType::mimeType(parentMimeType); @@ -215,10 +215,10 @@ void PreviewJob::startPreview() { if (textProperty.toBool()) { - plugin = mimeMap.tqfind("text/plain"); + plugin = mimeMap.find("text/plain"); if (plugin == mimeMap.end()) { - plugin = mimeMap.tqfind( "text/*" ); + plugin = mimeMap.find( "text/*" ); } } } @@ -553,7 +553,7 @@ TQStringList PreviewJob::availablePlugins() TQStringList result; KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!result.tqcontains((*it)->desktopEntryName())) + if (!result.contains((*it)->desktopEntryName())) result.append((*it)->desktopEntryName()); return result; } diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index 2cc928692..8f1b2d087 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -440,13 +440,13 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName) TQString dotSuffix, suggestedName; TQString basename = oldName; - int index = basename.tqfind( '.' ); + int index = basename.find( '.' ); if ( index != -1 ) { dotSuffix = basename.mid( index ); basename.truncate( index ); } - int pos = basename.tqfindRev( '_' ); + int pos = basename.findRev( '_' ); if(pos != -1 ){ TQString tmp = basename.mid( pos+1 ); bool ok; diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 38e7d10d4..020bc62dd 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -110,7 +110,7 @@ class KIO::Scheduler::ProtocolInfoDict : public TQDictcheckOnHold = checkOnHold; checkOnHold = false; } - extraJobData->tqreplace(job, jobData); + extraJobData->replace(job, jobData); newJobs.append(job); slaveTimer.start(0, true); #ifndef NDEBUG @@ -217,7 +217,7 @@ void Scheduler::_doJob(SimpleJob *job) { void Scheduler::_scheduleJob(SimpleJob *job) { newJobs.removeRef(job); - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) { kdFatal(7006) << "BUG! _ScheduleJob(): No extraJobData for job!" << endl; @@ -237,7 +237,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { if ( !slave ) { // was not yet running (don't call this on a finished job!) - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) return; // I said: "Don't call this on a finished job!" @@ -249,7 +249,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { slave = slaveList->first(); for(; slave; slave = slaveList->next()) { - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list && list->removeRef(job)) break; // Job was found and removed. // Fall through to kill the slave as well! @@ -402,7 +402,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // kdDebug(7006) << "scheduler: job started " << job << endl; - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); setupSlave(slave, job->url(), jobData->protocol, jobData->proxy, newSlave); job->start(slave); @@ -414,7 +414,7 @@ bool Scheduler::startJobDirect() { debug_info(); SimpleJob *job = newJobs.take(0); - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) { kdFatal(7006) << "BUG! startjobDirect(): No extraJobData for job!" @@ -481,7 +481,7 @@ static Slave *searchIdleList(SlaveList *idleSlaves, const KURL &url, const TQStr Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) { Slave *slave = 0; - JobData *jobData = extraJobData->tqfind(job); + JobData *jobData = extraJobData->find(job); if (!jobData) { kdFatal(7006) << "BUG! findIdleSlave(): No extraJobData for job!" << endl; @@ -504,7 +504,7 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) if ( bCanReuse ) { KIO::MetaData outgoing = tJob->outgoingMetaData(); - TQString resume = (!outgoing.tqcontains("resume")) ? TQString() : outgoing["resume"]; + TQString resume = (!outgoing.contains("resume")) ? TQString() : outgoing["resume"]; kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl; bCanReuse = (resume.isEmpty() || resume == "0"); } @@ -582,11 +582,11 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) protInfo->activeSlaves.removeRef(slave); if (slave->isAlive()) { - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list) { assert(slave->isConnected()); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); if (!list->isEmpty()) coSlaveTimer.start(0, true); @@ -618,7 +618,7 @@ void Scheduler::slotSlaveDied(KIO::Slave *slave) urlOnHold = KURL(); } idleSlaves->removeRef(slave); - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); if (list) { // coSlave dies, kill jobs waiting in queue @@ -733,7 +733,7 @@ Scheduler::slotScheduleCoSlave() slave = nextSlave) { nextSlave = coIdleSlaves->next(); - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); assert(list); if (list && !list->isEmpty()) { @@ -741,7 +741,7 @@ Scheduler::slotScheduleCoSlave() coIdleSlaves->removeRef(slave); // kdDebug(7006) << "scheduler: job started " << job << endl; - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); KURL url =job->url(); TQString host = url.host(); @@ -775,7 +775,7 @@ Scheduler::slotSlaveConnected() disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); emit slaveConnected(slave); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); coSlaveTimer.start(0, true); } @@ -784,7 +784,7 @@ void Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg) { Slave *slave = (Slave *)sender(); - if (!slave->isConnected() || (coIdleSlaves->tqfind(slave) != -1)) + if (!slave->isConnected() || (coIdleSlaves->find(slave) != -1)) { // Only forward to application if slave is idle or still connecting. emit slaveError(slave, errorNr, errorMsg); @@ -805,7 +805,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - JobList *list = coSlaves.tqfind(slave); + JobList *list = coSlaves.find(slave); assert(list); if (!list) { @@ -814,7 +814,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - assert(list->tqcontains(job) == 0); + assert(list->contains(job) == 0); list->append(job); coSlaveTimer.start(0, true); // Start job on timer event @@ -837,7 +837,7 @@ Scheduler::_disconnectSlave(KIO::Slave *slave) } delete list; coIdleSlaves->removeRef(slave); - assert(!coIdleSlaves->tqcontains(slave)); + assert(!coIdleSlaves->contains(slave)); disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), @@ -866,7 +866,7 @@ Scheduler::_registerWindow(TQWidget *wid) return; TQObject *obj = TQT_TQOBJECT(wid); - if (!m_windowList.tqcontains(obj)) + if (!m_windowList.contains(obj)) { // We must store the window Id because by the time // the destroyed signal is emitted we can no longer @@ -890,7 +890,7 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (!obj) return; - TQMap::Iterator it = m_windowList.tqfind(obj); + TQMap::Iterator it = m_windowList.find(obj); if (it == m_windowList.end()) return; WId windowId = it.data(); diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 2381bde91..c94fe3b40 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -236,8 +236,8 @@ SessionData::~SessionData() void SessionData::configDataFor( MetaData &configData, const TQString &proto, const TQString & ) { - if ( (proto.tqfind("http", 0, false) == 0 ) || - (proto.tqfind("webdav", 0, false) == 0) ) + if ( (proto.find("http", 0, false) == 0 ) || + (proto.find("webdav", 0, false) == 0) ) { if (!d->initDone) reset(); @@ -273,15 +273,15 @@ void SessionData::reset() // Get language settings... TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); - TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); if ( it != languageList.end() ) { - if ( languageList.tqcontains( english ) > 0 ) + if ( languageList.contains( english ) > 0 ) languageList.remove( it ); else (*it) = english; } - if ( !languageList.tqcontains( english ) ) + if ( !languageList.contains( english ) ) languageList.append( english ); d->language = languageList.join( ", " ); diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index 187e82524..13e7c636f 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -360,23 +360,23 @@ void SlaveBase::disconnectSlave() void SlaveBase::setMetaData(const TQString &key, const TQString &value) { - mOutgoingMetaData.tqreplace(key, value); + mOutgoingMetaData.replace(key, value); } TQString SlaveBase::metaData(const TQString &key) const { - if (mIncomingMetaData.tqcontains(key)) + if (mIncomingMetaData.contains(key)) return mIncomingMetaData[key]; - if (d->configData.tqcontains(key)) + if (d->configData.contains(key)) return d->configData[key]; return TQString::null; } bool SlaveBase::hasMetaData(const TQString &key) const { - if (mIncomingMetaData.tqcontains(key)) + if (mIncomingMetaData.contains(key)) return true; - if (d->configData.tqcontains(key)) + if (d->configData.contains(key)) return true; return false; } diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index d9efdb6cc..fe888c99c 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -79,7 +79,7 @@ void SlaveConfigPrivate::readGlobalConfig() SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.tqfind(_protocol); + SlaveConfigProtocol *scp = protocol.find(_protocol); if (!scp) { TQString filename = KProtocolInfo::config(_protocol); @@ -94,7 +94,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.tqfind(_protocol); + SlaveConfigProtocol *scp = protocol.find(_protocol); if (!scp) scp = readProtocolConfig(_protocol); return scp; @@ -103,7 +103,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_pro void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigProtocol *scp, const TQString &host) { MetaData *metaData = new MetaData; - scp->host.tqreplace(host, metaData); + scp->host.replace(host, metaData); // Read stuff // Break host into domains @@ -119,7 +119,7 @@ void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigPro int pos = 0; do { - pos = host.tqfindRev('.', pos-1); + pos = host.findRev('.', pos-1); if (pos < 0) domain = host; @@ -178,11 +178,11 @@ void SlaveConfig::setConfigData(const TQString &protocol, const TQString &host, } else { - MetaData *hostConfig = scp->host.tqfind(host); + MetaData *hostConfig = scp->host.find(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); - hostConfig = scp->host.tqfind(host); + hostConfig = scp->host.find(host); assert(hostConfig); } *hostConfig += config; @@ -197,12 +197,12 @@ MetaData SlaveConfig::configData(const TQString &protocol, const TQString &host) config += scp->global; if (host.isEmpty()) return config; - MetaData *hostConfig = scp->host.tqfind(host); + MetaData *hostConfig = scp->host.find(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); emit configNeeded(protocol, host); - hostConfig = scp->host.tqfind(host); + hostConfig = scp->host.find(host); assert(hostConfig); } config += *hostConfig; diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 5547c4d23..78093577d 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -774,7 +774,7 @@ int TCPSlaveBase::verifyCertificate() } #endif if (!_IPmatchesCN && !d->militantSSL) { // force this if the user wants it - if (d->cc->getHostList(pc).tqcontains(ourHost)) { + if (d->cc->getHostList(pc).contains(ourHost)) { _IPmatchesCN = true; } } diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 858cad37b..06694dd72 100644 --- a/kio/kpasswdserver/kpasswdserver.cpp +++ b/kio/kpasswdserver/kpasswdserver.cpp @@ -115,12 +115,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K kdDebug(130) << "storeInWallet: walletKey=" << walletKey << " reading existing map" << endl; if ( wallet->readMap( walletKey, map ) == 0 ) { Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.tqfind( "login" ); + Map::ConstIterator it = map.find( "login" ); while ( it != end ) { if ( it.data() == info.username ) { break; // OK, overwrite this entry } - it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } // If no entry was found, create a new entry - entryNumber is set already. } @@ -148,17 +148,17 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const typedef TQMap Map; int entryNumber = 1; Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.tqfind( "login" ); + Map::ConstIterator it = map.find( "login" ); while ( it != end ) { //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl; - Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) ); + Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) ); if ( pwdIter != end ) { if ( it.data() == username ) password = pwdIter.data(); knownLogins.insert( it.data(), pwdIter.data() ); } - it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } //kdDebug(130) << knownLogins.count() << " known logins" << endl; @@ -541,7 +541,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i) const KPasswdServer::AuthInfo * KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) return 0; @@ -579,7 +579,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) void KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) return; @@ -606,7 +606,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info void KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled) { - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) { authList = new AuthInfoList; @@ -659,7 +659,7 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long else if (windowId && (current->expire != AuthInfo::expNever)) { current->expire = AuthInfo::expWindowClose; - if (!current->windowList.tqcontains(windowId)) + if (!current->windowList.contains(windowId)) current->windowList.append(windowId); } else if (current->expire == AuthInfo::expTime) @@ -670,13 +670,13 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long // Update mWindowIdList if (windowId) { - TQStringList *keysChanged = mWindowIdList.tqfind(windowId); + TQStringList *keysChanged = mWindowIdList.find(windowId); if (!keysChanged) { keysChanged = new TQStringList; mWindowIdList.insert(windowId, keysChanged); } - if (!keysChanged->tqcontains(key)) + if (!keysChanged->contains(key)) keysChanged->append(key); } } @@ -684,14 +684,14 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long void KPasswdServer::removeAuthForWindowId(long windowId) { - TQStringList *keysChanged = mWindowIdList.tqfind(windowId); + TQStringList *keysChanged = mWindowIdList.find(windowId); if (!keysChanged) return; for(TQStringList::ConstIterator it = keysChanged->begin(); it != keysChanged->end(); ++it) { TQString key = *it; - AuthInfoList *authList = m_authDict.tqfind(key); + AuthInfoList *authList = m_authDict.find(key); if (!authList) continue; diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index 79a36ba5f..70d36cd8e 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/kssl/kopenssl.cc @@ -245,7 +245,7 @@ static TQString findMostRecentLib(TQString dir, TQString name) uint s = filter.length()-1; for (TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString numberpart = (*it).mid(s); - uint endmaj = numberpart.tqfind('.'); + uint endmaj = numberpart.find('.'); if (endmaj == -1) continue; bool ok; diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 7971e57ba..7211e510f 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -243,7 +243,7 @@ TQString KSSLCertificate::getKDEKey() const { TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) { TQString rc; - int pos = k.tqfindRev('('); + int pos = k.findRev('('); if (pos != -1) { unsigned int len = k.length(); if (k.tqat(len-1) == ')') { diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index c060c6c7c..d9286433e 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -169,7 +169,7 @@ TQString KSSLSettings::getCipherList() { int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL); if (m_cfg->readBoolEntry(tcipher, bits >= 56)) { CipherNode *xx = new CipherNode(sc->name,bits); - if (!cipherList.tqcontains(xx)) + if (!cipherList.contains(xx)) cipherList.prepend(xx); else delete xx; diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc index 222d187cb..7896fdfcf 100644 --- a/kio/kssl/ksslx509map.cc +++ b/kio/kssl/ksslx509map.cc @@ -33,12 +33,12 @@ KSSLX509Map::~KSSLX509Map() { void KSSLX509Map::setValue(const TQString& key, const TQString& value) { - m_pairs.tqreplace(key, value); + m_pairs.replace(key, value); } TQString KSSLX509Map::getValue(const TQString& key) const { - if (!m_pairs.tqcontains(key)) { + if (!m_pairs.contains(key)) { return TQString::null; } @@ -63,7 +63,7 @@ unsigned int length = str.length(); for(head = 0, tail = 0; tail < length-1; head = tail+1) { TQString thisline; - tail = str.tqfind(tok, head); + tail = str.find(tok, head); if (tail > length) // last token - none at end tail = length; @@ -85,11 +85,11 @@ TQStringList vl = tokenizeBy(name, TQRegExp("/[A-Za-z]+="), false); for (TQStringList::Iterator j = vl.begin(); j != vl.end(); ++j) { TQStringList apair = tokenizeBy(*j, TQRegExp("="), false); - if (m_pairs.tqcontains(apair[0])) { + if (m_pairs.contains(apair[0])) { TQString oldValue = m_pairs[apair[0]]; oldValue += "\n"; oldValue += apair[1]; - m_pairs.tqreplace(apair[0], oldValue); + m_pairs.replace(apair[0], oldValue); } else { m_pairs.insert(apair[0], apair[1]); } diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp index e9bc75dc1..b547f7e6b 100644 --- a/kio/misc/kdesasl/kdesasl.cpp +++ b/kio/misc/kdesasl/kdesasl.cpp @@ -49,10 +49,10 @@ KDESasl::~KDESasl() { TQCString KDESasl::chooseMethod(const TQStrIList aMethods) { - if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; - else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5"; - else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN"; - else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN"; + if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; + else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5"; + else if (aMethods.contains("PLAIN")) mMethod = "PLAIN"; + else if (aMethods.contains("LOGIN")) mMethod = "LOGIN"; else mMethod = TQCString(); return mMethod; } diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 671c2a941..7a84958f7 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -126,7 +126,7 @@ namespace KPAC return; } - int dot = m_hostname.tqfind( '.' ); + int dot = m_hostname.find( '.' ); if ( dot >= 0 ) { m_hostname.remove( 0, dot + 1 ); // remove one domain level diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 48ff7ae84..5d8b008bf 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -162,9 +162,9 @@ namespace KPAC // this particular case, simply calling setProtocol() on // it trashes the whole URL. int len = proxyURL.protocol().length(); - if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len ) + if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len ) proxy.prepend("http://"); - BlackList::Iterator it = m_blackList.tqfind( proxy ); + BlackList::Iterator it = m_blackList.find( proxy ); if ( it == m_blackList.end() ) return proxy; else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes { diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp index ac3e7b74f..a9f69792d 100644 --- a/kio/misc/ksendbugmail/smtp.cpp +++ b/kio/misc/ksendbugmail/smtp.cpp @@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout) void SMTP::setSenderAddress(const TQString& sender) { senderAddress = sender; - int index = senderAddress.tqfind('<'); + int index = senderAddress.find('<'); if (index == -1) return; senderAddress = senderAddress.mid(index + 1); - index = senderAddress.tqfind('>'); + index = senderAddress.find('>'); if (index != -1) senderAddress = senderAddress.left(index); senderAddress = senderAddress.simplifyWhiteSpace(); while (1) { - index = senderAddress.tqfind(' '); + index = senderAddress.find(' '); if (index != -1) senderAddress = senderAddress.mid(index + 1); // take one side else break; } - index = senderAddress.tqfind('@'); + index = senderAddress.find('@'); if (index == -1) senderAddress.append("@localhost"); // won't go through without a local mail system @@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket) readBuffer[n] = '\0'; lineBuffer += readBuffer; - nl = lineBuffer.tqfind('\n'); + nl = lineBuffer.find('\n'); if(nl == -1) return; lastLine = lineBuffer.left(nl); @@ -249,7 +249,7 @@ void SMTP::processLine(TQString *line) int i, stat; TQString tmpstr; - i = line->tqfind(' '); + i = line->find(' '); tmpstr = line->left(i); if(i > 3) kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl; diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 79b5998d1..45d523d2e 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -572,7 +572,7 @@ KSSLCNode *node; return false; } - if (!node->hosts.tqcontains(host)) { + if (!node->hosts.contains(host)) { node->hosts << host; } @@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) { cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { TQString email = static_cast(*iter).lower(); - TQMap >::iterator it = skEmail.tqfind(email); + TQMap >::iterator it = skEmail.find(email); if (it == skEmail.end()) it = skEmail.insert(email, TQPtrVector()); TQPtrVector &elem = *it; - if (elem.tqfindRef(cert) == -1) { + if (elem.findRef(cert) == -1) { unsigned int n = 0; for(; n < elem.size(); n++) { if (!elem.tqat(n)) { @@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList mails; cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { - TQMap >::iterator it = skEmail.tqfind(static_cast(*iter).lower()); + TQMap >::iterator it = skEmail.find(static_cast(*iter).lower()); if (it == skEmail.end()) break; TQPtrVector &elem = *it; - int n = elem.tqfindRef(cert); + int n = elem.findRef(cert); if (n != -1) elem.remove(n); } @@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { TQStringList rc; - TQMap >::iterator it = skEmail.tqfind(email.lower()); + TQMap >::iterator it = skEmail.find(email.lower()); kdDebug() << "GETKDEKey " << email.latin1() << endl; @@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) { - TQMap::iterator iter = skMD5Digest.tqfind(key); + TQMap::iterator iter = skMD5Digest.find(key); kdDebug() << "Searching cert for " << key.latin1() << endl; diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp index d4c87bd28..c431ecf69 100644 --- a/kio/misc/kwalletd/ktimeout.cpp +++ b/kio/misc/kwalletd/ktimeout.cpp @@ -39,7 +39,7 @@ void KTimeout::clear() { void KTimeout::removeTimer(int id) { - TQTimer *t = _timers.tqfind(id); + TQTimer *t = _timers.find(id); if (t != 0L) { _timers.remove(id); // autodeletes } @@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) { void KTimeout::addTimer(int id, int timeout) { - if (_timers.tqfind(id) != 0L) { + if (_timers.find(id) != 0L) { return; } @@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) { void KTimeout::resetTimer(int id, int timeout) { - TQTimer *t = _timers.tqfind(id); + TQTimer *t = _timers.find(id); if (t) { t->changeInterval(timeout); } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index b2b27d363..0513305bd 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -121,7 +121,7 @@ int KWalletD::generateHandle() { // ASSUMPTION: RAND_MAX is fairly large. do { rc = rand(); - } while (_wallets.tqfind(rc) || rc == 0); + } while (_wallets.find(rc) || rc == 0); return rc; } @@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() { } int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) { - if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) { + if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) { // First use wizard KWalletWizard *wiz = new KWalletWizard(0); setupDialog( wiz, wId, appid, modal ); @@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool KApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); } } else { - if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { + if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { return -1; } _handles[appid].append(rc); - _wallets.tqfind(rc)->ref(); + _wallets.find(rc)->ref(); } return rc; @@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.tqcontains(thisApp)) { + if (!apps.contains(thisApp)) { apps += thisApp; _implicitAllowMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.tqcontains(thisApp)) { + if (!apps.contains(thisApp)) { apps += thisApp; _implicitDenyMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin return; } - w = _wallets.tqfind(handle); + w = _wallets.find(handle); reclose = true; } else { handle = it.currentKey(); @@ -710,14 +710,14 @@ int KWalletD::close(const TQString& wallet, bool force) { int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { if (w) { const TQString& wallet = w->walletName(); - assert(_passwords.tqcontains(wallet)); + assert(_passwords.contains(wallet)); if (w->refCount() == 0 || force) { invalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); - if (_passwords.tqcontains(wallet)) { + if (_passwords.contains(wallet)) { w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length())); _passwords[wallet].fill(0); _passwords.remove(wallet); @@ -735,14 +735,14 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int KWalletD::close(int handle, bool force) { TQCString appid = friendlyDCOPPeerName(); - KWallet::Backend *w = _wallets.tqfind(handle); + KWallet::Backend *w = _wallets.find(handle); bool contains = false; if (w) { // the handle is valid - if (_handles.tqcontains(appid)) { // we know this app - if (_handles[appid].tqcontains(handle)) { + if (_handles.contains(appid)) { // we know this app + if (_handles[appid].contains(handle)) { // the app owns this handle - _handles[appid].remove(_handles[appid].tqfind(handle)); + _handles[appid].remove(_handles[appid].find(handle)); contains = true; if (_handles[appid].isEmpty()) { _handles.remove(appid); @@ -759,7 +759,7 @@ int KWalletD::close(int handle, bool force) { if (force) { invalidateHandle(handle); } - if (_passwords.tqcontains(w->walletName())) { + if (_passwords.contains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); _passwords[w->walletName()].fill(0); _passwords.remove(w->walletName()); @@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) { return false; } - KWallet::Backend *rc = _wallets.tqfind(handle); + KWallet::Backend *rc = _wallets.find(handle); if (rc == 0 && ++_failed > 5) { _failed = 0; @@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke void KWalletD::slotAppUnregistered(const TQCString& app) { - if (_handles.tqcontains(app)) { + if (_handles.contains(app)) { TQValueList l = _handles[app]; for (TQValueList::Iterator i = l.begin(); i != l.end(); ++i) { _handles[app].remove(*i); - KWallet::Backend *w = _wallets.tqfind(*i); + KWallet::Backend *w = _wallets.find(*i); if (w && !_leaveOpen && 0 == w->deref()) { close(w->walletName(), true); } @@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { return 0L; } - KWallet::Backend *w = _wallets.tqfind(handle); + KWallet::Backend *w = _wallets.find(handle); if (w) { // the handle is valid - if (_handles.tqcontains(appid)) { // we know this app - if (_handles[appid].tqcontains(handle)) { + if (_handles.contains(appid)) { // we know this app + if (_handles[appid].contains(handle)) { // the app owns this handle _failed = 0; if (_closeIdle && _timeouts) { @@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const { ++it) { if (it.current()->walletName() == wallet) { for (TQMap >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) { - if (hit.data().tqcontains(it.currentKey())) { + if (hit.data().contains(it.currentKey())) { rc += hit.key(); } } @@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap it.current(); ++it) { if (it.current()->walletName() == wallet) { - if (_handles[application].tqcontains(it.currentKey())) { + if (_handles[application].contains(it.currentKey())) { _handles[application].remove(it.currentKey()); if (_handles[application].isEmpty()) { @@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const { bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) { - if (!wallets().tqcontains(wallet)) { + if (!wallets().contains(wallet)) { return true; } @@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) { - if (!wallets().tqcontains(wallet)) { + if (!wallets().contains(wallet)) { return true; } @@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) { - return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); + return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); } bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { - return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); + return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); } @@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() { if (!dc) { return ""; } - return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), ""); + return dc->senderId().replace(TQRegExp("-[0-9]+$"), ""); } void KWalletD::timedOut(int id) { - KWallet::Backend *w = _wallets.tqfind(id); + KWallet::Backend *w = _wallets.find(id); if (w) { closeWallet(w, id, true); } diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 2ce91feb3..bf8b606dc 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) { void ProgressItem::setInfoMessage( const TQString & msg ) { TQString plainTextMsg(msg); - plainTextMsg.tqreplace( TQRegExp( "" ), TQString() ); - plainTextMsg.tqreplace( TQRegExp( "" ), TQString() ); + plainTextMsg.replace( TQRegExp( "" ), TQString() ); + plainTextMsg.replace( TQRegExp( "" ), TQString() ); setText( ListProgress::TB_PROGRESS, plainTextMsg ); defaultProgress->slotInfoMessage( 0, msg ); @@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl; kid->setCertState(meta["ssl_cert_errors"]); - TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; + TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; kid->setup( x, ip, url, // the URL diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index 64167d9ea..0c8470a61 100644 --- a/kio/tests/dataprotocoltest.cpp +++ b/kio/tests/dataprotocoltest.cpp @@ -47,7 +47,7 @@ public: // meta_data[key] = value; // cout << "§ " << key << " = " << value << endl; TQString prefix = "Metadata[\""+key+"\"]: "; - KIO::MetaData::Iterator it = attributes_expected.tqfind(key); + KIO::MetaData::Iterator it = attributes_expected.find(key); if (it != attributes_expected.end()) { testStrings(prefix,it.data(),value); // remove key from map diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index 4750636b8..612dab558 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -96,8 +96,8 @@ void KURLCompletionTest::testLocalRelativePath() waitForCompletion(); TQStringList comp1all = m_completion->allMatches(); assert( comp1all.count() == 2 ); - assert( comp1all.tqfind( "file1" ) != comp1all.end() ); - assert( comp1all.tqfind( "file#a" ) != comp1all.end() ); + assert( comp1all.find( "file1" ) != comp1all.end() ); + assert( comp1all.find( "file#a" ) != comp1all.end() ); TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does assert( comp1 == "file1" ); @@ -138,9 +138,9 @@ void KURLCompletionTest::testLocalURL() TQStringList comp1all = m_completion->allMatches(); kdDebug() << comp1all << endl; assert( comp1all.count() == 2 ); - assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() ); + assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() ); TQString filehash = m_dirURL.url() + "file%23a"; - assert( comp1all.tqfind( filehash ) != comp1all.end() ); + assert( comp1all.find( filehash ) != comp1all.end() ); TQString filehashPath = m_completion->replacedPath( filehash ); // note that it returns a path!! kdDebug() << filehashPath << endl; assert( filehashPath == m_dirURL.path() + "file#a" ); -- cgit v1.2.1