summaryrefslogtreecommitdiffstats
path: root/libk3b/tools
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit33881ea4441221b1ca0789a72c4c7249d923a0df (patch)
treeffe5603da373bb346bb29c8e0f533776f66560a5 /libk3b/tools
parent6d99e1e138ae5aafc10f14682c48221bf563152e (diff)
downloadk3b-33881ea4441221b1ca0789a72c4c7249d923a0df.tar.gz
k3b-33881ea4441221b1ca0789a72c4c7249d923a0df.zip
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
Diffstat (limited to 'libk3b/tools')
-rw-r--r--libk3b/tools/k3bcdparanoialib.cpp2
-rw-r--r--libk3b/tools/k3bdevicecombobox.cpp8
-rw-r--r--libk3b/tools/k3bexceptions.cpp4
-rw-r--r--libk3b/tools/k3bfilesysteminfo.cpp2
-rw-r--r--libk3b/tools/k3bintmapcombobox.cpp4
-rw-r--r--libk3b/tools/k3biso9660.cpp10
-rw-r--r--libk3b/tools/k3blistview.cpp6
-rw-r--r--libk3b/tools/k3bmsfedit.cpp2
-rw-r--r--libk3b/tools/k3btitlelabel.cpp4
-rw-r--r--libk3b/tools/kcutlabel.cpp2
-rw-r--r--libk3b/tools/libisofs/COPYING4
11 files changed, 24 insertions, 24 deletions
diff --git a/libk3b/tools/k3bcdparanoialib.cpp b/libk3b/tools/k3bcdparanoialib.cpp
index c9339d1..3a011fd 100644
--- a/libk3b/tools/k3bcdparanoialib.cpp
+++ b/libk3b/tools/k3bcdparanoialib.cpp
@@ -189,7 +189,7 @@ class K3bCdparanoiaLibData
long sector() const { return m_currentSector; }
static K3bCdparanoiaLibData* data( K3bDevice::Device* dev ) {
- TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.tqfind( dev );
+ TQMap<K3bDevice::Device*, K3bCdparanoiaLibData*>::const_iterator it = s_dataMap.find( dev );
if( it == s_dataMap.constEnd() )
return new K3bCdparanoiaLibData( dev );
else
diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp
index e6ce8ce..4993e11 100644
--- a/libk3b/tools/k3bdevicecombobox.cpp
+++ b/libk3b/tools/k3bdevicecombobox.cpp
@@ -96,7 +96,7 @@ void K3bDeviceComboBox::addDevice( K3bDevice::Device* dev )
void K3bDeviceComboBox::removeDevice( K3bDevice::Device* dev )
{
if( dev ) {
- if( d->deviceIndexMap.tqcontains(dev->devicename()) ) {
+ if( d->deviceIndexMap.contains(dev->devicename()) ) {
// let's make it easy and recreate the whole list
K3bDevice::Device* selDev = selectedDevice();
TQPtrList<K3bDevice::Device> devices;
@@ -126,7 +126,7 @@ void K3bDeviceComboBox::refreshDevices( const TQPtrList<K3bDevice::Device>& list
{
K3bDevice::Device* selDev = selectedDevice();
clear();
- if( !list.tqcontainsRef( selDev ) )
+ if( !list.containsRef( selDev ) )
selDev = 0;
addDevices( list );
setSelectedDevice( selDev );
@@ -136,7 +136,7 @@ void K3bDeviceComboBox::refreshDevices( const TQPtrList<K3bDevice::Device>& list
void K3bDeviceComboBox::setSelectedDevice( K3bDevice::Device* dev )
{
if( dev ) {
- if( d->deviceIndexMap.tqcontains(dev->devicename()) ) {
+ if( d->deviceIndexMap.contains(dev->devicename()) ) {
setCurrentItem( d->deviceIndexMap[dev->devicename()] );
emit selectionChanged( dev );
}
@@ -162,7 +162,7 @@ void K3bDeviceComboBox::slotDeviceManagerChanged( K3bDevice::DeviceManager* dm )
{
unsigned int i = 0;
while( i < d->devices.size() ) {
- if( !dm->allDevices().tqcontainsRef( d->devices[i] ) ) {
+ if( !dm->allDevices().containsRef( d->devices[i] ) ) {
removeDevice( d->devices[i] );
i = 0;
}
diff --git a/libk3b/tools/k3bexceptions.cpp b/libk3b/tools/k3bexceptions.cpp
index 70c11e5..1d8806f 100644
--- a/libk3b/tools/k3bexceptions.cpp
+++ b/libk3b/tools/k3bexceptions.cpp
@@ -25,7 +25,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev )
if( dev->vendor().upper().startsWith("HL-DT-ST") )
if( dev->description().upper().startsWith("RW/DVD GCC-4320B") ||
- dev->description().upper().tqcontains("GCE-8520B") )
+ dev->description().upper().contains("GCE-8520B") )
return true;
if( dev->vendor().upper().startsWith("PHILIPS") &&
@@ -35,7 +35,7 @@ bool K3bExceptions::brokenDaoAudio( K3bDevice::Device* dev )
if( dev->vendor().upper().startsWith("LITE-ON") )
if( dev->description().upper().startsWith("LTR-32123S") ||
dev->description().upper().startsWith("LTR-40125S") ||
- dev->description().upper().tqcontains("LTC-48161H") ||
+ dev->description().upper().contains("LTC-48161H") ||
dev->description().upper().startsWith("DVDRW LDW-811S") )
return true;
diff --git a/libk3b/tools/k3bfilesysteminfo.cpp b/libk3b/tools/k3bfilesysteminfo.cpp
index 026643f..e7fc051 100644
--- a/libk3b/tools/k3bfilesysteminfo.cpp
+++ b/libk3b/tools/k3bfilesysteminfo.cpp
@@ -135,7 +135,7 @@ TQString K3bFileSystemInfo::fixupPath( const TQString& path )
{
TQString s = K3b::fixupPath( path );
if( type() == K3bFileSystemInfo::FS_FAT )
- return s.tqreplace( TQRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" );
+ return s.replace( TQRegExp("[\"\\?\\*/\\\\[\\]\\|\\=\\:;]"), "_" );
else
return s;
}
diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp
index cb5b2b3..c3db356 100644
--- a/libk3b/tools/k3bintmapcombobox.cpp
+++ b/libk3b/tools/k3bintmapcombobox.cpp
@@ -59,7 +59,7 @@ int K3bIntMapComboBox::selectedValue() const
void K3bIntMapComboBox::setSelectedValue( int value )
{
- if( d->valueIndexMap.tqcontains( value ) )
+ if( d->valueIndexMap.contains( value ) )
KComboBox::setCurrentItem( d->valueIndexMap[value] );
}
@@ -75,7 +75,7 @@ void K3bIntMapComboBox::clear()
bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQString& description, int index )
{
- if( d->valueIndexMap.tqcontains( value ) )
+ if( d->valueIndexMap.contains( value ) )
return false;
// FIXME: allow inserition at any index
diff --git a/libk3b/tools/k3biso9660.cpp b/libk3b/tools/k3biso9660.cpp
index ded2ce9..45e2d12 100644
--- a/libk3b/tools/k3biso9660.cpp
+++ b/libk3b/tools/k3biso9660.cpp
@@ -115,7 +115,7 @@ int K3bIso9660::isofs_callback( struct iso_directory_record *idr, void *udata )
path = isoPath;
// remove the version field
- int pos = path.tqfind( ';' );
+ int pos = path.find( ';' );
if( pos > 0 )
path.truncate( pos );
}
@@ -367,11 +367,11 @@ K3bIso9660Entry* K3bIso9660Directory::entry( const TQString& n )
name.truncate( name.length()-1 );
}
- int pos = name.tqfind( '/' );
+ int pos = name.find( '/' );
while( pos == 0 ) {
if( name.length() > 1 ) {
name = name.mid( 1 ); // remove leading slash
- pos = name.tqfind( '/' ); // look again
+ pos = name.find( '/' ); // look again
}
else // "/"
return this;
@@ -405,11 +405,11 @@ K3bIso9660Entry* K3bIso9660Directory::iso9660Entry( const TQString& n )
name.truncate( name.length()-1 );
}
- int pos = name.tqfind( '/' );
+ int pos = name.find( '/' );
while( pos == 0 ) {
if( name.length() > 1 ) {
name = name.mid( 1 ); // remove leading slash
- pos = name.tqfind( '/' ); // look again
+ pos = name.find( '/' ); // look again
}
else // "/"
return this;
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index f88fd45..4af4480 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -734,7 +734,7 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
}
else {
m_editorComboBox->insertStringList( item->comboStrings(col) );
- int current = item->comboStrings(col).tqfindIndex( item->text(col) );
+ int current = item->comboStrings(col).findIndex( item->text(col) );
if( current != -1 )
m_editorComboBox->setCurrentItem( current );
}
@@ -752,7 +752,7 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col )
m_editorLineEdit->setText( txt );
// select the edit text (handle extensions while doing so)
- int pos = txt.tqfindRev( '.' );
+ int pos = txt.findRev( '.' );
if( pos > 0 )
m_editorLineEdit->setSelection( 0, pos );
else
@@ -1258,7 +1258,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items )
bool alreadyDrawing = false;
TQRect r = tqitemRect( item );
if( r.isValid() ) {
- if( items.tqcontainsRef( item ) ) {
+ if( items.containsRef( item ) ) {
// paint all columns
int x = 0;
for( int i = 0; i < columns(); ++i ) {
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 47ecbfd..86c018a 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -134,7 +134,7 @@ int K3bMsfEdit::currentStepValue() const
TQString text = editor()->text();
if( text.length() == 8 ) {
text = text.mid( editor()->cursorPosition() );
- int num = text.tqcontains( ':' );
+ int num = text.contains( ':' );
if( num == 1 )
val = 75;
else if( num == 2 )
diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp
index ef21e17..db9edc0 100644
--- a/libk3b/tools/k3btitlelabel.cpp
+++ b/libk3b/tools/k3btitlelabel.cpp
@@ -81,10 +81,10 @@ public:
TQRect titleTipRect( startPos, 0, m_label->d->displayTitleLength, m_label->height() );
TQRect subTitleTipRect( startPos + m_label->d->displayTitleLength, 0, m_label->d->displaySubTitleLength, m_label->height() );
- if( titleTipRect.tqcontains( pos ) &&
+ if( titleTipRect.contains( pos ) &&
m_label->d->displayTitle != m_label->d->title )
tip( titleTipRect, m_label->d->title );
- else if( subTitleTipRect.tqcontains( pos ) &&
+ else if( subTitleTipRect.contains( pos ) &&
m_label->d->displaySubTitle != m_label->d->subTitle )
tip( subTitleTipRect, m_label->d->subTitle );
}
diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp
index d06c887..650f83d 100644
--- a/libk3b/tools/kcutlabel.cpp
+++ b/libk3b/tools/kcutlabel.cpp
@@ -82,7 +82,7 @@ void KCutLabel::cutTextToLabel()
TQToolTip::remove( this );
TQToolTip::hide();
- if( m_fullText.tqcontains( "\n" ) ) {
+ if( m_fullText.contains( "\n" ) ) {
TQString newText;
TQStringList lines = TQStringList::split( "\n", m_fullText );
for( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
diff --git a/libk3b/tools/libisofs/COPYING b/libk3b/tools/libisofs/COPYING
index 3f277a2..9fe1a71 100644
--- a/libk3b/tools/libisofs/COPYING
+++ b/libk3b/tools/libisofs/COPYING
@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which tqcontains
+ 0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include