From 33881ea4441221b1ca0789a72c4c7249d923a0df 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/applications/k3b@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3b/projects/datacd/k3bdatadoc.cpp | 32 +++++++++++----------- libk3b/projects/datacd/k3bdataitem.cpp | 4 +-- libk3b/projects/datacd/k3bdiritem.cpp | 22 +++++++-------- libk3b/projects/datacd/k3bdiritem.h | 2 +- .../datacd/k3bfilecompilationsizehandler.cpp | 4 +-- libk3b/projects/datacd/k3bfileitem.cpp | 2 +- libk3b/projects/datacd/k3bfileitem.h | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 12 ++++---- libk3b/projects/datacd/k3bisooptions.cpp | 8 +++--- libk3b/projects/datacd/k3bisooptions.h | 2 +- libk3b/projects/datacd/k3bmkisofshandler.cpp | 6 ++-- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 6 ++-- 12 files changed, 51 insertions(+), 51 deletions(-) (limited to 'libk3b/projects/datacd') diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 17680d3..14a78a4 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -165,7 +165,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) TQString name( k3bname ); if( cnt > 0 ) name += TQString("_%1").tqarg(cnt); - if( K3bDataItem* oldItem = dir->tqfind( name ) ) { + if( K3bDataItem* oldItem = dir->find( name ) ) { if( f.isDir() && oldItem->isDir() ) { // ok, just reuse the dir newDirItem = static_cast(oldItem); @@ -215,7 +215,7 @@ bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir ) if( !dir ) return false; else - return ( dir->tqfind( name ) != 0 ); + return ( dir->find( name ) != 0 ); } @@ -275,7 +275,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bDataDoc) could not tqfind 'general' section." << endl; + kdDebug() << "(K3bDataDoc) could not find 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -285,7 +285,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "options" ) { - kdDebug() << "(K3bDataDoc) could not tqfind 'options' section." << endl; + kdDebug() << "(K3bDataDoc) could not find 'options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -297,7 +297,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "header" ) { - kdDebug() << "(K3bDataDoc) could not tqfind 'header' section." << endl; + kdDebug() << "(K3bDataDoc) could not find 'header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -309,7 +309,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "files" ) { - kdDebug() << "(K3bDataDoc) could not tqfind 'files' section." << endl; + kdDebug() << "(K3bDataDoc) could not find 'files' section." << endl; return false; } @@ -428,7 +428,7 @@ bool K3bDataDoc::loadDocumentDataOptions( TQDomElement elem ) else if( e.text() == "extended" ) m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::extended ); else if( e.text() == "extended" ) - m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); + m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::replace ); else m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); } @@ -565,7 +565,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) else if( elem.nodeName() == "directory" ) { // This is for the VideoDVD project which already contains the *_TS folders K3bDirItem* newDirItem = 0; - if( K3bDataItem* item = tqparent->tqfind( elem.attributeNode( "name" ).value() ) ) { + if( K3bDataItem* item = tqparent->find( elem.attributeNode( "name" ).value() ) ) { if( item->isDir() ) { newDirItem = static_cast(item); } @@ -745,8 +745,8 @@ void K3bDataDoc::saveDocumentDataOptions( TQDomElement& optionsElem ) case K3bIsoOptions::extended: topElem.appendChild( doc.createTextNode( "extended" ) ); break; - case K3bIsoOptions::tqreplace: - topElem.appendChild( doc.createTextNode( "tqreplace" ) ); + case K3bIsoOptions::replace: + topElem.appendChild( doc.createTextNode( "replace" ) ); break; default: topElem.appendChild( doc.createTextNode( "noChange" ) ); @@ -838,7 +838,7 @@ void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem ) void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ) { if( K3bFileItem* fileItem = dynamic_cast( item ) ) { - if( m_oldSession.tqcontains( fileItem ) ) { + if( m_oldSession.contains( fileItem ) ) { kdDebug() << "(K3bDataDoc) ignoring fileitem " << fileItem->k3bName() << " from old session while saving..." << endl; } else { @@ -998,8 +998,8 @@ TQString K3bDataDoc::treatWhitespace( const TQString& path ) if( isoOptions().whiteSpaceTreatment() != K3bIsoOptions::noChange ) { TQString result = path; - if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::tqreplace ) { - result.tqreplace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); + if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::replace ) { + result.replace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); } else if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::strip ) { result.remove( ' ' ); @@ -1220,7 +1220,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { const K3bIso9660Entry* entry = importDir->entry( *it ); - K3bDataItem* oldItem = tqparent->tqfind( entry->name() ); + K3bDataItem* oldItem = tqparent->find( entry->name() ); if( entry->isDirectory() ) { K3bDirItem* dir = 0; if( oldItem && oldItem->isDir() ) { @@ -1278,7 +1278,7 @@ void K3bDataDoc::clearImportedSession() } else { for( TQPtrListIterator it( dir->tqchildren() ); it.current(); ++it ) { - if( !m_oldSession.tqcontains(it.current()) ) { + if( !m_oldSession.contains(it.current()) ) { m_oldSession.remove(); // now the dir becomes a totally normal dir dir->setRemoveable(true); @@ -1308,7 +1308,7 @@ void K3bDataDoc::clearImportedSession() K3bDirItem* K3bDataDoc::bootImageDir() { - K3bDataItem* b = m_root->tqfind( "boot" ); + K3bDataItem* b = m_root->find( "boot" ); if( !b ) { b = new K3bDirItem( "boot", this, m_root ); setModified( true ); diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index 4e53a8d..b2df008 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -116,13 +116,13 @@ K3b::Msf K3bDataItem::itemBlocks( bool followSymbolicLinks ) const void K3bDataItem::setK3bName( const TQString& name ) { if ( name != m_k3bName ) { // test for not-allowed characters - if( name.tqcontains('/') ) { + if( name.contains('/') ) { kdDebug() << "(K3bDataItem) name contained invalid characters!" << endl; return; } if( tqparent() ) { - K3bDataItem* item = tqparent()->tqfind( name ); + K3bDataItem* item = tqparent()->find( name ); if( item && item != this ) { kdDebug() << "(K3bDataItem) item with that name already exists." << endl; return; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index b44037f..16627c7 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -99,12 +99,12 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) } } - if( m_tqchildren.tqfindRef( item ) == -1 ) { + if( m_tqchildren.findRef( item ) == -1 ) { if( item->isFile() ) { // do we replace an old item? TQString name = item->k3bName(); int cnt = 1; - while( K3bDataItem* oldItem = tqfind( name ) ) { + while( K3bDataItem* oldItem = find( name ) ) { if( !oldItem->isDir() && oldItem->isFromOldSession() ) { // in this case we remove this item from it's tqparent and save it in the new one // to be able to recover it @@ -146,7 +146,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) { - int x = m_tqchildren.tqfindRef( item ); + int x = m_tqchildren.findRef( item ); if( x > -1 ) { K3bDataItem* item = m_tqchildren.take(); updateSize( item, true ); @@ -186,7 +186,7 @@ K3bDataItem* K3bDirItem::nextSibling() const K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const { // search for prev in tqchildren - if( m_tqchildren.tqfindRef( prev ) < 0 ) { + if( m_tqchildren.findRef( prev ) < 0 ) { return 0; } else @@ -196,11 +196,11 @@ K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const { - return (tqfind( filename ) != 0); + return (find( filename ) != 0); } -K3bDataItem* K3bDirItem::tqfind( const TQString& filename ) const +K3bDataItem* K3bDirItem::find( const TQString& filename ) const { for( TQPtrListIterator it( m_tqchildren ); it.current(); ++it ) { if( it.current()->k3bName() == filename ) @@ -218,12 +218,12 @@ K3bDataItem* K3bDirItem::findByPath( const TQString& p ) TQString path = p; if( path.startsWith("/") ) path = path.mid(1); - int pos = path.tqfind( "/" ); + int pos = path.find( "/" ); if( pos < 0 ) - return tqfind( path ); + return find( path ); else { // do it recursivly - K3bDataItem* item = tqfind( path.left(pos) ); + K3bDataItem* item = find( path.left(pos) ); if( item && item->isDir() ) return ((K3bDirItem*)item)->findByPath( path.mid( pos+1 ) ); else @@ -249,7 +249,7 @@ bool K3bDirItem::mkdir( const TQString& dirPath ) TQString restPath; TQString dirName; - int pos = dirPath.tqfind( '/' ); + int pos = dirPath.find( '/' ); if( pos == -1 ) { dirName = dirPath; } @@ -258,7 +258,7 @@ bool K3bDirItem::mkdir( const TQString& dirPath ) restPath = dirPath.mid( pos+1 ); } - K3bDataItem* dir = tqfind( dirName ); + K3bDataItem* dir = find( dirName ); if( !dir ) dir = new K3bDirItem( dirName, doc(), this ); else if( !dir->isDir() ) diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index 75fc20e..7ec0fba 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -56,7 +56,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem K3bDataItem* nextChild( K3bDataItem* ) const; bool alreadyInDirectory( const TQString& fileName ) const; - K3bDataItem* tqfind( const TQString& filename ) const; + K3bDataItem* find( const TQString& filename ) const; K3bDataItem* findByPath( const TQString& ); long numFiles() const; diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp index 7d92e7e..2d4b2fb 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp @@ -114,7 +114,7 @@ public: void removeFile( K3bFileItem* item, bool followSymlinks ) { InodeInfo& inodeInfo = inodeMap[item->localId(followSymlinks)]; - if( inodeInfo.items.tqfindRef( item ) == -1 ) { + if( inodeInfo.items.findRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) " << item->localPath() << " has been removed without being added!" << endl; @@ -136,7 +136,7 @@ public: void removeSpecialItem( K3bDataItem* item ) { // special files do not have a corresponding local file // so we just substract their k3bSize - if( specialItems.tqfindRef( item ) == -1 ) { + if( specialItems.findRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) Special item " << item->k3bName() << " has been removed without being added!" << endl; diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index 337aad8..c6c7bb4 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -273,7 +273,7 @@ bool K3bFileItem::isValid() const } else { // search for the item in dir - K3bDataItem* d = dir->tqfind( tokens[i] ); + K3bDataItem* d = dir->find( tokens[i] ); if( d == 0 ) return false; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index 68ee49d..e758d95 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -77,7 +77,7 @@ public: }; /** - * This is not the normal inode number but it also tqcontains + * This is not the normal inode number but it also contains * the device number. */ Id localId() const; diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index b7ff5ad..e511a30 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -400,7 +400,7 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() else { // parse the stderr output // I hope parsing the last line is enough! - int pos = m_collectedMkisofsPrintSizeStderr.tqfindRev( "extents scheduled to be written" ); + int pos = m_collectedMkisofsPrintSizeStderr.findRev( "extents scheduled to be written" ); if( pos == -1 ) success = false; @@ -857,7 +857,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream // some versions of mkisofs seem to have a bug that prevents to use filenames // that contain one or more backslashes - if( item->writtenPath().tqcontains("\\") ) + if( item->writtenPath().contains("\\") ) m_containsFilesWithMultibleBackslashes = true; @@ -887,7 +887,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream stream << escapeGraftPoint( item->writtenPath() ) << "="; - if( m_doc->bootImages().tqcontainsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().containsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack // create temp file KTempFile temp; @@ -976,7 +976,7 @@ bool K3bIsoImager::writeSortWeightFile() K3bDataItem* item = m_doc->root(); while( (item = item->nextSibling()) ) { // we skip the root here if( item->sortWeight() != 0 ) { - if( m_doc->bootImages().tqcontainsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().containsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack *t << escapeGraftPoint( static_cast(item)->tempPath() ) << " " << item->sortWeight() << endl; } else if( item->isDir() ) { @@ -1049,8 +1049,8 @@ TQString K3bIsoImager::escapeGraftPoint( const TQString& str ) ++pos; } -// enc.tqreplace( "\\\\", "\\\\\\\\" ); -// enc.tqreplace( "=", "\\=" ); +// enc.replace( "\\\\", "\\\\\\\\" ); +// enc.replace( "=", "\\=" ); return enc; } diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index 5adca1a..f239f2a 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -118,8 +118,8 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc ) case extended: c->writeEntry( "white_space_treatment", "extended" ); break; - case tqreplace: - c->writeEntry( "white_space_treatment", "tqreplace" ); + case replace: + c->writeEntry( "white_space_treatment", "replace" ); break; default: c->writeEntry( "white_space_treatment", "noChange" ); @@ -189,8 +189,8 @@ K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc ) options.setDoNotCacheInodes( c->readBoolEntry( "do not cache inodes", options.doNotCacheInodes() ) ); TQString w = c->readEntry( "white_space_treatment", "noChange" ); - if( w == "tqreplace" ) - options.setWhiteSpaceTreatment( tqreplace ); + if( w == "replace" ) + options.setWhiteSpaceTreatment( replace ); else if( w == "strip" ) options.setWhiteSpaceTreatment( strip ); else if( w == "extended" ) diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h index 570f3d3..3d51d3d 100644 --- a/libk3b/projects/datacd/k3bisooptions.h +++ b/libk3b/projects/datacd/k3bisooptions.h @@ -108,7 +108,7 @@ class LIBK3B_EXPORT K3bIsoOptions void setPreserveFilePermissions( bool b ) { m_preserveFilePermissions = b; } // ----------------------------------------------------------------- mkisofs-options ----------- - enum whiteSpaceTreatments { noChange = 0, tqreplace = 1, strip = 2, extended = 3 }; + enum whiteSpaceTreatments { noChange = 0, replace = 1, strip = 2, extended = 3 }; void setWhiteSpaceTreatment( int i ) { m_whiteSpaceTreatment = i; } int whiteSpaceTreatment() const { return m_whiteSpaceTreatment; } diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index 5fdb526..99c76bb 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -93,12 +93,12 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line ) d->readError = true; } } - else if( line.tqcontains( "done, estimate" ) ) { + else if( line.contains( "done, estimate" ) ) { int p = parseMkisofsProgress( line ); if( p != -1 ) handleMkisofsProgress( p ); } - else if( line.tqcontains( "extents written" ) ) { + else if( line.contains( "extents written" ) ) { handleMkisofsProgress( 100 ); } else if( line.startsWith( "Incorrectly encoded string" ) ) { @@ -134,7 +134,7 @@ int K3bMkisofsHandler::parseMkisofsProgress( const TQString& line ) // TQString perStr = line; - perStr.truncate( perStr.tqfind('%') ); + perStr.truncate( perStr.find('%') ); bool ok; double p = perStr.toDouble( &ok ); if( !ok ) { diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index 14eca4f..a799374 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start() if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl; - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), K3bJob::ERROR ); jobFinished(false); return; } @@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo() bin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !bin ) { - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); jobFinished(false); return; } @@ -190,7 +190,7 @@ void K3bMsInfoFetcher::slotProcessExited() kdDebug() << "(K3bMsInfoFetcher) msinfo fetched" << endl; // now parse the output - TQString firstLine = m_collectedOutput.left( m_collectedOutput.tqfind("\n") ); + TQString firstLine = m_collectedOutput.left( m_collectedOutput.find("\n") ); TQStringList list = TQStringList::split( ",", firstLine ); if( list.count() == 2 ) { bool ok1, ok2; -- cgit v1.2.3