rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

7 files changed, 16 insertions, 16 deletions

diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 3b571ef..75f2dac 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -134,7 +134,7 @@ void BrowseDialog::applyFilter( TQListViewItem *item )
         return;
     }
 
-    if ( item->text( 0 ).tqfind( filterText, 0 /*index*/, false /*case sensitive*/ ) == -1 ) {
+    if ( item->text( 0 ).find( filterText, 0 /*index*/, false /*case sensitive*/ ) == -1 ) {
         item->setVisible( false );
         return;
     }
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index ede7a52..f5c1d24 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -123,7 +123,7 @@ void ConfigPage::modifyHost()
     if ( !currentItem )
         return;
 
-    HostConfigMap::Iterator hostIt = m_hosts.tqfind( currentItem->text( 0 ) );
+    HostConfigMap::Iterator hostIt = m_hosts.find( currentItem->text( 0 ) );
     if ( hostIt == m_hosts.end() )
         return;
 
@@ -147,7 +147,7 @@ void ConfigPage::removeHost()
     if ( !currentItem )
         return;
 
-    HostConfigMap::Iterator hostIt = m_hosts.tqfind( currentItem->text( 0 ) );
+    HostConfigMap::Iterator hostIt = m_hosts.find( currentItem->text( 0 ) );
     if ( hostIt == m_hosts.end() )
         return;
 
@@ -191,7 +191,7 @@ void ConfigPage::modifyMonitor()
     if ( !currentItem )
         return;
 
-    MonitorConfigMap::Iterator monitorIt = m_monitors.tqfind( currentItem->text( 0 ) );
+    MonitorConfigMap::Iterator monitorIt = m_monitors.find( currentItem->text( 0 ) );
     if ( monitorIt == m_monitors.end() )
         return;
 
@@ -215,7 +215,7 @@ void ConfigPage::removeMonitor()
     if ( !currentItem )
         return;
 
-    MonitorConfigMap::Iterator monitorIt = m_monitors.tqfind( currentItem->text( 0 ) );
+    MonitorConfigMap::Iterator monitorIt = m_monitors.find( currentItem->text( 0 ) );
     if ( monitorIt == m_monitors.end() )
         return;
 
diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp
index e8eceab..2ea7314 100644
--- a/ksim/monitors/snmp/hostdialog.cpp
+++ b/ksim/monitors/snmp/hostdialog.cpp
@@ -163,7 +163,7 @@ void HostDialog::loadSettingsFromHostConfig( const HostConfig &src )
     hostName->setText( src.name );
     port->setValue( src.port );
 
-    snmpVersion->setCurrentItem( allSnmpVersions().tqfindIndex( snmpVersionToString( src.version ) ) );
+    snmpVersion->setCurrentItem( allSnmpVersions().findIndex( snmpVersionToString( src.version ) ) );
 
     if ( src.version != SnmpVersion3 ) {
         communityString->setText( src.community );
@@ -172,18 +172,18 @@ void HostDialog::loadSettingsFromHostConfig( const HostConfig &src )
 
     securityName->setText( src.securityName );
 
-    securityLevel->setCurrentItem( allSecurityLevels().tqfindIndex( securityLevelToString( src.securityLevel ) ) );
+    securityLevel->setCurrentItem( allSecurityLevels().findIndex( securityLevelToString( src.securityLevel ) ) );
 
     if ( src.securityLevel == NoAuthPriv )
         return;
 
-    authenticationType->setCurrentItem( allAuthenticationProtocols().tqfindIndex( authenticationProtocolToString( src.authentication.protocol ) ) );
+    authenticationType->setCurrentItem( allAuthenticationProtocols().findIndex( authenticationProtocolToString( src.authentication.protocol ) ) );
     authenticationPassphrase->setText( src.authentication.key );
 
     if ( src.securityLevel == AuthNoPriv )
         return;
 
-    privacyType->setCurrentItem( allPrivacyProtocols().tqfindIndex( privacyProtocolToString( src.privacy.protocol ) ) );
+    privacyType->setCurrentItem( allPrivacyProtocols().findIndex( privacyProtocolToString( src.privacy.protocol ) ) );
     privacyPassphrase->setText( src.privacy.key );
 }
 
diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp
index e8ae261..5e7ea34 100644
--- a/ksim/monitors/snmp/labelmonitor.cpp
+++ b/ksim/monitors/snmp/labelmonitor.cpp
@@ -32,8 +32,8 @@ void LabelMonitor::setData( const Value &data )
 
      if ( m_config.useCustomFormatString ) {
          TQString text = m_config.customFormatString;
-         text.tqreplace( "%n", m_config.name );
-         text.tqreplace( "%s", dataString );
+         text.replace( "%n", m_config.name );
+         text.replace( "%s", dataString );
          setText( text );
      } else
          setText( m_config.name + ": " + dataString );
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 6a77813..b8cd756 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -39,7 +39,7 @@ bool MonitorConfig::load( KConfigBase &config, const HostConfigMap &hosts )
     if ( hostName.isEmpty() )
         return false;
 
-    HostConfigMap::ConstIterator hostIt = hosts.tqfind( hostName );
+    HostConfigMap::ConstIterator hostIt = hosts.find( hostName );
     if ( hostIt == hosts.end() )
         return false;
 
diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp
index 297a818..574f244 100644
--- a/ksim/monitors/snmp/monitordialog.cpp
+++ b/ksim/monitors/snmp/monitordialog.cpp
@@ -144,14 +144,14 @@ void MonitorDialog::init( const MonitorConfig &monitor )
 
     assert( allHosts.findIndex( monitor.host.name ) != -1 );
 
-    host->setCurrentItem( allHosts.tqfindIndex( monitor.host.name ) );
+    host->setCurrentItem( allHosts.findIndex( monitor.host.name ) );
 
     oid->setText( monitor.oid );
 
     updateIntervalMinutes->setValue( monitor.refreshInterval.minutes );
     updateIntervalSeconds->setValue( monitor.refreshInterval.seconds );
 
-    displayType->setCurrentItem( allDisplayTypes().tqfindIndex( monitorDisplayTypeToString( monitor.display ) ) );
+    displayType->setCurrentItem( allDisplayTypes().findIndex( monitorDisplayTypeToString( monitor.display ) ) );
 
     customFormatStringCheckBox->setChecked( monitor.useCustomFormatString );
     customFormatString->setEnabled( monitor.useCustomFormatString );
@@ -166,7 +166,7 @@ void MonitorDialog::init( const MonitorConfig &monitor )
 
 HostConfig MonitorDialog::currentHost() const
 {
-    HostConfigMap::ConstIterator hostIt = m_hosts.tqfind( host->currentText() );
+    HostConfigMap::ConstIterator hostIt = m_hosts.find( host->currentText() );
     if ( hostIt == m_hosts.end() )
         return HostConfig();
 
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 07dc77e..2f16adc 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -235,7 +235,7 @@ bool Session::snmpGet( const Identifier &identifier, Value &value, ErrorInfo *er
     if ( !snmpGet( ids, vars, error ) )
         return false;
 
-    ValueMap::ConstIterator it = vars.tqfind( identifier );
+    ValueMap::ConstIterator it = vars.find( identifier );
     if ( it == vars.end() ) {
         if ( error )
             *error = ErrorInfo( ErrorInfo::ErrMissingVariables );