rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 24 insertions, 24 deletions

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 0ac7ede2..562d74ed 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   for (int i = 0; i < tb->count(); i++)
   {
     toolbarName = tb->label(i);
-    toolbarName.tqreplace(r, "");
+    toolbarName.replace(r, "");
     item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8()));
     actionTreeView->insertItem(item);
 
@@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
           action = ac->action(node.toElement().attribute("name").ascii());
           if (action)
           {
-            oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name());
+            oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
             oldActionItem->setPixmap(0, SmallIcon(action->icon()) );
           }
         }
         node = node.nextSibling();
       }
-      if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName)
+      if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName)
       {
          item->setOpen(true);
          if (item->firstChild())
@@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   for (uint i = 0; i < acCount; i++)
   {
     action = ac->action(i);
-    item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""),  action->shortcut().toString(), action->name());
+    item = new KListViewItem(allActionsItem, action->text().replace(r, ""),  action->shortcut().toString(), action->name());
     item->setPixmap(0, SmallIcon(action->icon()) );
   }
   allActionsItem->sortChildItems(0, true);
@@ -168,7 +168,7 @@ void ActionConfigDialog::slotAddToolbar()
   for (int i = 0; i < tb->count(); i++)
   {
     toolbarName = tb->label(i);
-    if (!actionTreeView->tqfindItem(toolbarName, 0))
+    if (!actionTreeView->findItem(toolbarName, 0))
     {
       item = actionTreeView->lastItem();
       if (item->tqparent())
@@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar()
       ToolbarEntry *p_toolbar = m_toolbarList[toolbarId];
       if (p_toolbar)
       {
-        oldItem = actionTreeView->tqfindItem(toolbarName, 0);
+        oldItem = actionTreeView->findItem(toolbarName, 0);
         item = new KListViewItem(actionTreeView, oldItem, toolbarName);
         item->setOpen(oldItem->isOpen());
         delete oldItem;
@@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar()
             action = ac->action(node.toElement().attribute("name").ascii());
             if (action)
             {
-              oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
+              oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
               oldItem->setPixmap(0, SmallIcon(action->icon()));
             }
           }
@@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         actionIcon->setIcon(s);
       }
       TQString actionText = el.attribute("text");
-      actionText.tqreplace(TQRegExp("\\&(?!\\&)"),"");
+      actionText.replace(TQRegExp("\\&(?!\\&)"),"");
       lineText->setText(actionText);
       lineToolTip->setText( el.attribute("tooltip") );
       selectedShortcut = action->shortcut();
@@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         {
           outputBox->setCurrentItem(2);
         } else
-        if (s == "tqreplace")
+        if (s == "replace")
         {
           outputBox->setCurrentItem(3);
         } else
@@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         {
           errorBox->setCurrentItem(2);
         } else
-        if (s == "tqreplace")
+        if (s == "replace")
         {
           errorBox->setCurrentItem(3);
         } else
@@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction()
   currentAction->setIcon(s);
   TQString oldText = el.attribute("text");
   s = lineText->text();
-  s.tqreplace('&', "&&");
+  s.replace('&', "&&");
   el.setAttribute("text", s);
   currentAction->setText(s);
   s = lineToolTip->text();
@@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction()
           case 2:{ item.setAttribute("output", "selection");
                    break;
                  }
-          case 3:{ item.setAttribute("output", "tqreplace");
+          case 3:{ item.setAttribute("output", "replace");
                    break;
                  }
           case 4:{ item.setAttribute("output", "new");
@@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction()
           case 2:{ item.setAttribute("error", "selection");
                    break;
                  }
-          case 3:{ item.setAttribute("error", "tqreplace");
+          case 3:{ item.setAttribute("error", "replace");
                    break;
                  }
           case 4:{ item.setAttribute("error", "new");
@@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction()
     if (p_toolbar)
     {
       TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild();
-      bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch);
+      bool placeOnToolbar = toolbarListBox->findItem(toolbarName, TQt::ExactMatch);
       while (!node.isNull())
       {
         if (node.nodeName() == "Action" &&
@@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction()
         item.setAttribute("name",el.attribute("name"));
         p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item);
       //put it also in the treeview
-        listItem = actionTreeView->tqfindItem(toolbarName, 0);
+        listItem = actionTreeView->findItem(toolbarName, 0);
         if (listItem)
         {
           TQListViewItem *after = listItem->firstChild();
@@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
 {
   TQString shortcutText = shortcut.toString();
   TQString shortcutText2;
-  int pos = shortcutText.tqfind(';');
+  int pos = shortcutText.find(';');
   if (pos != -1)
   {
     shortcutText2 = shortcutText.mid(pos + 1);
     shortcutText = shortcutText.left(pos);
   }
   TQString s = shortcutText;
-  s.tqreplace('+', "\\+");
+  s.replace('+', "\\+");
   TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";");
   s = shortcutText2;
-  s.tqreplace('+', "\\+");
+  s.replace('+', "\\+");
   TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";");
   TQString global;
 //check for conflicting global shortcuts
   TQMap<TQString, TQString>::Iterator it;
   for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it )
   {
-    if (it.data().tqcontains(shortcutRx))
+    if (it.data().contains(shortcutRx))
     {
       global = it.key();
       break;
     }
-    if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2))
+    if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2))
     {
       shortcutText = shortcutText2;
       global = it.key();
@@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
         for (uint i = 0; i < ac->count(); i++)
         {
           KAction *action = ac->action(i);
-          if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx))
+          if (action != currentAction && action->shortcut().toString().contains(shortcutRx))
           {
             global = action->text();
             break;
           }
-          if (!shortcutText2.isEmpty() && action != currentAction &&  action->shortcut().toString().tqcontains(shortcutRx))
+          if (!shortcutText2.isEmpty() && action != currentAction &&  action->shortcut().toString().contains(shortcutRx))
           {
             shortcutText = shortcutText2;
             global = action->text();
@@ -761,7 +761,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
     selectedShortcut = shortcut;
   } else
   {
-    global.tqreplace('&',"");
+    global.replace('&',"");
     TQString s =  i18n("The '%1' key combination has already been allocated "
                 "to the \"%2\" action.\n"
                 "Please choose a unique key combination.").
@@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar()
   TQStringList lst;
   for (i = 0; i < tb->count(); i++)
   {
-    if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch))
+    if (!toolbarListBox->findItem(tb->label(i), TQt::ExactMatch))
         lst << tb->label(i);
   }