1 files changed, 23 insertions, 23 deletions

diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index 878b9460..22fa96ae 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -287,19 +287,19 @@ void Interface_wireless_wirelessextensions::setNoActiveDevice( )
   has_mode = false;
   mode = 0;
   has_key = 0;
-  key = TQString::null;
+  key = TQString();
   key_size = 0;
   key_flags = 0;
-  essid = TQString::null;
-  access_point_address = TQString::null;
-  ip_address = TQString::null;
+  essid = TQString();
+  access_point_address = TQString();
+  ip_address = TQString();
   bitrate = 0;
   has_range = false;
   has_txpower = false;
   txpower_disabled = 0;
 
   // propagate the changes
-  setActiveDevice( TQString::null );
+  setActiveDevice( TQString() );
 }
 
 TQStringList Interface_wireless_wirelessextensions::available_wifi_devices()
@@ -313,7 +313,7 @@ TQStringList Interface_wireless_wirelessextensions::available_wifi_devices()
   TQString device;
   while (!procnetdev.atEnd()) {
 	  procnetdev.readLine (device, 9999);
-	  int pos = device.find (':');
+	  int pos = device.tqfind (':');
 	  if (pos == -1)
 		continue;
 	  device = device.left(pos).stripWhiteSpace();
@@ -353,7 +353,7 @@ bool Interface_wireless_wirelessextensions::autodetect_device()
   	wireless_info info;
 	int result = get_info (socket, device, info);
 	if ((result != -ENODEV) && (result != -ENOTSUP) &&
-	    (!ignoreInterfaces || ignoreInterfaces->findIndex(device)==-1))
+	    (!ignoreInterfaces || ignoreInterfaces->tqfindIndex(device)==-1))
 	{
 		setActiveDevice(device);
 	}
@@ -564,29 +564,29 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist )
   while ( iwlist->readln ( data, true ) >= 0 )
     {
       kdDebug (  ) << "iwlist: " << data << "\n";
-      if ( data.contains ( "does not support scanning" ) )
+      if ( data.tqcontains ( "does not support scanning" ) )
         KMessageBox::sorry ( 0,
                              i18n
                              ( "Your card does not support scanning. The results window will not contain any results." ),
                              i18n ( "Scanning not possible" ) );
-      if ( data.contains ( "Scan completed" ) )
+      if ( data.tqcontains ( "Scan completed" ) )
         cellcount = 0;          // at the very beginning of a scan
-      if ( data.contains ( "Cell" ) ) {
+      if ( data.tqcontains ( "Cell" ) ) {
         cellcount++;            // new cell discovered
 	networks->setNumRows ( networks->numRows() +1 );
 	ignoreRemainingBits = false;
       }
-      if ( data.contains ( "ESSID:" ) )
+      if ( data.tqcontains ( "ESSID:" ) )
         {
-          TQString ssid = data.mid ( data.find ( "\"" ) + 1, data.length (  ) - data.find ( "\"" ) - 2 );
+          TQString ssid = data.mid ( data.tqfind ( "\"" ) + 1, data.length (  ) - data.tqfind ( "\"" ) - 2 );
 	  if ((ssid=="") || (ssid==" ")) ssid = "(hidden cell)";
           networks->setText ( cellcount - 1, 0, ssid );
         }
-      if ( data.contains ( "Mode:" ) )
+      if ( data.tqcontains ( "Mode:" ) )
         {
-          if ( data.contains ( "Master" ) )
+          if ( data.tqcontains ( "Master" ) )
             networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Managed" ) ) );
-          if ( data.contains ( "Ad-Hoc" ) )
+          if ( data.tqcontains ( "Ad-Hoc" ) )
             networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Ad-Hoc" ) ) );
 	  // if could be that this cell belongs to an SSID already discovered, or that there are more than one
 	  // hidden cells, which doesn't give any new information. So, we first search for duplicates and delete 
@@ -605,31 +605,31 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist )
 	      }
 	  }
         }
-      if ( !ignoreRemainingBits && data.contains ( "Encryption key:" ) )
+      if ( !ignoreRemainingBits && data.tqcontains ( "Encryption key:" ) )
         {
-          if ( data.contains ( "off" ) )
+          if ( data.tqcontains ( "off" ) )
             networks->setText ( cellcount - 1, 3, TQString ( "off" ) );
           else
             networks->setText ( cellcount - 1, 3, TQString ( "on" ) );
         }
-      if ( !ignoreRemainingBits && data.contains ( "Quality:" ) )
+      if ( !ignoreRemainingBits && data.tqcontains ( "Quality:" ) )
         {
-          TQString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 );
+          TQString quality = data.mid ( data.tqfind ( ":" ) + 1, data.tqfind ( "/" ) - data.tqfind ( ":" ) - 1 );
           networks->setText ( cellcount - 1, 2, quality );
         }
       
-      if ( !ignoreRemainingBits && data.contains ( "Quality=" ) )
+      if ( !ignoreRemainingBits && data.tqcontains ( "Quality=" ) )
         {
-          TQString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 );
+          TQString quality = data.mid ( data.tqfind ( "=" ) + 1, data.tqfind ( "/" ) - data.tqfind ( "=" ) - 1 );
           networks->setText ( cellcount - 1, 2, quality );
         }
       
-      if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) )
+      if ( !ignoreRemainingBits && data.tqcontains ( "wpa_ie" ) )
 	{
 	  networks->setText ( cellcount - 1, 3, TQString ( "WPA" ) );
 	}
       
-      if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) )
+      if ( !ignoreRemainingBits && data.tqcontains ( "rsn_ie" ) )
         {
           networks->setText ( cellcount - 1, 3, TQString ( "WPA2" ) );
         }