rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 15 insertions, 15 deletions

diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp
index 01936667..395cbc58 100644
--- a/wifi/kcmwifi/vendorconfig.cpp
+++ b/wifi/kcmwifi/vendorconfig.cpp
@@ -89,7 +89,7 @@ VendorConfig::initSuSE_92plus (  )
 	      TQString var = buffer.section ( '=', 0, 0 );
 	      TQString value = buffer.section ( '=', 1, 1 );
 	      value = value.mid ( 1, value.length (  ) - 3 );
-	      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
+	      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
 	      // evaluate the meaningful lines
 	      if ( var == "WIRELESS_ESSID" )
 		{
@@ -182,7 +182,7 @@ is incremented _after_ successful setup of each given config. */
 // lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla
       TQString var = buffer.section ( ' ', 0, 0 );
       TQString value = buffer.section ( ' ', 1, 1 );
-      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
+      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
 // evaluate the meaningful lines
       if ( var.tqstartsWith ( "wireless", false ) )
 	{
@@ -191,7 +191,7 @@ is incremented _after_ successful setup of each given config. */
 	      newtab->le_networkName->setText ( value );
 	    }
 
-	  else if ( var.endsWith ( "mode" ) && !var.tqcontains ( "key" ) )
+	  else if ( var.endsWith ( "mode" ) && !var.contains ( "key" ) )
 
 	    {
 	      newtab->cmb_wifiMode->setCurrentItem ( IfConfig::convertToWifiModeFromString ( value ) );
@@ -203,15 +203,15 @@ is incremented _after_ successful setup of each given config. */
 	      newtab->cmb_speed->setCurrentItem ( IfConfig::convertToSpeedFromString ( value ) );
 	    }
 
-	  else if ( var.tqcontains ( "key" ) )
+	  else if ( var.contains ( "key" ) )
 	    {
 // Could be any of key, key1, key2, ..., or defaultkey
-	      if ( var.tqcontains ( "default" ) )
+	      if ( var.contains ( "default" ) )
 		{
 		  crypto->cmb_activeKey->setCurrentItem ( value.toInt (  ) );
 		}
 
-	      else if ( var.tqcontains ( "mode" ) )
+	      else if ( var.contains ( "mode" ) )
 		{
 		  if ( value == "shared" || value == "sharedkey" || value == "restricted" )
 		    {
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 1f3087ba..bce6afd9 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -246,9 +246,9 @@ TQString WifiConfig::autoDetectInterface()
   while ( !procFile.atEnd() )
   {
     procFile.readLine( line, 9999 );
-    if ( line.tqfind( ":" ) > 0 )
+    if ( line.find( ":" ) > 0 )
     {
-      line.truncate ( line.tqfind( ":" ) );
+      line.truncate ( line.find( ":" ) );
       list.append( line.stripWhiteSpace() );
     }
   }
@@ -264,7 +264,7 @@ TQString WifiConfig::autoDetectInterface()
 
   for ( TQStringList::Iterator it = list.begin (); it != list.end (); ++it )
   {
-    if ( ((*it).tqcontains("wifi"))==0 ) { // if the name is wifiX, ignore
+    if ( ((*it).contains("wifi"))==0 ) { // if the name is wifiX, ignore
       KProcIO test;
       test << "iwconfig";
       test << *it;
@@ -288,9 +288,9 @@ void WifiConfig::slotTestInterface( KProcIO *proc )
 {
   TQString output;
   proc->readln( output );
-  if ( output.tqfind ( "no wireless extensions" ) == -1 )
+  if ( output.find ( "no wireless extensions" ) == -1 )
   {
-    output.truncate( output.tqfind ( " " ) );
+    output.truncate( output.find ( " " ) );
     m_detectedInterface = output.stripWhiteSpace();
     printf("[kcontrol wificonfig] Wireless extensions not available on specified interface\n\r");
   }
@@ -328,7 +328,7 @@ Key IfConfig::activeKey()
 
 IfConfig::Speed IfConfig::convertToSpeedFromString( const TQString &s )
 {
-  return ( IfConfig::Speed )speedList.tqfindIndex( s );
+  return ( IfConfig::Speed )speedList.findIndex( s );
 }
 
 void IfConfig::speedFromString( const TQString &s )
@@ -338,7 +338,7 @@ void IfConfig::speedFromString( const TQString &s )
 
 IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const TQString &s )
 {
-  return ( IfConfig::WifiMode )wifiModeList.tqfindIndex( s );
+  return ( IfConfig::WifiMode )wifiModeList.findIndex( s );
 }
 
 void IfConfig::wifimodeFromString( const TQString &s )
@@ -348,7 +348,7 @@ void IfConfig::wifimodeFromString( const TQString &s )
 
 IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const TQString &s )
 {
-  return ( IfConfig::CryptoMode )cryptoModeList.tqfindIndex( s );
+  return ( IfConfig::CryptoMode )cryptoModeList.findIndex( s );
 }
 
 void IfConfig::cryptomodeFromString( const TQString &s )
@@ -358,7 +358,7 @@ void IfConfig::cryptomodeFromString( const TQString &s )
 
 IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const TQString &s )
 {
-  return ( IfConfig::PowerMode )powerModeList.tqfindIndex( s );
+  return ( IfConfig::PowerMode )powerModeList.findIndex( s );
 }
 
 void IfConfig::powermodeFromString( const TQString &s )