summaryrefslogtreecommitdiffstats
path: root/src/projects
diff options
context:
space:
mode:
Diffstat (limited to 'src/projects')
-rw-r--r--src/projects/k3baudiotrackview.cpp12
-rw-r--r--src/projects/k3bdatadirtreeview.cpp6
-rw-r--r--src/projects/k3bdatafileview.cpp4
-rw-r--r--src/projects/k3bdataimagesettingswidget.cpp4
-rw-r--r--src/projects/k3bdatapropertiesdialog.cpp4
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp10
-rw-r--r--src/projects/k3bmovixlistview.cpp6
-rw-r--r--src/projects/k3bmovixoptionswidget.cpp2
-rw-r--r--src/projects/k3bmusicbrainzjob.cpp4
-rw-r--r--src/projects/k3bvcdlistview.cpp2
-rw-r--r--src/projects/k3bvcdtrackdialog.cpp6
-rw-r--r--src/projects/kostore/koStore.cc8
12 files changed, 34 insertions, 34 deletions
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") + "/"