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

4 files changed, 19 insertions, 19 deletions

diff --git a/libk3bdevice/k3bcdtext.h b/libk3bdevice/k3bcdtext.h
index dd78d5e..d172299 100644
--- a/libk3bdevice/k3bcdtext.h
+++ b/libk3bdevice/k3bcdtext.h
@@ -84,7 +84,7 @@ namespace K3bDevice
 
     private:
       // TODO: remove this (see above)
-      void fixup( TQString& s ) { s.tqreplace( '/', "_" ); s.tqreplace( '\"', "_" ); }
+      void fixup( TQString& s ) { s.replace( '/', "_" ); s.replace( '\"', "_" ); }
 
       TQString m_title;
       TQString m_performer;
@@ -177,7 +177,7 @@ namespace K3bDevice
 	
     private:
       // TODO: remove this (see above)
-      void fixup( TQString& s ) { s.tqreplace( '/', "_" ); s.tqreplace( '\"', "_" ); }
+      void fixup( TQString& s ) { s.replace( '/', "_" ); s.replace( '\"', "_" ); }
 
       const TQString& textForPackType( int packType, unsigned int track ) const;
       unsigned int textLengthForPackType( int packType ) const;
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index 29e7dbe..c20c1c0 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -1651,7 +1651,7 @@ bool K3bDevice::Device::setAutoEjectEnabled( bool enabled ) const
 
 void K3bDevice::Device::addDeviceNode( const TQString& n )
 {
-  if( !d->allNodes.tqcontains( n ) )
+  if( !d->allNodes.contains( n ) )
     d->allNodes.append( n );
 }
 
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index fcf5bfc..c417c65 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -170,7 +170,7 @@ K3bDevice::Device* K3bDevice::DeviceManager::findDevice( const TQString& devicen
   }
   TQPtrListIterator<K3bDevice::Device> it( d->allDevices );
   while( it.current() ) {
-    if( it.current()->deviceNodes().tqcontains(devicename) )
+    if( it.current()->deviceNodes().contains(devicename) )
       return it.current();
 
     ++it;
@@ -271,7 +271,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
 
     TQRegExp re("[\t\n:]+");
     while( info.readLine( line, 80 ) > 0 ) {
-      if( line.tqcontains("drive name") > 0 ) {
+      if( line.contains("drive name") > 0 ) {
 	int i = 1;
 	TQString dev;
 	while( !(dev = line.section(re, i, i)).isEmpty() ) {
@@ -285,7 +285,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
 	  // each physical device the next line should be better
 	  //      else if ( dev.startsWith("sr") )
 	  if ( dev.startsWith("sr") ) {
-	    if( addDevice(TQString("/dev/%1").tqarg(dev.tqreplace(TQRegExp("r"),"cd"))) )
+	    if( addDevice(TQString("/dev/%1").tqarg(dev.replace(TQRegExp("r"),"cd"))) )
 	      devstring += dev + "|";
 	  }
 	  ++i;
@@ -591,14 +591,14 @@ bool K3bDevice::DeviceManager::saveConfig( KConfig* c )
   // remove duplicate entries (caused by buggy old implementations)
   TQStringList saveDeviceSearchPath;
   for( TQStringList::const_iterator it = deviceSearchPath.constBegin(); it != deviceSearchPath.constEnd(); ++it )
-    if( !saveDeviceSearchPath.tqcontains( *it ) )
+    if( !saveDeviceSearchPath.contains( *it ) )
       saveDeviceSearchPath.append( *it );
 
   for( TQPtrListIterator<K3bDevice::Device> it( d->allDevices ); *it; ++it ) {
     K3bDevice::Device* dev = *it;
 
     // update device search path
-    if( !saveDeviceSearchPath.tqcontains( dev->blockDeviceName() ) )
+    if( !saveDeviceSearchPath.contains( dev->blockDeviceName() ) )
       saveDeviceSearchPath.append( dev->blockDeviceName() );
 
     // save the device type settings
diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp
index d57b346..23f9af5 100644
--- a/libk3bdevice/k3bhalconnection.cpp
+++ b/libk3bdevice/k3bhalconnection.cpp
@@ -223,7 +223,7 @@ void K3bDevice::HalConnection::addDevice( const char* udi )
 	TQCString du( deviceUdi );
 	libhal_free_string( deviceUdi );
 
-	if( d->udiDeviceMap.tqcontains( du ) ) {
+	if( d->udiDeviceMap.contains( du ) ) {
 	  //
 	  // A new medium has been inserted. Save this medium's udi so we can reuse it later
 	  // on for the mount/unmount/eject methods
@@ -239,7 +239,7 @@ void K3bDevice::HalConnection::addDevice( const char* udi )
 
 void K3bDevice::HalConnection::removeDevice( const char* udi )
 {
-  TQMapIterator<TQCString, TQString> it = d->udiDeviceMap.tqfind( udi );
+  TQMapIterator<TQCString, TQString> it = d->udiDeviceMap.find( udi );
   if( it != d->udiDeviceMap.end() ) {
     k3bDebug() << "Unmapping udi " << udi << " from device " << it.data() << endl;
     emit deviceRemoved( it.data() );
@@ -253,7 +253,7 @@ void K3bDevice::HalConnection::removeDevice( const char* udi )
 	TQCString du( deviceUdi );
 	libhal_free_string( deviceUdi );
 
-	if( d->udiDeviceMap.tqcontains( du ) ) {
+	if( d->udiDeviceMap.contains( du ) ) {
 	  //
 	  // A medium has been removed/ejected.
 	  //
@@ -276,7 +276,7 @@ int K3bDevice::HalConnection::lock( Device* dev )
   DBusMessage* reply = 0;
   DBusError error;
 
-  if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) {
+  if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) {
     return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
   }
 
@@ -335,7 +335,7 @@ int K3bDevice::HalConnection::unlock( Device* dev )
   DBusMessage* reply = 0;
   DBusError error;
 
-  if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) ) {
+  if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) ) {
     return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
   }
 
@@ -394,10 +394,10 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev,
   DBusMessage* reply = 0;
   DBusError error;
 
-  if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) )
+  if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
     return org_freedesktop_Hal_NoSuchDevice;
 
-  if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) )
+  if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
     return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
 
   TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]];
@@ -474,10 +474,10 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev,
   DBusMessage* reply = 0;
   DBusError error;
 
-  if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) )
+  if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
     return org_freedesktop_Hal_NoSuchDevice;
 
-  if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) )
+  if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
     return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
 
   TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]];
@@ -545,10 +545,10 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev,
   DBusMessage* reply = 0;
   DBusError error;
 
-  if( !d->deviceUdiMap.tqcontains( dev->blockDeviceName() ) )
+  if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
     return org_freedesktop_Hal_NoSuchDevice;
 
-  if( !d->deviceMediumUdiMap.tqcontains( d->deviceUdiMap[dev->blockDeviceName()] ) )
+  if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
     return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
 
   TQCString mediumUdi = d->deviceMediumUdiMap[d->deviceUdiMap[dev->blockDeviceName()]];