rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knemo@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 6e24611a77
commit c745472a20

@ -461,7 +461,7 @@ void ConfigDialog::defaults()
for ( unsigned int i = 2; i < content.count(); i++ ) for ( unsigned int i = 2; i < content.count(); i++ )
{ {
TQString interface = content[i].simplifyWhiteSpace(); TQString interface = content[i].simplifyWhiteSpace();
interface = interface.left( interface.tqfind( ':' ) ); interface = interface.left( interface.find( ':' ) );
if ( interface == "lo" ) if ( interface == "lo" )
continue; continue;

@ -185,7 +185,7 @@ void NetToolsBackend::parseIfconfigOutput()
TQStringList::Iterator it; TQStringList::Iterator it;
for ( it = ifList.begin(); it != ifList.end(); ++it ) for ( it = ifList.begin(); it != ifList.end(); ++it )
{ {
int index = ( *it ).tqfind( ' ' ); int index = ( *it ).find( ' ' );
if ( index == -1 ) if ( index == -1 )
continue; continue;
TQString key = ( *it ).left( index ); TQString key = ( *it ).left( index );
@ -203,7 +203,7 @@ void NetToolsBackend::parseIfconfigOutput()
TQString key = ifIt.currentKey(); TQString key = ifIt.currentKey();
Interface* interface = ifIt.current(); Interface* interface = ifIt.current();
if ( configs.tqfind( key ) == configs.end() ) if ( configs.find( key ) == configs.end() )
{ {
// The interface does not exist. Meaning the driver // The interface does not exist. Meaning the driver
// isn't loaded and/or the interface has not been created. // isn't loaded and/or the interface has not been created.
@ -211,8 +211,8 @@ void NetToolsBackend::parseIfconfigOutput()
interface->getData().available = false; interface->getData().available = false;
} }
// JJ 2005-07-18: use RUNNING instead of UP to detect whether interface is connected // JJ 2005-07-18: use RUNNING instead of UP to detect whether interface is connected
else if ( !configs[key].tqcontains( "inet " ) || else if ( !configs[key].contains( "inet " ) ||
!configs[key].tqcontains( "RUNNING" ) ) !configs[key].contains( "RUNNING" ) )
{ {
// The interface is up or has an IP assigned but not both // The interface is up or has an IP assigned but not both
interface->getData().existing = true; interface->getData().existing = true;
@ -221,7 +221,7 @@ void NetToolsBackend::parseIfconfigOutput()
else else
{ {
// ...determine the type of the interface // ...determine the type of the interface
if ( configs[key].tqcontains( "Ethernet" ) ) if ( configs[key].contains( "Ethernet" ) )
interface->setType( Interface::ETHERNET ); interface->setType( Interface::ETHERNET );
else else
interface->setType( Interface::PPP ); interface->setType( Interface::PPP );
@ -350,7 +350,7 @@ void NetToolsBackend::parseIwconfigOutput()
TQStringList::Iterator it; TQStringList::Iterator it;
for ( it = ifList.begin(); it != ifList.end(); ++it ) for ( it = ifList.begin(); it != ifList.end(); ++it )
{ {
int index = ( *it ).tqfind( ' ' ); int index = ( *it ).find( ' ' );
if ( index == -1 ) if ( index == -1 )
continue; continue;
TQString key = ( *it ).left( index ); TQString key = ( *it ).left( index );
@ -367,12 +367,12 @@ void NetToolsBackend::parseIwconfigOutput()
TQString key = ifIt.currentKey(); TQString key = ifIt.currentKey();
Interface* interface = ifIt.current(); Interface* interface = ifIt.current();
if ( configs.tqfind( key ) == configs.end() ) if ( configs.find( key ) == configs.end() )
{ {
// The interface was not found. // The interface was not found.
continue; continue;
} }
else if ( configs[key].tqcontains( "no wireless extensions" ) ) else if ( configs[key].contains( "no wireless extensions" ) )
{ {
// The interface isn't a wireless device. // The interface isn't a wireless device.
interface->getData().wirelessDevice = false; interface->getData().wirelessDevice = false;
@ -483,7 +483,7 @@ void NetToolsBackend::parseRouteOutput()
TQString key = ifIt.currentKey(); TQString key = ifIt.currentKey();
Interface* interface = ifIt.current(); Interface* interface = ifIt.current();
if ( configs.tqfind( key ) != configs.end() ) if ( configs.find( key ) != configs.end() )
{ {
// Update the default gateway. // Update the default gateway.
TQStringList routeParameter = configs[key]; TQStringList routeParameter = configs[key];

@ -76,7 +76,7 @@ void SysBackend::update()
TQString key = ifIt.currentKey(); TQString key = ifIt.currentKey();
Interface* interface = ifIt.current(); Interface* interface = ifIt.current();
if ( ifList.tqfind( key ) == ifList.end() ) if ( ifList.find( key ) == ifList.end() )
{ {
// The interface does not exist. Meaning the driver // The interface does not exist. Meaning the driver
// isn't loaded and/or the interface has not been created. // isn't loaded and/or the interface has not been created.

@ -73,7 +73,7 @@ void InterfaceTray::resizeEvent ( TQResizeEvent * )
void InterfaceTray::mousePressEvent( TQMouseEvent* e ) void InterfaceTray::mousePressEvent( TQMouseEvent* e )
{ {
if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) ) if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) )
return; return;
switch( e->button() ) switch( e->button() )

@ -287,7 +287,7 @@ void KNemoDaemon::reparseConfiguration()
TQDictIterator<Interface> it( mInterfaceDict ); TQDictIterator<Interface> it( mInterfaceDict );
for ( ; it.current(); ) for ( ; it.current(); )
{ {
if ( settingsDict.tqfind( it.currentKey() ) == 0 ) if ( settingsDict.find( it.currentKey() ) == 0 )
{ {
config->deleteGroup( "Interface_" + it.currentKey() ); config->deleteGroup( "Interface_" + it.currentKey() );
mInterfaceDict.remove( it.currentKey() ); mInterfaceDict.remove( it.currentKey() );
@ -304,7 +304,7 @@ void KNemoDaemon::reparseConfiguration()
for ( ; setIt.current(); ++setIt ) for ( ; setIt.current(); ++setIt )
{ {
Interface* iface; Interface* iface;
if ( mInterfaceDict.tqfind( setIt.currentKey() ) == 0 ) if ( mInterfaceDict.find( setIt.currentKey() ) == 0 )
{ {
iface = new Interface( setIt.currentKey(), mGeneralData, mPlotterSettings ); iface = new Interface( setIt.currentKey(), mGeneralData, mPlotterSettings );
mInterfaceDict.insert( setIt.currentKey(), iface ); mInterfaceDict.insert( setIt.currentKey(), iface );

Loading…
Cancel
Save