diff options
Diffstat (limited to 'src')
40 files changed, 159 insertions, 159 deletions
diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index 522fc19..6f44693 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -75,7 +75,7 @@ TQString K3bPlayListViewItem::text( int c ) const switch( c ) { case 0: { - int pos = m_filename.tqfindRev("/"); + int pos = m_filename.findRev("/"); if( pos >= 0 ) return m_filename.mid(pos+1); return m_filename; @@ -513,7 +513,7 @@ long K3bAudioPlayer::position() // FIXME: let my do some useful stuff! bool K3bAudioPlayer::supportsMimetype( const TQString& mimetype ) { - if( mimetype.tqcontains("audio") || mimetype.tqcontains("ogg") ) + if( mimetype.contains("audio") || mimetype.contains("ogg") ) return true; else return false; @@ -580,7 +580,7 @@ void K3bAudioPlayer::slotUpdateFilename() { if( m_currentItem ) { TQString display = m_currentItem->filename(); - int pos = display.tqfindRev("/"); + int pos = display.findRev("/"); if( pos >= 0 ) display = display.mid(pos+1); diff --git a/src/k3bdataprojectinterface.cpp b/src/k3bdataprojectinterface.cpp index bbb2701..d1773e4 100644 --- a/src/k3bdataprojectinterface.cpp +++ b/src/k3bdataprojectinterface.cpp @@ -41,7 +41,7 @@ bool K3bDataProjectInterface::createFolder( const TQString& name ) bool K3bDataProjectInterface::createFolder( const TQString& name, const TQString& tqparent ) { K3bDataItem* p = m_dataDoc->root()->findByPath( tqparent ); - if( p && p->isDir() && !static_cast<K3bDirItem*>(p)->tqfind( name ) ) { + if( p && p->isDir() && !static_cast<K3bDirItem*>(p)->find( name ) ) { m_dataDoc->addEmptyDir( name, static_cast<K3bDirItem*>(p) ); return true; } diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 7e02aed..b497654 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -85,7 +85,7 @@ void K3bDebuggingOutputDialog::setOutput( const TQMap<TQString, TQStringList>& m void K3bDebuggingOutputDialog::addOutput( const TQString& app, const TQString& msg ) { - TQMap<TQString, int>::Iterator it = m_paragraphMap.tqfind( app ); + TQMap<TQString, int>::Iterator it = m_paragraphMap.find( app ); if( it == m_paragraphMap.end() ) { // create new section diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index 3710d25..50b58d4 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -213,9 +213,9 @@ void K3bFileTreeComboBox::slotGoUrl() } // check for our own internal format - else if( p.tqcontains("/dev/") ) { - int pos1 = p.tqfindRev('('); - int pos2 = p.tqfindRev(')'); + else if( p.contains("/dev/") ) { + int pos1 = p.findRev('('); + int pos2 = p.findRev(')'); TQString devStr = p.mid( pos1+1, pos2-pos1-1 ); if( K3bDevice::Device* dev = k3bcore->deviceManager()->findDevice( devStr ) ) { emit deviceExecuted( dev ); @@ -239,13 +239,13 @@ void K3bFileTreeComboBox::slotGoUrl() while( ( pos = someUsersHomeDir.search( p, pos ) ) != -1 ) { KUser user( someUsersHomeDir.cap(1) ); if( user.isValid() ) - p.tqreplace( pos, someUsersHomeDir.cap(1).length() + 1, user.homeDir() ); + p.replace( pos, someUsersHomeDir.cap(1).length() + 1, user.homeDir() ); else ++pos; // skip this ~ } // now replace the unmatched tildes with our home dir - p.tqreplace( "~", K3b::prepareDir( TQDir::homeDirPath() ) ); + p.replace( "~", K3b::prepareDir( TQDir::homeDirPath() ) ); lineEdit()->setText( p ); @@ -273,7 +273,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e ) } else if( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*)e; - if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).tqcontains( me->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) { TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::tqvisualRect(arrowRect, this); @@ -282,7 +282,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e ) // and thus has a rect that doesn't fit the button. arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( mapFromGlobal(me->globalPos()) ) ) { + if ( arrowRect.contains( mapFromGlobal(me->globalPos()) ) ) { d->ignoreNextMouseClick = true; // in the case we hit the arrow button } popdown(); @@ -316,7 +316,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e ) // and thus has a rect that doesn't fit the button. arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { popup(); tqrepaint( FALSE ); } diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 855b296..9ffdbd6 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -216,7 +216,7 @@ void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, i } ypos += fm.ascent(); - TQString line1 = text(0).left( text(0).tqfind('\n') ); + TQString line1 = text(0).left( text(0).find('\n') ); p->drawText( xpos, ypos, line1 ); TQFont f( listView()->font() ); @@ -226,7 +226,7 @@ void K3bDeviceBranchViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, i p->setFont( f ); ypos += p->fontMetrics().height() + 1; - TQString line2 = text(0).mid( text(0).tqfind('\n')+1 ); + TQString line2 = text(0).mid( text(0).find('\n')+1 ); p->drawText( xpos - p->fontMetrics().leftBearing( line2[0] ), ypos, line2 ); @@ -256,12 +256,12 @@ int K3bDeviceBranchViewItem::widthHint() const if ( m_bCurrent ) { f.setBold( true ); } - int w = TQFontMetrics(f).width( text(0).left( text(0).tqfind('\n') ) ); + int w = TQFontMetrics(f).width( text(0).left( text(0).find('\n') ) ); f.setItalic( true ); f.setBold( false ); f.setPointSize( f.pointSize() - 2 ); - w = TQMAX( w, TQFontMetrics(f).width( text(0).mid( text(0).tqfind('\n')+1 ) ) ); + w = TQMAX( w, TQFontMetrics(f).width( text(0).mid( text(0).find('\n')+1 ) ) ); w++; // see paintCell @@ -334,7 +334,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos ) TQGridLayout* lay = new TQGridLayout( tooltip, 2, 2, tooltip->frameWidth()*2 /*margin*/, 6 /*spacing*/ ); TQString text = k3bappcore->mediaCache()->medium( dev ).longString(); - int detailsStart = text.tqfind( "<p>", 3 ); + int detailsStart = text.find( "<p>", 3 ); TQString details = text.mid( detailsStart ); text.truncate( detailsStart ); @@ -579,7 +579,7 @@ KFileTreeBranch* K3bFileTreeView::addBranch( const KURL& url, const TQString& na void K3bFileTreeView::slotItemExecuted( TQListViewItem* item ) { KFileTreeViewItem* treeItem = static_cast<KFileTreeViewItem*>(item); - if( d->branchDeviceMap.tqcontains( treeItem->branch() ) && + if( d->branchDeviceMap.contains( treeItem->branch() ) && treeItem == treeItem->branch()->root() ) { K3bDevice::Device* dev = d->branchDeviceMap[treeItem->branch()]; k3bappcore->appDeviceManager()->setCurrentDevice( dev ); @@ -601,7 +601,7 @@ void K3bFileTreeView::followUrl( const KURL& url ) // TODO: first try the current branch KFileTreeBranchIterator it( branches() ); for( ; *it; ++it ) { - if( !d->branchDeviceMap.tqcontains( *it ) ) + if( !d->branchDeviceMap.contains( *it ) ) if( KFileTreeViewItem* item = (*it)->findTVIByURL( url ) ) { setCurrentItem( item ); setSelected(item, true); @@ -618,7 +618,7 @@ void K3bFileTreeView::slotContextMenu( KListView*, TQListViewItem* item, const T if( treeItem ) { K3bDevice::Device* device = 0; TQMap<KFileTreeBranch*, K3bDevice::Device*>::iterator devIt = - d->branchDeviceMap.tqfind( treeItem->branch() ); + d->branchDeviceMap.find( treeItem->branch() ); if( devIt != d->branchDeviceMap.end() ) device = devIt.data(); @@ -641,7 +641,7 @@ K3bDevice::Device* K3bFileTreeView::selectedDevice() const { KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(selectedItem()); if( treeItem ) { - if( d->branchDeviceMap.tqcontains( treeItem->branch() ) ) + if( d->branchDeviceMap.contains( treeItem->branch() ) ) return d->branchDeviceMap[treeItem->branch()]; } return 0; @@ -652,7 +652,7 @@ KURL K3bFileTreeView::selectedUrl() const { KFileTreeViewItem* treeItem = dynamic_cast<KFileTreeViewItem*>(selectedItem()); if( treeItem ) { - if( !d->branchDeviceMap.tqcontains( treeItem->branch() ) ) + if( !d->branchDeviceMap.contains( treeItem->branch() ) ) return treeItem->url(); } return KURL(); @@ -684,7 +684,7 @@ void K3bFileTreeView::setSelectedDevice( K3bDevice::Device* dev ) K3bDeviceBranch* K3bFileTreeView::branch( K3bDevice::Device* dev ) { - return d->deviceBranchDict.tqfind( (void*)dev ); + return d->deviceBranchDict.find( (void*)dev ); } diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index f423b96..910dc60 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -150,7 +150,7 @@ void K3bFileView::slotFilterChanged() TQString filter = m_filterWidget->currentFilter(); m_dirOp->clearFilter(); - if( filter.tqfind( '/' ) > -1 ) { + if( filter.find( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); m_dirOp->setMimeFilter( types ); diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp index 98eac9f..5e2b104 100644 --- a/src/k3bmediacache.cpp +++ b/src/k3bmediacache.cpp @@ -340,7 +340,7 @@ void K3bMediaCache::buildDeviceList( K3bDevice::DeviceManager* dm ) const TQPtrList<K3bDevice::Device>& devices = dm->allDevices(); for( TQPtrListIterator<K3bDevice::Device> it( devices ); *it; ++it ) { m_deviceMap.insert( *it, new DeviceEntry( this, *it ) ); - TQMap<K3bDevice::Device*, int>::const_iterator bi_it = blockedIds.tqfind( *it ); + TQMap<K3bDevice::Device*, int>::const_iterator bi_it = blockedIds.find( *it ); if( bi_it != blockedIds.end() ) m_deviceMap[*it]->blockedId = bi_it.data(); } @@ -356,7 +356,7 @@ void K3bMediaCache::buildDeviceList( K3bDevice::DeviceManager* dm ) K3bMediaCache::DeviceEntry* K3bMediaCache::findDeviceEntry( K3bDevice::Device* dev ) { - TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.tqfind( dev ); + TQMap<K3bDevice::Device*, DeviceEntry*>::iterator it = m_deviceMap.find( dev ); if( it != m_deviceMap.end() ) return it.data(); else diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp index 4dd5fde..42b4b05 100644 --- a/src/k3bmediaselectioncombobox.cpp +++ b/src/k3bmediaselectioncombobox.cpp @@ -157,7 +157,7 @@ TQValueList<K3bDevice::Device*> K3bMediaSelectionComboBox::allDevices() const void K3bMediaSelectionComboBox::setSelectedDevice( K3bDevice::Device* dev ) { - if( dev && d->deviceIndexMap.tqcontains( dev ) ) { + if( dev && d->deviceIndexMap.contains( dev ) ) { setCurrentItem( d->deviceIndexMap[dev] ); emit selectionChanged( dev ); } @@ -298,7 +298,7 @@ void K3bMediaSelectionComboBox::updateMedia() emit selectionChanged( 0 ); } } - else if( selected && d->deviceIndexMap.tqcontains( selected ) ) { + else if( selected && d->deviceIndexMap.contains( selected ) ) { setCurrentItem( d->deviceIndexMap[selected] ); } else { @@ -346,7 +346,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev ) // Now let's see if this string is already contained in the list // and if so add the device name to both // - if( d->mediaStringMap.tqcontains( s ) ) { + if( d->mediaStringMap.contains( s ) ) { // // insert the modified string // diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index 05ca446..d8d4c9e 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -104,7 +104,7 @@ const TQPtrList<K3bDoc>& K3bProjectManager::projects() const void K3bProjectManager::addProject( K3bDoc* doc ) { - if( !d->projects.tqcontainsRef( doc ) ) { + if( !d->projects.containsRef( doc ) ) { kdDebug() << "(K3bProjectManager) adding doc " << doc->URL().path() << endl; d->projects.append(doc); @@ -120,7 +120,7 @@ void K3bProjectManager::addProject( K3bDoc* doc ) void K3bProjectManager::removeProject( K3bDoc* doc ) { // - // TQPtrList.tqfindRef seems to be buggy. Everytime we search for the + // TQPtrList.findRef seems to be buggy. Everytime we search for the // first added item it is not found! // for( TQPtrListIterator<K3bDoc> it( d->projects ); @@ -128,7 +128,7 @@ void K3bProjectManager::removeProject( K3bDoc* doc ) if( it.current() == doc ) { // remove the DCOP interface - TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.tqfind( doc ); + TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.find( doc ); if( it != d->projectInterfaceMap.end() ) { // delete the interface delete it.data(); @@ -172,7 +172,7 @@ void K3bProjectManager::setActive( K3bDoc* doc ) } // - // TQPtrList.tqfindRef seems to be buggy. Everytime we search for the + // TQPtrList.findRef seems to be buggy. Everytime we search for the // first added item it is not found! // for( TQPtrListIterator<K3bDoc> it( d->projects ); @@ -449,7 +449,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc ) K3bProjectInterface* K3bProjectManager::dcopInterface( K3bDoc* doc ) { - TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.tqfind( doc ); + TQMap<K3bDoc*, K3bProjectInterface*>::iterator it = d->projectInterfaceMap.find( doc ); if( it == d->projectInterfaceMap.end() ) { K3bProjectInterface* dcopInterface = 0; if( doc->type() == K3bDoc::DATA || doc->type() == K3bDoc::DVD ) diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index 7eabfd7..cd0ad1f 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -104,7 +104,7 @@ void K3bStatusBarManager::update() TQString path = K3b::defaultTempPath(); if( !TQFile::exists( path ) ) - path.truncate( path.tqfindRev('/') ); + path.truncate( path.findRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index ee44875..ec8a27f 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -59,8 +59,8 @@ static TQString markupString( const TQString& s_ ) { TQString s(s_); - s.tqreplace( '<', "<" ); - s.tqreplace( '>', ">" ); + s.replace( '<', "<" ); + s.replace( '>', ">" ); return s; } @@ -186,9 +186,9 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, // 1. cdrecord, cdrdao if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to tqfind %1 executable").tqarg("cdrecord"), + i18n("Unable to find %1 executable").tqarg("cdrecord"), i18n("K3b uses cdrecord to actually write CDs."), - i18n("Install the cdrtools package which tqcontains " + i18n("Install the cdrtools package which contains " "cdrecord."), false ) ); } @@ -242,7 +242,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, } if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to tqfind %1 executable").tqarg("cdrdao"), + i18n("Unable to find %1 executable").tqarg("cdrdao"), i18n("K3b uses cdrdao to actually write CDs."), i18n("Install the cdrdao package."), false ) ); @@ -268,7 +268,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) { if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to tqfind %1 executable").tqarg("growisofs"), + i18n("Unable to find %1 executable").tqarg("growisofs"), i18n("K3b uses growisofs to actually write dvds. " "Without growisofs you will not be able to write dvds. " "Make sure to install at least version 5.10."), @@ -317,7 +317,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) { problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, - i18n("Unable to tqfind %1 executable").tqarg("dvd+rw-format"), + i18n("Unable to find %1 executable").tqarg("dvd+rw-format"), i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."), i18n("Install the dvd+rw-tools package."), false ) ); @@ -412,7 +412,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* tqparent, if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "hacked-atapi" ) && !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "plain-atapi") ) { - // FIXME: tqreplace ">" with ">" + // FIXME: replace ">" with ">" problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, i18n("%1 %2 does not support ATAPI") .tqarg("cdrdao").tqarg(k3bcore->externalBinManager()->binObject("cdrdao")->version), @@ -633,9 +633,9 @@ int K3bSystemProblemDialog::dmaActivated( K3bDevice::Device* dev ) // // But we ignore the on/off since it might be translated // - if( out.output().tqcontains( "1 (" ) ) + if( out.output().contains( "1 (" ) ) return 1; - else if( out.output().tqcontains( "0 (" ) ) + else if( out.output().contains( "0 (" ) ) return 0; else return -1; diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index b565f21..a91da03 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -93,7 +93,7 @@ unsigned long K3bTempDirSelectionWidget::freeTempSpace() const TQString path = m_editDirectory->url(); if( !TQFile::exists( path ) ) - path.truncate( path.tqfindRev('/') ); + path.truncate( path.findRev('/') ); unsigned long size; K3b::kbFreeOnFs( path, size, m_freeTempSpace ); @@ -184,7 +184,7 @@ TQString K3bTempDirSelectionWidget::tempDirectory() const // now we treat the last section as a filename and return the path // in front of it - td.truncate( td.tqfindRev( '/' ) + 1 ); + td.truncate( td.findRev( '/' ) + 1 ); return td; } @@ -248,7 +248,7 @@ void K3bTempDirSelectionWidget::setDefaultImageFileName( const TQString& name ) } m_defaultImageFileName = name; - if ( !m_defaultImageFileName.tqcontains( '.' ) ) { + if ( !m_defaultImageFileName.contains( '.' ) ) { m_defaultImageFileName += ".iso"; } fixTempPath( changeImageName ); diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp index 3268018..6e86bd6 100644 --- a/src/k3bthememanager.cpp +++ b/src/k3bthememanager.cpp @@ -57,7 +57,7 @@ TQColor K3bTheme::foregroundColor() const const TQPixmap& K3bTheme::pixmap( const TQString& name ) const { - TQMap<TQString, TQPixmap>::const_iterator it = m_pixmapMap.tqfind( name ); + TQMap<TQString, TQPixmap>::const_iterator it = m_pixmapMap.find( name ); if( it != m_pixmapMap.end() ) return *it; @@ -270,7 +270,7 @@ void K3bThemeManager::loadThemes() // every theme dir needs to contain a k3b.theme file for( TQStringList::const_iterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt ) { TQString themeDir = *dirIt + *entryIt + "/"; - if( !themeNames.tqcontains( *entryIt ) && TQFile::exists( themeDir + "k3b.theme" ) ) { + if( !themeNames.contains( *entryIt ) && TQFile::exists( themeDir + "k3b.theme" ) ) { bool themeValid = true; // check for all nessessary pixmaps (this is a little evil hacking) diff --git a/src/k3btooltip.cpp b/src/k3btooltip.cpp index a28c5c2..c123955 100644 --- a/src/k3btooltip.cpp +++ b/src/k3btooltip.cpp @@ -153,7 +153,7 @@ bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e ) m_tipTimer->stop(); if( m_currentTip ) { // see if we have to hide it - if( !m_currentTipRect.tqcontains( m_lastMousePos ) ) { + if( !m_currentTipRect.contains( m_lastMousePos ) ) { hideTip(); // in case we moved the mouse from one tip area to the next without leaving diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 34835de..ab3192f 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -432,7 +432,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] != '_' ) { KAction* a = m_mainWindow->actionCollection()->action( s_allActions[i] ); - if ( a && !main->m_actions.tqcontainsRef(a) ) { + if ( a && !main->m_actions.containsRef(a) ) { map.insert( addPop.insertItem( a->iconSet(), a->text() ), a ); } } diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 41a4f22..720d390 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -322,7 +322,7 @@ void K3bWriterSelectionWidget::clearSpeedCombo() void K3bWriterSelectionWidget::insertSpeedItem( int speed ) { - if( !d->speedIndexMap.tqcontains( speed ) ) { + if( !d->speedIndexMap.contains( speed ) ) { d->indexSpeedMap[m_comboSpeed->count()] = speed; d->speedIndexMap[speed] = m_comboSpeed->count(); @@ -367,7 +367,7 @@ void K3bWriterSelectionWidget::setSpeed( int s ) if( d->haveIgnoreSpeed && s < 0 ) m_comboSpeed->setCurrentItem( 1 ); // Ignore - else if( d->speedIndexMap.tqcontains( s ) ) + else if( d->speedIndexMap.contains( s ) ) m_comboSpeed->setCurrentItem( d->speedIndexMap[s] ); else { m_comboSpeed->setCurrentItem( 0 ); // Auto diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index b606fd2..fca3b3f 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -252,7 +252,7 @@ void K3bBlankingDialog::slotWritingAppChanged(int app) TQWhatsThis::add( m_comboEraseMode, whatsThisInfo ); // try to reset last mode - if( d->typeComboMap.tqcontains( lastMode ) ) + if( d->typeComboMap.contains( lastMode ) ) m_comboEraseMode->setCurrentItem( d->typeComboMap[lastMode] ); else m_comboEraseMode->setCurrentItem( d->typeComboMap[K3bBlankingJob::Fast] ); diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 1d2f10f..3d75d9b 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -173,7 +173,7 @@ void K3bCddbOptionTab::readSettings() for( TQStringList::const_iterator it = cddbServer.begin(); it != cddbServer.end(); ++it ) { const TQString& s = *it; - TQStringList buf = TQStringList::split( ":", s.mid( s.tqfind(" ")+1 ) ); + TQStringList buf = TQStringList::split( ":", s.mid( s.find(" ")+1 ) ); TQString server = buf[0]; int port = buf[1].toInt(); if( s.startsWith("Http") ) diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 8f6c475..4aebd99 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -280,7 +280,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, T // TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.tqcontainsRef( srcIt.current()->track() ) ) + if( tracks.containsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -439,11 +439,11 @@ void K3bAudioTrackView::slotChanged() K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track, bool* isNewItem ) { - TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.tqfind(track); + TQMap<K3bAudioTrack*, K3bAudioTrackViewItem*>::iterator itemIt = m_trackItemMap.find(track); if( itemIt == m_trackItemMap.end() ) { kdDebug() << "(K3bAudioTrackView) new track " << track << endl; K3bAudioTrackViewItem* prevItem = 0; - if( track->prev() && m_trackItemMap.tqcontains( track->prev() ) ) + if( track->prev() && m_trackItemMap.contains( track->prev() ) ) prevItem = m_trackItemMap[track->prev()]; K3bAudioTrackViewItem* newItem = new K3bAudioTrackViewItem( this, prevItem, track ); // @@ -491,7 +491,7 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track ) // FIXME: only do this if the position really changed // move the item if the position has changed - if( track->prev() && m_trackItemMap.tqcontains(track->prev()) ) + if( track->prev() && m_trackItemMap.contains(track->prev()) ) item->moveItem( m_trackItemMap[track->prev()] ); else if( !track->prev() ) { takeItem( item ); @@ -735,7 +735,7 @@ void K3bAudioTrackView::slotRemove() // TQPtrListIterator<K3bAudioDataSource> srcIt( sources ); while( srcIt.current() ) { - if( tracks.tqcontainsRef( srcIt.current()->track() ) ) + if( tracks.containsRef( srcIt.current()->track() ) ) sources.removeRef( *srcIt ); else ++srcIt; @@ -993,7 +993,7 @@ void K3bAudioTrackView::slotQueryMusicBrainz() // only one may use the tracks at the same time if( m_currentlyPlayingTrack && - tracks.tqcontainsRef( m_currentlyPlayingTrack ) ) + tracks.containsRef( m_currentlyPlayingTrack ) ) m_player->stop(); // now do the lookup on the files. diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 1ec11e6..82f11b4 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -242,7 +242,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) { if( item->isDir() ) { K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); if( it != m_itemMap.end() ) { K3bDataDirViewItem* viewItem = it.data(); m_itemMap.remove( it ); @@ -263,7 +263,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item ) void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) { - TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.tqfind( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> it = m_itemMap.find( dirItem ); if( it != m_itemMap.end() ) { setCurrentItem( it.data() ); it.data()->setOpen(true); @@ -454,7 +454,7 @@ void K3bDataDirTreeView::checkForNewItems() { K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ); - TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.tqfind( dirItem ); + TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.find( dirItem ); if( itDirItem == m_itemMap.end() ) { K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 3777ac7..996ca69 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -153,7 +153,7 @@ void K3bDataFileView::slotDataItemRemoved( K3bDataItem* item ) } } - if( m_itemMap.tqcontains( item ) ) { + if( m_itemMap.contains( item ) ) { delete m_itemMap[item]; m_itemMap.remove(item); } @@ -166,7 +166,7 @@ void K3bDataFileView::checkForNewItems() // add items that are not there yet for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) { - if( !m_itemMap.tqcontains( it.current() ) ) { + if( !m_itemMap.contains( it.current() ) ) { slotItemAdded( it.current() ); } } diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 57f1474..be55ae6 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -353,7 +353,7 @@ void K3bDataImageSettingsWidget::load( const K3bIsoOptions& o ) case K3bIsoOptions::extended: m_comboSpaceHandling->setCurrentItem( WS_EXTENDED_STRIP ); break; - case K3bIsoOptions::tqreplace: + case K3bIsoOptions::replace: m_comboSpaceHandling->setCurrentItem( WS_REPLACE ); break; default: @@ -387,7 +387,7 @@ void K3bDataImageSettingsWidget::save( K3bIsoOptions& o ) o.setWhiteSpaceTreatment( K3bIsoOptions::extended ); break; case WS_REPLACE: - o.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); + o.setWhiteSpaceTreatment( K3bIsoOptions::replace ); break; default: o.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 7cc8549..36f985e 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -99,7 +99,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge m_labelType->setText( kFileItem.mimeComment() ); m_labelLocalName->setText( kFileItem.name() ); TQString localLocation = kFileItem.url().path(-1); - localLocation.truncate( localLocation.tqfindRev('/') ); + localLocation.truncate( localLocation.findRev('/') ); m_labelLocalLocation->setText( localLocation ); m_labelSize->setText( KIO::convertSize(dataItem->size()) ); } @@ -132,7 +132,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge TQString location = "/" + dataItem->k3bPath(); if( location[location.length()-1] == '/' ) location.truncate( location.length()-1 ); - location.truncate( location.tqfindRev('/') ); + location.truncate( location.findRev('/') ); if( location.isEmpty() ) location = "/"; m_labelLocation->setText( location ); diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 772c13c..9f69d86 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -384,7 +384,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() // and if so handle it properly // if( valid ) { - if( K3bDataItem* oldItem = dir->tqfind( newName ) ) { + if( K3bDataItem* oldItem = dir->find( newName ) ) { // // reuse an existing dir // @@ -450,7 +450,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // tqreplace + case 1: // replace // if we replace an item from an old session the K3bFileItem constructor takes care // of replacing the item if( !oldItem->isFromOldSession() ) @@ -618,7 +618,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() // // Let's see if an item with that name alredy exists // - if( K3bDataItem* oldItem = dir->tqfind( item->k3bName() ) ) { + if( K3bDataItem* oldItem = dir->find( item->k3bName() ) ) { // // reuse an existing dir: move all child items into the old dir // @@ -686,7 +686,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() case 2: // replace all m_bExistingItemsReplaceAll = true; // fallthrough - case 1: // tqreplace + case 1: // replace // // if we replace an item from an old session K3bDirItem::addDataItem takes care // of replacing the item @@ -751,7 +751,7 @@ bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* di i18n("A file with that name already exists. Please enter a new name:"), newName, &ok, this, "renamedialog", validator ); - } while( ok && dir->tqfind( newName ) ); + } while( ok && dir->find( newName ) ); delete validator; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 93b217c..f6fbfa1 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -219,7 +219,7 @@ void K3bMovixListView::slotNewFileItems() K3bMovixFileItem* lastItem = 0; for( TQPtrListIterator<K3bMovixFileItem> it( m_doc->movixFileItems() ); it.current(); ++it ) { K3bMovixFileItem* item = it.current(); - if( !m_itemMap.tqcontains( item ) ) + if( !m_itemMap.contains( item ) ) m_itemMap.insert( item, new K3bMovixFileViewItem( m_doc, item, this, lastItem ? m_itemMap[lastItem] : 0L ) ); if( item->subTitleItem() ) { @@ -240,7 +240,7 @@ void K3bMovixListView::slotNewFileItems() void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.tqcontains( item ) ) { + if( m_itemMap.contains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; m_itemMap.erase(item); delete vi; @@ -250,7 +250,7 @@ void K3bMovixListView::slotFileItemRemoved( K3bMovixFileItem* item ) void K3bMovixListView::slotSubTitleItemRemoved( K3bMovixFileItem* item ) { - if( m_itemMap.tqcontains( item ) ) { + if( m_itemMap.contains( item ) ) { K3bMovixFileViewItem* vi = m_itemMap[item]; if( vi->childCount() >= 1 ) delete vi->firstChild(); diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index d1aca71..f9220a9 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -65,7 +65,7 @@ public: } void setLanguage( const TQString& l ) { - TQMap<TQString,int>::const_iterator it = m_indexMap.tqfind(l); + TQMap<TQString,int>::const_iterator it = m_indexMap.find(l); if( it == m_indexMap.end() ) m_box->setCurrentItem( 0 ); else diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 162c662..09d59d1 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -245,7 +245,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) // so to not let the user have to choose between two equal entries we trim the list down for( TQStringList::const_iterator it = resultStrings.begin(); it != resultStrings.end(); ++it ) - if( resultStringsUnique.tqfind( *it ) == resultStringsUnique.end() ) + if( resultStringsUnique.find( *it ) == resultStringsUnique.end() ) resultStringsUnique.append( *it ); TQString s; @@ -264,7 +264,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) s = resultStringsUnique.first(); if( ok ) { - int i = resultStrings.tqfindIndex( s ); + int i = resultStrings.findIndex( s ); m_tracks.current()->setTitle( m_mbThread->title(i) ); m_tracks.current()->setArtist( m_mbThread->artist(i) ); } diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index ad3c07c..372ae1c 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -250,7 +250,7 @@ void K3bVcdListView::slotUpdateItems() K3bVcdTrack * track = m_doc->first(); K3bVcdTrack* lastTrack = 0; while ( track != 0 ) { - if ( !m_itemMap.tqcontains( track ) ) + if ( !m_itemMap.contains( track ) ) m_itemMap.insert( track, new K3bVcdListViewItem( track, this, m_itemMap[ lastTrack ] ) ); lastTrack = track; diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 1b148f2..7fac6b1 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -159,7 +159,7 @@ void K3bVcdTrackDialog::slotApply() } TQMap<TQString, K3bVcdTrack*>::Iterator mit; - mit = m_numkeysmap.tqfind( it.current() ->text( 1 ) ); + mit = m_numkeysmap.find( it.current() ->text( 1 ) ); if ( mit != m_numkeysmap.end() ) if ( mit.data() ) { selectedTrack->setDefinedNumKey( it.current() ->text( 0 ).toInt(), mit.data() ); @@ -718,11 +718,11 @@ void K3bVcdTrackDialog::setDefinedNumKeys( ) while ( it.current() ) { int itemId = it.current() ->text( 0 ).toInt(); - TQMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.tqfind( itemId ); + TQMap<int, K3bVcdTrack*>::const_iterator keyit = definedkeysmap.find( itemId ); if ( keyit != definedkeysmap.end() ) { if ( keyit.data() ) { - if ( m_tracks.tqfindRef( keyit.data() ) >= 0 ) { + if ( m_tracks.findRef( keyit.data() ) >= 0 ) { it.current() ->setText( 1 , displayName( keyit.data() ) ) ; } else { it.current() ->setText( 1 , "" ) ; diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 1b17d95..e57bfa4 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -208,7 +208,7 @@ bool KoStore::open( const TQString & _name ) if ( m_mode == Write ) { kdDebug(s_area) << "KoStore: opening for writing '" << m_sName << "'" << endl; - if ( m_strFiles.tqfindIndex( m_sName ) != -1 ) // just check if it's there + if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; //return KIO::ERR_FILE_ALREADY_EXIST; @@ -379,7 +379,7 @@ bool KoStore::enterDirectory( const TQString& directory ) bool success = true; TQString tmp( directory ); - while ( ( pos = tmp.tqfind( '/' ) ) != -1 && + while ( ( pos = tmp.find( '/' ) ) != -1 && ( success = enterDirectoryInternal( tmp.left( pos ) ) ) ) tmp = tmp.mid( pos + 1 ); @@ -562,7 +562,7 @@ TQString KoStore::expandEncodedPath( TQString intern ) const TQString result; int pos; - if ( ( pos = intern.tqfindRev( '/', -1 ) ) != -1 ) { + if ( ( pos = intern.findRev( '/', -1 ) ) != -1 ) { result = expandEncodedDirectory( intern.left( pos ) ) + '/'; intern = intern.mid( pos + 1 ); } @@ -595,7 +595,7 @@ TQString KoStore::expandEncodedDirectory( TQString intern ) const TQString result; int pos; - while ( ( pos = intern.tqfind( '/' ) ) != -1 ) { + while ( ( pos = intern.find( '/' ) ) != -1 ) { if ( TQChar(intern.at(0)).isDigit() ) result += "part"; result += intern.left( pos + 1 ); // copy numbers (or "pictures") + "/" diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 5c8070c..c03db69 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -171,7 +171,7 @@ void K3bAudioConvertingOptionWidget::slotUpdateFreeTempSpace() TQString path = m_editBaseDir->url(); if( !TQFile::exists( path ) ) - path.truncate( path.tqfindRev('/') ); + path.truncate( path.findRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) { @@ -257,7 +257,7 @@ void K3bAudioConvertingOptionWidget::saveConfig( KConfigBase* c ) c->writeEntry( "create_playlist", m_checkCreatePlaylist->isChecked() ); c->writeEntry( "relative_path_in_playlist", m_checkPlaylistRelative->isChecked() ); - if( d->extensionMap.tqcontains(m_comboFileType->currentItem()) ) + if( d->extensionMap.contains(m_comboFileType->currentItem()) ) c->writeEntry( "filetype", d->extensionMap[m_comboFileType->currentItem()] ); else c->writeEntry( "filetype", "wav" ); diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp index 6d5cdf5..d0051e5 100644 --- a/src/rip/k3baudioprojectconvertingthread.cpp +++ b/src/rip/k3baudioprojectconvertingthread.cpp @@ -108,7 +108,7 @@ void K3bAudioProjectConvertingThread::run() if( m_singleFile ) { TQString& filename = m_tracks[0].second; - TQString dir = filename.left( filename.tqfindRev("/") ); + TQString dir = filename.left( filename.findRev("/") ); if( !KStandardDirs::makeDir( dir ) ) { emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitFinished(false); @@ -194,7 +194,7 @@ void K3bAudioProjectConvertingThread::run() bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const TQString& filename ) { - TQString dir = filename.left( filename.tqfindRev("/") ); + TQString dir = filename.left( filename.findRev("/") ); if( !KStandardDirs::makeDir( dir ) ) { emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); return false; @@ -301,7 +301,7 @@ void K3bAudioProjectConvertingThread::cancel() bool K3bAudioProjectConvertingThread::writePlaylist() { // this is an absolut path so there is always a "/" - TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) ); + TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); if( !KStandardDirs::makeDir( playlistDir ) ) { emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); @@ -324,8 +324,8 @@ bool K3bAudioProjectConvertingThread::writePlaylist() if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() ) t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl; else - t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1, - m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5) + t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1, + m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5) << endl; // filename without extension // filename @@ -345,9 +345,9 @@ bool K3bAudioProjectConvertingThread::writePlaylist() if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() ) t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl; else - t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1, + t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1, m_tracks[i].second.length() - - m_tracks[i].second.tqfindRev("/") - 5) + - m_tracks[i].second.findRev("/") - 5) << endl; // filename without extension // filename @@ -406,7 +406,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile() // use the same base name as the image file TQString cueFile = m_tracks[0].second; - cueFile.truncate( cueFile.tqfindRev(".") ); + cueFile.truncate( cueFile.findRev(".") ); cueFile += ".cue"; emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); @@ -421,17 +421,17 @@ TQString K3bAudioProjectConvertingThread::findRelativePath( const TQString& absP TQString path = K3b::fixupPath( absPath ); // both paths have an equal beginning. That's just how it's configured by K3b - int pos = baseDir_.tqfind( "/" ); + int pos = baseDir_.find( "/" ); int oldPos = pos; while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) { oldPos = pos; - pos = baseDir_.tqfind( "/", pos+1 ); + pos = baseDir_.find( "/", pos+1 ); } // now the paths are equal up to oldPos, so that's how "deep" we go path = path.mid( oldPos+1 ); baseDir_ = baseDir_.mid( oldPos+1 ); - int numberOfDirs = baseDir_.tqcontains( '/' ); + int numberOfDirs = baseDir_.contains( '/' ); for( int i = 0; i < numberOfDirs; ++i ) path.prepend( "../" ); diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp index 48e8780..9c410ad 100644 --- a/src/rip/k3baudioripthread.cpp +++ b/src/rip/k3baudioripthread.cpp @@ -194,7 +194,7 @@ void K3bAudioRipThread::run() if( m_singleFile ) { TQString& filename = m_tracks[0].second; - TQString dir = filename.left( filename.tqfindRev("/") ); + TQString dir = filename.left( filename.findRev("/") ); if( !KStandardDirs::makeDir( dir, 0777 ) ) { d->paranoiaLib->close(); emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); @@ -298,7 +298,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename ) long trackSectorsRead = 0; - TQString dir = filename.left( filename.tqfindRev("/") ); + TQString dir = filename.left( filename.findRev("/") ); if( !KStandardDirs::makeDir( dir, 0777 ) ) { emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); return false; @@ -444,7 +444,7 @@ void K3bAudioRipThread::cleanupAfterCancellation() bool K3bAudioRipThread::writePlaylist() { // this is an absolut path so there is always a "/" - TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) ); + TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); if( !KStandardDirs::makeDir( playlistDir ) ) { emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); @@ -467,8 +467,8 @@ bool K3bAudioRipThread::writePlaylist() if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() ) t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl; else - t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1, - m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5) + t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1, + m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5) << endl; // filename without extension // filename @@ -488,9 +488,9 @@ bool K3bAudioRipThread::writePlaylist() if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() ) t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl; else - t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1, + t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1, m_tracks[i].second.length() - - m_tracks[i].second.tqfindRev("/") - 5) + - m_tracks[i].second.findRev("/") - 5) << endl; // filename without extension // filename @@ -548,7 +548,7 @@ bool K3bAudioRipThread::writeCueFile() // use the same base name as the image file TQString cueFile = m_tracks[0].second; - cueFile.truncate( cueFile.tqfindRev(".") ); + cueFile.truncate( cueFile.findRev(".") ); cueFile += ".cue"; emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); @@ -563,17 +563,17 @@ TQString K3bAudioRipThread::findRelativePath( const TQString& absPath, const TQS TQString path = K3b::fixupPath( absPath ); // both paths have an equal beginning. That's just how it's configured by K3b - int pos = baseDir_.tqfind( "/" ); + int pos = baseDir_.find( "/" ); int oldPos = pos; while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) { oldPos = pos; - pos = baseDir_.tqfind( "/", pos+1 ); + pos = baseDir_.find( "/", pos+1 ); } // now the paths are equal up to oldPos, so that's how "deep" we go path = path.mid( oldPos+1 ); baseDir_ = baseDir_.mid( oldPos+1 ); - int numberOfDirs = baseDir_.tqcontains( '/' ); + int numberOfDirs = baseDir_.contains( '/' ); for( int i = 0; i < numberOfDirs; ++i ) path.prepend( "../" ); diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp index 4d25ad2..d83fe49 100644 --- a/src/rip/k3bpatternparser.cpp +++ b/src/rip/k3bpatternparser.cpp @@ -28,7 +28,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, unsigned int trackNumber, const TQString& pattern, - bool tqreplace, + bool replace, const TQString& replaceString ) { if( entry.titles.count() < trackNumber ) @@ -115,18 +115,18 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, switch( c ) { case ARTIST: s = entry.artists[trackNumber-1]; - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); // for conditional inclusion + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); // for conditional inclusion dir.append( s.isEmpty() ? i18n("unknown") + TQString(" %1").tqarg(trackNumber) : s ); break; case TITLE: s = entry.titles[trackNumber-1]; - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); dir.append( s.isEmpty() ? i18n("Track %1").tqarg(trackNumber) : s ); @@ -139,16 +139,16 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, break; case COMMENT: s = entry.extInfos[trackNumber-1]; - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); dir.append( s ); break; case GENRE: s = ( entry.genre.isEmpty() ? entry.category : entry.genre ); - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); dir.append( s ); break; case ALBUMARTIST: @@ -157,17 +157,17 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, break; case ALBUMTITLE: s = entry.cdTitle; - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); dir.append( s.isEmpty() ? i18n("unknown") : s ); break; case ALBUMCOMMENT: s = entry.cdExtInfo; - s.tqreplace( '/', '_' ); - s.tqreplace( '*', '_' ); - s.tqreplace( '}', '*' ); + s.replace( '/', '_' ); + s.replace( '*', '_' ); + s.replace( '}', '*' ); dir.append( s ); // I think it makes more sense to allow empty comments break; case DATE: @@ -267,7 +267,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, else { // with string matching, e.g. ?y='2004'{text} // Be aware that there might be ' in the condition text - int endOfCondition = dir.tqfind( '{', offset+4 )-1; + int endOfCondition = dir.find( '{', offset+4 )-1; TQString condition = dir.mid( offset+4, endOfCondition - (offset+4) ); @@ -280,7 +280,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, isIncluded = !isIncluded; // Leave it when it's '@'. - dir.tqreplace( offset, length, ( isIncluded ? inclusion : TQString("") ) ); + dir.replace( offset, length, ( isIncluded ? inclusion : TQString("") ) ); if( isIncluded == TRUE ) i -= length - inclusion.length(); @@ -289,17 +289,17 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, continue; - } // end of tqreplace (at closing bracket '}') + } // end of replace (at closing bracket '}') } // end of conditional inclusion for(...) // end of Conditional Inclusion */ - dir.tqreplace( '*', '}' ); // bring the brackets back, if there were any + dir.replace( '*', '}' ); // bring the brackets back, if there were any - if( tqreplace ) - dir.tqreplace( TQRegExp( "\\s" ), replaceString ); + if( replace ) + dir.replace( TQRegExp( "\\s" ), replaceString ); return dir; } diff --git a/src/rip/k3bpatternparser.h b/src/rip/k3bpatternparser.h index 1f2cf86..3cf79e1 100644 --- a/src/rip/k3bpatternparser.h +++ b/src/rip/k3bpatternparser.h @@ -31,7 +31,7 @@ class K3bPatternParser static TQString parsePattern( const K3bCddbResultEntry& entry, unsigned int trackNumber, const TQString& pattern, - bool tqreplace = false, + bool replace = false, const TQString& replaceString = "_" ); private: diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index 9d6e8bc..c4da751 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -90,7 +90,7 @@ void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) TQStringList::Iterator end( lines.end()); for ( TQStringList::Iterator str = lines.begin(); str != end; ++str ) { - if ( ( *str ).tqcontains( "<?xml" ) ) + if ( ( *str ).contains( "<?xml" ) ) m_isXml = true; if ( m_isXml ) @@ -98,7 +98,7 @@ void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len ) else kdDebug() << "(K3bVideoCdInfo::slotParseOutput) " << *str << endl; - if ( ( *str ).tqcontains( "</videocd>" ) ) + if ( ( *str ).contains( "</videocd>" ) ) m_isXml = false; } } diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index a649e6e..04cf41b 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -97,7 +97,7 @@ void K3bVideoCdRip::vcdxRip() if ( !bin ) { kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl; - emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); @@ -288,7 +288,7 @@ void K3bVideoCdRip::slotVcdXRipFinished() void K3bVideoCdRip::parseInformation( TQString text ) { // parse warning - if ( text.tqcontains( "encountered non-form2 sector" ) ) { + if ( text.contains( "encountered non-form2 sector" ) ) { // I think this is an error not a warning. Finish ripping with invalid mpegs. emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR ); emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR ); @@ -298,22 +298,22 @@ void K3bVideoCdRip::parseInformation( TQString text ) } // parse extra info - else if ( text.tqcontains( "detected extended VCD2.0 PBC files" ) ) + else if ( text.contains( "detected extended VCD2.0 PBC files" ) ) emit infoMessage( i18n( "detected extended VCD2.0 PBC files" ), K3bJob::INFO ); // parse startposition and extracting sequence info // extracting avseq05.mpg... (start lsn 32603 (+28514)) else if ( text.startsWith( "extracting" ) ) { - if ( text.tqcontains( "(start lsn" ) ) { - int index = text.tqfind( "(start lsn" ); - int end = text.tqfind( " (+" ); + if ( text.contains( "(start lsn" ) ) { + int index = text.find( "(start lsn" ); + int end = text.find( " (+" ); if ( end > 0) { m_subPosition = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong(); } else { // found segment here we can get only the start lsn :) // extracting item0001.mpg... (start lsn 225, 1 segments) - int end = text.tqfind( ",", index ); + int end = text.find( ",", index ); int overallPos = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong(); double relOverallWritten = ( ( double ) overallPos * 2352 ) / ( double ) m_videooptions ->getVideoCdSize() ; int newpercent = ( int ) ( 100 * relOverallWritten ); @@ -325,17 +325,17 @@ void K3bVideoCdRip::parseInformation( TQString text ) index = 11; - end = text.tqfind( "(start lsn" ); + end = text.find( "(start lsn" ); emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) ); } // parse extracting files info // extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1) - else if ( text.tqcontains( "(lsn" ) && text.tqcontains( "size" ) ) { + else if ( text.contains( "(lsn" ) && text.contains( "size" ) ) { int index = 11; - int end = text.tqfind( "to" ); + int end = text.find( "to" ); TQString extractFileName = text.mid( index, end - index ).stripWhiteSpace(); - index = text.tqfind( " to " ); - end = text.tqfind( " (lsn" ); + index = text.find( " to " ); + end = text.find( " (lsn" ); TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace(); emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) ); } diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 24e3d2e..c8dbe6f 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -220,7 +220,7 @@ void K3bVideoCdRippingDialog::slotUpdateFreeSpace() TQString path = m_editDirectory->url(); if( !TQFile::exists( path ) ) - path.truncate( path.tqfindRev('/') ); + path.truncate( path.findRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index bb7bbcf..072052f 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -262,7 +262,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilenames() it != m_titleRipInfos.end(); ++it ) { TQString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) ); if( m_w->m_checkBlankReplace->isChecked() ) - f.tqreplace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); + f.replace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); it.data().filename = baseDir + f; it.key()->setText( 3, f ); } @@ -331,7 +331,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob:: // first check if we have a long keyword instead of a one-char // if( pattern[i] == '{' ) { - int j = pattern.tqfind( '}', i ); + int j = pattern.find( '}', i ); if( j < 0 ) // no closing bracket -> no valid pattern c = '*'; else { diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 06214a0..a9cbb6c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -249,7 +249,7 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace() TQString path = m_editBaseDir->url(); if( !TQFile::exists( path ) ) - path.truncate( path.tqfindRev('/') ); + path.truncate( path.findRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) { |