6 files changed, 11 insertions, 11 deletions
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 9cb2037eb..9b5ec5006 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -69,7 +69,7 @@ bool HelpWidget::clicked(const TQString & _url)
     if ( _url.isNull() )
         return true;
 
-    if ( _url.tqfind('@') > -1 ) {
+    if ( _url.find('@') > -1 ) {
         kapp->invokeMailer(_url);
         return true;
     }
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index c8e9bdc01..c6df5cb71 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -92,7 +92,7 @@ void ModuleIconView::fill()
      // go-back node
      ModuleIconItem *i = new ModuleIconItem(this, i18n("Back"), icon);
      i->setOrderNo(0);
-     int last_slash = _path.tqfindRev('/', -2);
+     int last_slash = _path.findRev('/', -2);
      if (last_slash == -1)
         i->setTag(TQString::null);
      else
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 908b6003e..ad60eda5a 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -70,7 +70,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
      // Item names may contain ampersands. To avoid them being converted to 
      // accelators, replace them with two ampersands.
      TQString name = group->caption();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
   
      parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
                         , name, menu);
@@ -85,7 +85,7 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
      // Item names may contain ampersands. To avoid them being converted to 
      // accelators, replace them with two ampersands.
      TQString name = module->moduleName();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
 
      int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
                                      , name, id);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 11317c2d2..b2ece7c33 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -174,7 +174,7 @@ void ConfigModule::runAsRoot()
       // remove all kdesu switches
       while( cmd.length() > 1 && cmd[ 0 ] == '-' )
         {
-          int pos = cmd.tqfind( ' ' );
+          int pos = cmd.find( ' ' );
           cmd = TQString(cmd.remove( 0, pos )).stripWhiteSpace();
         }
     }
@@ -316,7 +316,7 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path)
 
 TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path)
 {
-  Menu *menu = subMenus.tqfind(path);
+  Menu *menu = subMenus.find(path);
   if (menu)
      return menu->modules;
 
@@ -325,7 +325,7 @@ TQPtrList<ConfigModule> ConfigModuleList::modules(const TQString &path)
 
 TQStringList ConfigModuleList::submenus(const TQString &path)
 {
-  Menu *menu = subMenus.tqfind(path);
+  Menu *menu = subMenus.find(path);
   if (menu)
      return menu->submenus;
 
@@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module)
   Menu *menu;
   for(;(menu = it.current());++it)
   {
-     if (menu->modules.tqcontainsRef(module))
+     if (menu->modules.containsRef(module))
         return it.currentKey();
   }
   return TQString::null;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index d685f7fe8..fda83854f 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
 {
   while (item)
     {
-      setOpen(item, parentList-.tqcontains(item));
+      setOpen(item, parentList-.contains(item));
 
           if (item->childCount() != 0)
                 expandItem(item->firstChild(), parentList);
@@ -356,7 +356,7 @@ void ModuleTreeItem::setGroup(const TQString &path)
 {
   KServiceGroup::Ptr group = KServiceGroup::group(path);
   TQString defName = path.left(path.length()-1);
-  int pos = defName.tqfindRev('/');
+  int pos = defName.findRev('/');
   if (pos >= 0)
      defName = defName.mid(pos+1);
   if (group && group->isValid())
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index a4023f88c..4389a10fe 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -514,7 +514,7 @@ void TopLevel::aboutModule()
 
 TQString TopLevel::handleAmpersand( TQString modulename ) const
 {
-   if( modulename.tqcontains( '&' )) // double it
+   if( modulename.contains( '&' )) // double it
    {
       for( int i = modulename.length();
            i >= 0;