diff options
Diffstat (limited to 'kio/bookmarks')
-rw-r--r-- | kio/bookmarks/dptrtemplate.h | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmark.h | 4 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_crash.cc | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_kde1.cc | 2 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkimporter_ns.cc | 12 | ||||
-rw-r--r-- | kio/bookmarks/kbookmarkmenu.cc | 4 |
6 files changed, 14 insertions, 14 deletions
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<PrivateData>; 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() == "<DT><A HREF=" || t.left(16).upper() == "<DT><H3><A HREF=") { - int firstQuotes = t.tqfind('"')+1; - int secondQuotes = t.tqfind('"', firstQuotes); + int firstQuotes = t.find('"')+1; + int secondQuotes = t.find('"', firstQuotes); if (firstQuotes != -1 && secondQuotes != -1) { TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes); - int endTag = t.tqfind('>', 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) == "</A>" ) 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() == "<DT><H3") { - int endTag = t.tqfind('>', 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); } |