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/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 +- 18 files changed, 82 insertions(+), 82 deletions(-) (limited to 'kio/kfile') 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; } -- cgit v1.2.1