summaryrefslogtreecommitdiffstats
path: root/kutils
diff options
context:
space:
mode:
Diffstat (limited to 'kutils')
-rw-r--r--kutils/kcmoduleproxy.cpp2
-rw-r--r--kutils/kcmultidialog.cpp4
-rw-r--r--kutils/kfind.cpp18
-rw-r--r--kutils/kpluginselector.cpp4
-rw-r--r--kutils/ksettings/dialog.cpp4
-rw-r--r--kutils/ksettings/dispatcher.cpp6
6 files changed, 19 insertions, 19 deletions
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index f4b4a9655..9ce81f700 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -347,7 +347,7 @@ void KCModuleProxy::runAsRoot()
/* Remove all kdesu switches */
while( cmd.length() > 1 && cmd[ 0 ] == '-' )
- cmd = TQString(cmd.remove( 0, cmd.tqfind( ' ' ) )).stripWhiteSpace();
+ cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace();
}
if (cmd.left(8) == "kcmshell")
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index d9ea63d9e..768f787fe 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -148,7 +148,7 @@ void KCMultiDialog::apply()
TQStringList * names = moduleParentComponents[ m ];
kdDebug(710) << k_funcinfo << *names << " saved and added to the list" << endl;
for( TQStringList::ConstIterator it = names->begin(); it != names->end(); ++it )
- if( updatedModules.tqfind( *it ) == updatedModules.end() )
+ if( updatedModules.find( *it ) == updatedModules.end() )
updatedModules.append( *it );
}
}
@@ -275,7 +275,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo,
return;
}
KCModuleProxy * module;
- if( m_orphanModules.tqcontains( moduleinfo.service() ) )
+ if( m_orphanModules.contains( moduleinfo.service() ) )
{
// the KCModule already exists - it was removed from the dialog in
// removeAllModules
diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp
index 0bd5aa892..7b2da6899 100644
--- a/kutils/kfind.cpp
+++ b/kutils/kfind.cpp
@@ -368,7 +368,7 @@ KFind::Result KFind::find()
delete d->emptyMatch;
d->emptyMatch = new Private::Match( d->currentId, m_index, m_matchedLength );
} else
- d->incrementalPath.tqreplace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
+ d->incrementalPath.replace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength));
if ( m_pattern.length() < d->matchedPattern.length() )
{
@@ -471,7 +471,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
while (index >= 0)
{
// ...find the next match.
- index = text.tqfindRev(pattern, index, caseSensitive);
+ index = text.findRev(pattern, index, caseSensitive);
if (index == -1)
break;
@@ -488,7 +488,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
while (index < (int)text.length())
{
// ...find the next match.
- index = text.tqfind(pattern, index, caseSensitive);
+ index = text.find(pattern, index, caseSensitive);
if (index == -1)
break;
@@ -507,11 +507,11 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o
// Non-whole-word search.
if (options & KFindDialog::FindBackwards)
{
- index = text.tqfindRev(pattern, index, caseSensitive);
+ index = text.findRev(pattern, index, caseSensitive);
}
else
{
- index = text.tqfind(pattern, index, caseSensitive);
+ index = text.find(pattern, index, caseSensitive);
}
if (index != -1)
{
@@ -532,7 +532,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
while (index >= 0)
{
// ...find the next match.
- index = text.tqfindRev(pattern, index);
+ index = text.findRev(pattern, index);
if (index == -1)
break;
@@ -551,7 +551,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
while (index < (int)text.length())
{
// ...find the next match.
- index = text.tqfind(pattern, index);
+ index = text.find(pattern, index);
if (index == -1)
break;
@@ -572,11 +572,11 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o
// Non-whole-word search.
if (options & KFindDialog::FindBackwards)
{
- index = text.tqfindRev(pattern, index);
+ index = text.findRev(pattern, index);
}
else
{
- index = text.tqfind(pattern, index);
+ index = text.find(pattern, index);
}
if (index != -1)
{
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 505e165a5..fcd6dcae7 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -332,7 +332,7 @@ void KPluginSelectionWidget::updateConfigPage( KPluginInfo * plugininfo,
d->kps->configPage( 1 );
else
{
- if( !d->widgetIDs.tqcontains( plugininfo->pluginName() ) )
+ if( !d->widgetIDs.contains( plugininfo->pluginName() ) )
// if no widget exists for the plugin create it
embeddPluginKCMs( plugininfo, checked );
else
@@ -464,7 +464,7 @@ void KPluginSelectionWidget::save()
names->append( TQString::null );
for( TQStringList::ConstIterator nameit = names->begin();
nameit != names->end(); ++nameit )
- if( updatedModules.tqfind( *nameit ) == updatedModules.end() )
+ if( updatedModules.find( *nameit ) == updatedModules.end() )
updatedModules.append( *nameit );
}
for( TQStringList::ConstIterator it = updatedModules.begin(); it != updatedModules.end(); ++it )
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index aedfee9d4..3ec83aeee 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -484,12 +484,12 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const
pcit != parentComponents.end(); ++pcit )
{
// if the parentComponent is not registered ignore it
- if( d->registeredComponents.tqfind( *pcit ) ==
+ if( d->registeredComponents.find( *pcit ) ==
d->registeredComponents.end() )
continue;
// we check if the parent component is a plugin
- if( ! d->plugininfomap.tqcontains( *pcit ) )
+ if( ! d->plugininfomap.contains( *pcit ) )
{
// if not the KCModule must be enabled
enabled = true;
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index b3a92f600..7f20c1bc3 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -67,7 +67,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
kdDebug( 701 ) << k_funcinfo << instanceName << endl;
m_instanceName[ recv ] = instanceName;
TQSignal * sig;
- if( m_instanceInfo.tqcontains( instanceName ) )
+ if( m_instanceInfo.contains( instanceName ) )
{
sig = m_instanceInfo[ instanceName ].signal;
}
@@ -86,7 +86,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const
KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
{
kdDebug( 701 ) << k_funcinfo << endl;
- if( m_instanceInfo.tqcontains( instanceName ) )
+ if( m_instanceInfo.contains( instanceName ) )
{
KInstance * inst = m_instanceInfo[ instanceName ].instance;
if( inst )
@@ -111,7 +111,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName )
{
kdDebug( 701 ) << k_funcinfo << instanceName << endl;
// check if the instanceName is valid:
- if( ! m_instanceInfo.tqcontains( instanceName ) )
+ if( ! m_instanceInfo.contains( instanceName ) )
return;
// first we reparse the config of the instance so that the KConfig object
// will be up to date