summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commitc745472a20636092d8529f962135b0943ff11927 (patch)
treed2a2ff3997f2b43a2cf70fc7351664f0a05a9744
parent6e24611a77d1b0536ae78c9f43b2bada96edae9e (diff)
downloadknemo-c745472a.tar.gz
knemo-c745472a.zip
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
-rw-r--r--src/kcm/configdialog.cpp2
-rw-r--r--src/knemod/backends/nettoolsbackend.cpp18
-rw-r--r--src/knemod/backends/sysbackend.cpp2
-rw-r--r--src/knemod/interfacetray.cpp2
-rw-r--r--src/knemod/knemodaemon.cpp4
5 files changed, 14 insertions, 14 deletions
diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index dd25b06..c212f6d 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -461,7 +461,7 @@ void ConfigDialog::defaults()
for ( unsigned int i = 2; i < content.count(); i++ )
{
TQString interface = content[i].simplifyWhiteSpace();
- interface = interface.left( interface.tqfind( ':' ) );
+ interface = interface.left( interface.find( ':' ) );
if ( interface == "lo" )
continue;
diff --git a/src/knemod/backends/nettoolsbackend.cpp b/src/knemod/backends/nettoolsbackend.cpp
index c89d47c..8f54fa4 100644
--- a/src/knemod/backends/nettoolsbackend.cpp
+++ b/src/knemod/backends/nettoolsbackend.cpp
@@ -185,7 +185,7 @@ void NetToolsBackend::parseIfconfigOutput()
TQStringList::Iterator it;
for ( it = ifList.begin(); it != ifList.end(); ++it )
{
- int index = ( *it ).tqfind( ' ' );
+ int index = ( *it ).find( ' ' );
if ( index == -1 )
continue;
TQString key = ( *it ).left( index );
@@ -203,7 +203,7 @@ void NetToolsBackend::parseIfconfigOutput()
TQString key = ifIt.currentKey();
Interface* interface = ifIt.current();
- if ( configs.tqfind( key ) == configs.end() )
+ if ( configs.find( key ) == configs.end() )
{
// The interface does not exist. Meaning the driver
// isn't loaded and/or the interface has not been created.
@@ -211,8 +211,8 @@ void NetToolsBackend::parseIfconfigOutput()
interface->getData().available = false;
}
// JJ 2005-07-18: use RUNNING instead of UP to detect whether interface is connected
- else if ( !configs[key].tqcontains( "inet " ) ||
- !configs[key].tqcontains( "RUNNING" ) )
+ else if ( !configs[key].contains( "inet " ) ||
+ !configs[key].contains( "RUNNING" ) )
{
// The interface is up or has an IP assigned but not both
interface->getData().existing = true;
@@ -221,7 +221,7 @@ void NetToolsBackend::parseIfconfigOutput()
else
{
// ...determine the type of the interface
- if ( configs[key].tqcontains( "Ethernet" ) )
+ if ( configs[key].contains( "Ethernet" ) )
interface->setType( Interface::ETHERNET );
else
interface->setType( Interface::PPP );
@@ -350,7 +350,7 @@ void NetToolsBackend::parseIwconfigOutput()
TQStringList::Iterator it;
for ( it = ifList.begin(); it != ifList.end(); ++it )
{
- int index = ( *it ).tqfind( ' ' );
+ int index = ( *it ).find( ' ' );
if ( index == -1 )
continue;
TQString key = ( *it ).left( index );
@@ -367,12 +367,12 @@ void NetToolsBackend::parseIwconfigOutput()
TQString key = ifIt.currentKey();
Interface* interface = ifIt.current();
- if ( configs.tqfind( key ) == configs.end() )
+ if ( configs.find( key ) == configs.end() )
{
// The interface was not found.
continue;
}
- else if ( configs[key].tqcontains( "no wireless extensions" ) )
+ else if ( configs[key].contains( "no wireless extensions" ) )
{
// The interface isn't a wireless device.
interface->getData().wirelessDevice = false;
@@ -483,7 +483,7 @@ void NetToolsBackend::parseRouteOutput()
TQString key = ifIt.currentKey();
Interface* interface = ifIt.current();
- if ( configs.tqfind( key ) != configs.end() )
+ if ( configs.find( key ) != configs.end() )
{
// Update the default gateway.
TQStringList routeParameter = configs[key];
diff --git a/src/knemod/backends/sysbackend.cpp b/src/knemod/backends/sysbackend.cpp
index 3ad48ea..14e4285 100644
--- a/src/knemod/backends/sysbackend.cpp
+++ b/src/knemod/backends/sysbackend.cpp
@@ -76,7 +76,7 @@ void SysBackend::update()
TQString key = ifIt.currentKey();
Interface* interface = ifIt.current();
- if ( ifList.tqfind( key ) == ifList.end() )
+ if ( ifList.find( key ) == ifList.end() )
{
// The interface does not exist. Meaning the driver
// isn't loaded and/or the interface has not been created.
diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp
index 6b8812f..d0102db 100644
--- a/src/knemod/interfacetray.cpp
+++ b/src/knemod/interfacetray.cpp
@@ -73,7 +73,7 @@ void InterfaceTray::resizeEvent ( TQResizeEvent * )
void InterfaceTray::mousePressEvent( TQMouseEvent* e )
{
- if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) )
+ if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) )
return;
switch( e->button() )
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index 5accc6d..313ccb6 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -287,7 +287,7 @@ void KNemoDaemon::reparseConfiguration()
TQDictIterator<Interface> it( mInterfaceDict );
for ( ; it.current(); )
{
- if ( settingsDict.tqfind( it.currentKey() ) == 0 )
+ if ( settingsDict.find( it.currentKey() ) == 0 )
{
config->deleteGroup( "Interface_" + it.currentKey() );
mInterfaceDict.remove( it.currentKey() );
@@ -304,7 +304,7 @@ void KNemoDaemon::reparseConfiguration()
for ( ; setIt.current(); ++setIt )
{
Interface* iface;
- if ( mInterfaceDict.tqfind( setIt.currentKey() ) == 0 )
+ if ( mInterfaceDict.find( setIt.currentKey() ) == 0 )
{
iface = new Interface( setIt.currentKey(), mGeneralData, mPlotterSettings );
mInterfaceDict.insert( setIt.currentKey(), iface );