diff options
Diffstat (limited to 'wifi/interface_wireless_wirelessextensions.cpp')
-rw-r--r-- | wifi/interface_wireless_wirelessextensions.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp index 22fa96ae..aad56fa6 100644 --- a/wifi/interface_wireless_wirelessextensions.cpp +++ b/wifi/interface_wireless_wirelessextensions.cpp @@ -313,7 +313,7 @@ TQStringList Interface_wireless_wirelessextensions::available_wifi_devices() TQString device; while (!procnetdev.atEnd()) { procnetdev.readLine (device, 9999); - int pos = device.tqfind (':'); + int pos = device.find (':'); 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->tqfindIndex(device)==-1)) + (!ignoreInterfaces || ignoreInterfaces->findIndex(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.tqcontains ( "does not support scanning" ) ) + if ( data.contains ( "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.tqcontains ( "Scan completed" ) ) + if ( data.contains ( "Scan completed" ) ) cellcount = 0; // at the very beginning of a scan - if ( data.tqcontains ( "Cell" ) ) { + if ( data.contains ( "Cell" ) ) { cellcount++; // new cell discovered networks->setNumRows ( networks->numRows() +1 ); ignoreRemainingBits = false; } - if ( data.tqcontains ( "ESSID:" ) ) + if ( data.contains ( "ESSID:" ) ) { - TQString ssid = data.mid ( data.tqfind ( "\"" ) + 1, data.length ( ) - data.tqfind ( "\"" ) - 2 ); + TQString ssid = data.mid ( data.find ( "\"" ) + 1, data.length ( ) - data.find ( "\"" ) - 2 ); if ((ssid=="") || (ssid==" ")) ssid = "(hidden cell)"; networks->setText ( cellcount - 1, 0, ssid ); } - if ( data.tqcontains ( "Mode:" ) ) + if ( data.contains ( "Mode:" ) ) { - if ( data.tqcontains ( "Master" ) ) + if ( data.contains ( "Master" ) ) networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Managed" ) ) ); - if ( data.tqcontains ( "Ad-Hoc" ) ) + if ( data.contains ( "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.tqcontains ( "Encryption key:" ) ) + if ( !ignoreRemainingBits && data.contains ( "Encryption key:" ) ) { - if ( data.tqcontains ( "off" ) ) + if ( data.contains ( "off" ) ) networks->setText ( cellcount - 1, 3, TQString ( "off" ) ); else networks->setText ( cellcount - 1, 3, TQString ( "on" ) ); } - if ( !ignoreRemainingBits && data.tqcontains ( "Quality:" ) ) + if ( !ignoreRemainingBits && data.contains ( "Quality:" ) ) { - TQString quality = data.mid ( data.tqfind ( ":" ) + 1, data.tqfind ( "/" ) - data.tqfind ( ":" ) - 1 ); + TQString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } - if ( !ignoreRemainingBits && data.tqcontains ( "Quality=" ) ) + if ( !ignoreRemainingBits && data.contains ( "Quality=" ) ) { - TQString quality = data.mid ( data.tqfind ( "=" ) + 1, data.tqfind ( "/" ) - data.tqfind ( "=" ) - 1 ); + TQString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } - if ( !ignoreRemainingBits && data.tqcontains ( "wpa_ie" ) ) + if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) ) { networks->setText ( cellcount - 1, 3, TQString ( "WPA" ) ); } - if ( !ignoreRemainingBits && data.tqcontains ( "rsn_ie" ) ) + if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) ) { networks->setText ( cellcount - 1, 3, TQString ( "WPA2" ) ); } |