rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

31 files changed, 120 insertions, 120 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 27280504..3a87a546 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -1026,10 +1026,10 @@ void LanguageOptions::loadCountryData()
     TQString tag = *it;
     int index;
 
-    index = tag.tqfindRev('/');
+    index = tag.findRev('/');
     if (index != -1) tag = tag.mid(index + 1);
 
-    index = tag.tqfindRev('.');
+    index = tag.findRev('.');
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
@@ -1051,9 +1051,9 @@ void LanguageOptions::loadCountryData()
     TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
 
     TQString tag = *sit;
-    int index = tag.tqfindRev('/');
+    int index = tag.findRev('/');
     tag.truncate(index);
-    index = tag.tqfindRev('/');
+    index = tag.findRev('/');
     tag = tag.mid(index+1);
 
     if (tag == "C")
@@ -1063,7 +1063,7 @@ void LanguageOptions::loadCountryData()
     TQValueList<int> langs;
 
     TQString pixmap = *sit;
-    index = pixmap.tqfindRev('/');
+    index = pixmap.findRev('/');
     pixmap.truncate(index);
     pixmap += "/flag.png";
 
@@ -1071,8 +1071,8 @@ void LanguageOptions::loadCountryData()
     {
       // Treat ie "en_GB" and "en_USE" as "en" because the language list
       // only contains the first letters
-      if ((*it).tqfind("_"))
-        *it = (*it).left((*it).tqfind("_"));
+      if ((*it).find("_"))
+        *it = (*it).left((*it).find("_"));
 
       int id = global_langset.indexShortId(*it);
       if (id > 0)
@@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData()
 
 void LanguageOptions::slotLangFromGlobalActivated(int i)
 {
-  if (countryIdMap.tqcontains(i))
+  if (countryIdMap.contains(i))
   {
     Country c = countryIdMap[i];
     bool first = true;
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index ec273397..1956976e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -113,7 +113,7 @@ void ProfilesDialog::slotStoreGroup()
 
 static bool extract (TQString &line, TQString &ret)
 {
-  int lim = line.tqfind (",");
+  int lim = line.find (",");
   if (lim < 0)
   {
     ret = "";
@@ -187,7 +187,7 @@ void ProfilesDialog::selectProfile(int profile)
     { // new style: multiple lessons
       int pos;
       line.remove(0, 1);
-      if ((pos = line.tqfind(')')) > 0)
+      if ((pos = line.find(')')) > 0)
       {
         s = line.left (pos);
         line.remove (0, pos+1);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 4b0c1155..8cb2346a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -107,7 +107,7 @@ void LessOptPage::slotModifyLesson()
   if (lessonList->count() != 0 && (int) lessonList->count() > act_lesson)
   {
     TQString str = lessonList->text (act_lesson);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     bool ok;
     TQString getLesson = KInputDialog::getText(
@@ -129,7 +129,7 @@ void LessOptPage::updateListBox(int start)
   for (int i = start; i < (int) lessonList->count(); i++)
   {
     str = lessonList->text (i);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -179,7 +179,7 @@ void LessOptPage::getLesson (TQComboBox *ret_lesson, vector<int> &ret_Index)
   TQString str;
   for (int i = 0; i < (int) lessonList->count(); i++) {
     str = lessonList->text(i);
-    int pos = str.tqfind (LESS_TAG);
+    int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     ret_lesson->insertItem (str);
   }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 30ed7369..5ec3c37a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -106,7 +106,7 @@ void TenseOptPage::slotModifyTense()
   if (tenseList->count() != 0 && (int) tenseList->count() > act_tense) 
   {
     TQString str = tenseList->text (act_tense);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     bool ok;
     TQString getTense = KInputDialog::getText(
@@ -128,7 +128,7 @@ void TenseOptPage::updateListBox(int start)
   for (int i = start; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text (i);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -185,7 +185,7 @@ void TenseOptPage::getTenseNames (vector<TQString> &ret_tense, vector<int> &ret_
   for (int i = 0; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text(i);
-    int pos = str.tqfind (TENSE_TAG);
+    int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     ret_tense.push_back (str);
   }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index 48fc09e1..ef16cd4e 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -105,7 +105,7 @@ void TypeOptPage::slotModifyType()
   if (typeList->count() != 0
       && (int) typeList->count() > act_type) {
     TQString str = typeList->text (act_type);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     bool ok;
     TQString getType = KInputDialog::getText(
@@ -126,7 +126,7 @@ void TypeOptPage::updateListBox(int start)
   TQString str, str2;
   for (int i = start; i < (int) typeList->count(); i++) {
     str = typeList->text (i);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -179,7 +179,7 @@ void TypeOptPage::getTypeNames (vector<TQString> &ret_type, vector<int> &ret_Ind
   TQString str;    ret_type.clear();
   for (int i = 0; i < (int) typeList->count(); i++) {
     str = typeList->text(i);
-    int pos = str.tqfind (TYPE_TAG);
+    int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     ret_type.push_back (str);
   }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 76452f4b..6f55d815 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -106,7 +106,7 @@ void UsageOptPage::slotModifyUsage()
   if (usageList->count() != 0
       && (int) usageList->count() > act_usage) {
     TQString str = usageList->text (act_usage);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
 
     bool ok;
@@ -129,7 +129,7 @@ void UsageOptPage::updateListBox(int start)
   for (int i = start; i < (int) usageList->count(); i++) 
   {
     str = usageList->text (i);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -153,7 +153,7 @@ void UsageOptPage::slotDeleteUsage()
       kvoctrainExpr *exp = doc->getEntry(ent);
       for (int lang = 0; lang < doc->numLangs(); lang++) {
         TQString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV;
-        if (ul.tqfind(t) >= 0 ) {
+        if (ul.find(t) >= 0 ) {
           KMessageBox::information(this,
                     i18n("usage (area) of an expression",
                         "This user-defined usage label could not be deleted "
@@ -187,7 +187,7 @@ void UsageOptPage::getUsageLabels (vector<TQString> &ret_usage,
   TQString str;    ret_usage.clear();
   for (int i = 0; i < (int) usageList->count(); i++) {
     str = usageList->text(i);
-    int pos = str.tqfind (USAGE_TAG);
+    int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     ret_usage.push_back (str);
   }
@@ -209,7 +209,7 @@ void UsageOptPage::slotCleanup()
         t.remove (0, 1);
 
         int next;
-        if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+        if ((next = t.find(UL_USAGE_DIV)) >= 0) {
           n = t.left(next);
           t.remove (0, next+1);
         }
@@ -277,7 +277,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
           TQString n;
           t.remove (0, 1);
           int next;
-          if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+          if ((next = t.find(UL_USAGE_DIV)) >= 0) {
             n = t.left(next);
             t.remove (0, next+1);
           }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 6b4e8ea6..e9803914 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage)
   usage_box->clear();
   for (int i = 0; i < (int) usages.size(); i++) {
     usage_box->insertItem (usages[i].longStr());
-    if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) {
+    if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) {
       usage_box->setSelected (i, true);
     }
   }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 4de1b843..e5cb5504 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -269,7 +269,7 @@ void EntryDlg::updatePages(const TQString &type)
 {
   TQString main;
   int pos;
-  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.find (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
@@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable)
   TQString type = comm_page->getType();
   TQString main;
   int pos;
-  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.find (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index 12dbc3da..9d272a4e 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -41,9 +41,9 @@ void kvoctrainApp::slotSmartSearchClip()
   TQString entries = TQApplication::tqclipboard()->text();
 
   if (!entries.isEmpty()) {
-    int pos = entries.tqfind ('\n'); // search for a line end
+    int pos = entries.find ('\n'); // search for a line end
     if (pos < 0)
-      pos = entries.tqfind ('\r');
+      pos = entries.find ('\r');
 
     if (pos < 0)    // just first "line"
       s = entries;
@@ -175,9 +175,9 @@ void kvoctrainApp::slotEditPaste()
   TQString num;
 // view->setView(0, langset, gradecols);
   while (!entries.isEmpty()) {
-    int pos = entries.tqfind ('\n'); // search for a line end
+    int pos = entries.find ('\n'); // search for a line end
     if (pos < 0) {
-      pos = entries.tqfind ('\r');   // mac style ?
+      pos = entries.find ('\r');   // mac style ?
     }
 
     if (pos < 0) {
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 0bf3e6aa..5f0c52bc 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -349,7 +349,7 @@ void kvoctrainApp::slotFileMerge()
               TQString n;
               t.remove (0, 1);
               int next;
-              if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
+              if ((next = t.find(UL_USAGE_DIV)) >= 0) {
                 n = t.left(next);
                 t.remove (0, next+1);
               }
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index 3f553cca..e4f4180b 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row)
   setCurrentRow(row, currentColumn());
 }
 /*
-TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace)
+TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
 {
   if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
@@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace)
       }
     }
   }
-  return TQTable::beginEdit(row, col, tqreplace);
+  return TQTable::beginEdit(row, col, replace);
 }
 
-void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace)
+void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace)
 {
-  TQTable::endEdit(row, col, accept, tqreplace);
+  TQTable::endEdit(row, col, accept, replace);
 }
 */
 void KVocTrainTable::sortByColumn(int header, bool alpha) {
diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h
index 5bd84d06..4e39288a 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.h
+++ b/kvoctrain/kvoctrain/kvoctraintable.h
@@ -81,8 +81,8 @@ public:
 
   protected:
     int current;
-    //TQWidget* beginEdit(int row, int col, bool tqreplace);
-    //void endEdit(int row, int col, bool accept, bool tqreplace);
+    //TQWidget* beginEdit(int row, int col, bool replace);
+    //void endEdit(int row, int col, bool accept, bool replace);
     void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg);
     void setItem(int row, int col, TQTableItem * item);
     TQTableItem* item (int row, int col) const;
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.cpp b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
index f439278c..c27a00e2 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
@@ -39,11 +39,11 @@ void LineList::setLines(const TQString &the_lines )
   multilines.clear();
   TQString lines = the_lines;
   int pos;
-  if ((pos = lines.tqfind ('\n')) >= 0) {
+  if ((pos = lines.find ('\n')) >= 0) {
     while (pos >= 0) {
       multilines.push_back(lines.left(pos));
       lines.remove (0, pos+1);
-      pos = lines.tqfind ('\n');
+      pos = lines.find ('\n');
     }
   }
 
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index f08246a5..f1b74ae4 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -93,7 +93,7 @@ TQString QueryManager::getSubType (const TQString & type)
 {
   int i;
   TQString t = type;
-  if ((i = t.tqfind(TQM_TYPE_DIV)) >= 0) {
+  if ((i = t.find(TQM_TYPE_DIV)) >= 0) {
     t.remove(0, i+1);
     return t;
   }
@@ -105,7 +105,7 @@ TQString QueryManager::getSubType (const TQString & type)
 TQString QueryManager::getMainType (const TQString & type)
 {
   int i;
-  if ((i = type.tqfind(TQM_TYPE_DIV)) >= 0)
+  if ((i = type.find(TQM_TYPE_DIV)) >= 0)
     return type.left(i);
   else
     return type;
@@ -238,7 +238,7 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx,
 bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQString query_type)
 {
    TQString qtype;
-   int pos = query_type.tqfind (TQM_TYPE_DIV);
+   int pos = query_type.find (TQM_TYPE_DIV);
    if (pos >= 0)
      qtype = query_type.left (pos);
    else
@@ -648,7 +648,7 @@ void QueryManager::setLessonItemStr (const TQString & indices)
   int pos;
   TQString indices_copy = indices;
   lessonitems.clear();
-  while ((pos = indices_copy.tqfind(' ')) >= 0) {
+  while ((pos = indices_copy.find(' ')) >= 0) {
      TQString s = indices_copy.left(pos);
      indices_copy.remove(0, pos+1);
      lessonitems.push_back(s.toInt());
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index ece91275..9180d6e4 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -135,11 +135,11 @@ vector<UsageRelation> UsageManager::getRelation ()
 }
 
 
-bool UsageManager::tqcontains (const TQString& label, const TQString& collection)
+bool UsageManager::contains (const TQString& label, const TQString& collection)
 {
    TQString s = collection;
    int pos;
-   while ((pos = s.tqfind(UL_USAGE_DIV)) >= 0) {
+   while ((pos = s.find(UL_USAGE_DIV)) >= 0) {
      if (s.left(pos) == label)
        return true;
      s.remove (0, pos+1);
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index dcbb2ae5..647de685 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -114,7 +114,7 @@ class UsageManager
 
   UsageManager ();
 
-  static bool tqcontains (const TQString& label, const TQString& collection);
+  static bool contains (const TQString& label, const TQString& collection);
   static vector<UsageRelation> getRelation ();
   static void setUsageNames (vector<TQString> names);
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index ae713937..0bd03361 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -93,7 +93,7 @@ Sachgebiete|
 static TQString extract (TQString &line)
 {
    TQString ret;
-   int lim = line.tqfind ("|");
+   int lim = line.find ("|");
    if (lim < 0) {
      ret = line;
      line = "";
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index e268ce0f..1bb67f28 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -347,7 +347,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     else if ((*first).name () == KV_GRADE) {
       TQString s = (*first).stringValue();
 
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         grade = s.left(pos).toInt();
         rev_grade = s.mid(pos+1, s.length()).toInt();
       }
@@ -357,7 +357,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_COUNT) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         count = s.left(pos).toInt();
         rev_count = s.mid(pos+1, s.length()).toInt();
       }
@@ -367,7 +367,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_BAD) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         bcount = s.left(pos).toInt();
         rev_bcount = s.mid(pos+1, s.length()).toInt();
       } else
@@ -376,7 +376,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
       }
@@ -387,7 +387,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE2) {
       TQString s = (*first).stringValue();
-      if ((pos = s.tqfind(';')) >= 1) {
+      if ((pos = s.find(';')) >= 1) {
         date = decompressDate (s.left(pos));
         rev_date = decompressDate (s.mid(pos+1, s.length()));
       }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index 92896105..5bc10f3f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
     }
     else if ((*first).name () == KV_GENERATOR) {
       generator = (*first).stringValue ();
-      int pos = generator.tqfindRev (KVD_VERS_PREFIX);
+      int pos = generator.findRev (KVD_VERS_PREFIX);
       if (pos >= 0) {
         doc_version = generator;
         doc_version.remove (0, pos+2);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 8821a9aa..748fe81d 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -124,13 +124,13 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
       size_t  odate = time(0),
               tdate = time(0);
 
-      int pos = s.tqfind (VCB_SEPARATOR);
+      int pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         o = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         t = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
@@ -139,19 +139,19 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
         t = s;
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         ograde = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         tgrade = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.tqfind (VCB_SEPARATOR);
+      pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         odate = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index d57f702c..c280d6ed 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -62,7 +62,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
   while (keepGoing)
   {
     temp = is.readLine();
-    keepGoing = !(temp.tqfind("\",") > 0);
+    keepGoing = !(temp.find("\",") > 0);
     title.append(temp);
     if (keepGoing)
       title.append(" ");
@@ -83,7 +83,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 
   keepGoing = true;
   while (keepGoing)
-    keepGoing = !(is.readLine().tqfind("8. Lernhilfe") > 0); //DO NOT translate
+    keepGoing = !(is.readLine().find("8. Lernhilfe") > 0); //DO NOT translate
 
   for (i = 0; i <= 14; i++)
     is.readLine();
@@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
     while (c < 2)
     {
       temp = is.readLine();
-      c+= temp.tqcontains("\",");
+      c+= temp.contains("\",");
       expression.append(temp);
       if (c < 2)
         expression.append(" ");
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
index c89782a5..c01c82c9 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -804,7 +804,7 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
     TQString s;
     TQString entype = s = (*first).getType(0);
-    int pos = s.tqfind (TQM_TYPE_DIV);
+    int pos = s.find (TQM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
@@ -925,7 +925,7 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
       TQString s;
       TQString entype = s = (*first).getType(0);
-      int pos = s.tqfind (TQM_TYPE_DIV);
+      int pos = s.find (TQM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 9f2c0124..47d8db75 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -848,10 +848,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 	{
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
+         	if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
            	return i;
 	}
 	}	
@@ -861,10 +861,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
+         	if (getEntry(i)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
            	return i;
 	}
        }
@@ -943,13 +943,13 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.tqfind (VCB_SEPARATOR) >= 0)
+   if (line.find (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
      return vt_lex;
 
-   if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]"))))
+   if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
      return vt_voc;
 
    return csv;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
index 6b3501ed..5ce499d1 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
@@ -62,7 +62,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
   lesson = _lesson;
 
   if (separator.length() ) {
-    int pos = s.tqfind(separator);
+    int pos = s.find(separator);
 
     if (pos == -1) {
       setOriginal(s.stripWhiteSpace());
@@ -74,7 +74,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
 //      s.stripWhiteSpace();
 
       // gather all translations
-      while ((pos = s.tqfind(separator)) != -1) {
+      while ((pos = s.find(separator)) != -1) {
         se = s.left(pos).stripWhiteSpace();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         s.remove (0, pos+separator.length() );
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
index d530ea87..f725330a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
@@ -208,31 +208,31 @@ bool XmlReader::readAttributes (std::list<XmlAttribute>& attrib_list) {
           // un-escape dangerous characters in reverted order
           KOXML_STRING val = tokenizer.element();
           int pos = 0;
-          while ((pos = val.tqfind("&quot;", pos)) >= 0) {
+          while ((pos = val.find("&quot;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 6);
             KOXML_STRING_INSERT( val, pos, "\"");
             pos += 1; // skip "
           }
           pos = 0;
-          while ((pos = val.tqfind("&lf;", pos)) >= 0) {
+          while ((pos = val.find("&lf;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\r");
             pos += 1; // skip \r
           }
           pos = 0;
-          while ((pos = val.tqfind("&nl;", pos)) >= 0) {
+          while ((pos = val.find("&nl;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\n");
             pos += 1; // skip \n
           }
           pos = 0;
-          while ((pos = val.tqfind("&lt;", pos)) >= 0) {
+          while ((pos = val.find("&lt;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "<");
             pos += 1; // skip <
           }
           pos = 0;
-          while ((pos = val.tqfind ("&amp;", pos)) >= 0) {
+          while ((pos = val.find ("&amp;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos+1, 4);
             pos += 1; // skip &
           }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
index afeeda73..38dfdbf2 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
@@ -116,30 +116,30 @@ void XmlWriter::addAttribute (KOXML_STRING name, const KOXML_STRING& value)
   KOXML_STRING val = value;
   // escape dangerous characters in sgml-style
   int pos = 0;
-  while ((pos = val.tqfind ('&', pos)) >= 0) {
+  while ((pos = val.find ('&', pos)) >= 0) {
     KOXML_STRING_INSERT( val, pos+1, "amp;");
     pos += 5; // skip &amp;
   }
   pos = 0;
-  while ((pos = val.tqfind ('<', pos)) >= 0) {
+  while ((pos = val.find ('<', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&lt;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\n', pos)) >= 0) {
+  while ((pos = val.find ('\n', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&nl;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\r', pos)) >= 0) {
+  while ((pos = val.find ('\r', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos+1, "lf;");
     pos += 4; // skip &lf;
   }
   pos = 0;
-  while ((pos = val.tqfind ('\"', pos)) >= 0) {
+  while ((pos = val.find ('\"', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&quot;");
     pos += 6; // skip &qout;
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 0d6c5591..37200164 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -115,11 +115,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.female(def, indef);
    mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef);
    mw->rb_fem->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -127,11 +127,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.male(def, indef);
    mw->male->setText (i18n("&male:\t")+def+" / "+indef);
    mw->male->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -139,11 +139,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.natural(def, indef);
    mw->natural->setText (i18n("&natural:\t")+def+" / "+indef);
    mw->natural->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.tqfind(def+" ") == 0) {
+   if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.tqfind(indef+" ") == 0) {
+   if (!removed && s.find(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 34588847..e767775c 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -651,7 +651,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
           {
             TQString trans (vocabulary[i]);
             if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false)
-                || e -> key() == Key_F6 && trans.tqcontains (curText, false)) )
+                || e -> key() == Key_F6 && trans.contains (curText, false)) )
               combo -> insertItem (trans);
           }
           combo -> setEditText (curText);
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index a45d6cd6..eb88a5f2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -145,7 +145,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
        s = exp->getExample(column);
        answerstring = column == 0 ? exp->getOriginal().stripWhiteSpace() : exp->getTranslation(column).stripWhiteSpace();
        int pos = -1;
-       while ((pos = s.tqfind(answerstring)) > 0)
+       while ((pos = s.find(answerstring)) > 0)
        {
          s.remove(pos, answerstring.length());
          s.insert (pos, "..");
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index 62533df7..fa407605 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -96,7 +96,7 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
      line = is.readLine();
 
      int pos;
-     while ((pos = line.tqfind("  ")) >= 0)
+     while ((pos = line.find("  ")) >= 0)
        line.remove (pos, 1);
 
      bool head_line = (!line.stripWhiteSpace().isEmpty() && line == line.upper() );
@@ -107,32 +107,32 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
      }
      first_line = false;
 
-     if (   line.tqfind ("see p.") >= 0
-         || line.tqfind ("see pp.") >= 0
-         || line.tqfind ("see also p") >= 0) {
+     if (   line.find ("see p.") >= 0
+         || line.find ("see pp.") >= 0
+         || line.find ("see also p") >= 0) {
        line = "";
      }
 
      int c = 0x92;
-     while ((pos = line.tqfind (c)) >= 0)
+     while ((pos = line.find (c)) >= 0)
        line[pos] = '\'';
 
      c = 0x94;
-     while ((pos = line.tqfind (c)) >= 0)
+     while ((pos = line.find (c)) >= 0)
        line[pos] = ' ';
 
      pos = 0;
-     while ((pos = line.tqfind ('&', pos)) >= 0) {
+     while ((pos = line.find ('&', pos)) >= 0) {
        line.insert (pos+1, "amp;");
        pos += 5; // skip &amp;
      }
 
-     while ((pos = line.tqfind ('<')) >= 0) {
+     while ((pos = line.find ('<')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&lt;");
      }
 
-     while ((pos = line.tqfind ('>')) >= 0) {
+     while ((pos = line.find ('>')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&gt;");
      }
@@ -144,9 +144,9 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
          lesson_str = line + ", "+month+" "+year;
        }
        else {
-         pos = line.tqfind ('\t');
+         pos = line.find ('\t');
          if (pos < 0)
-           pos = line.tqfind ('|');
+           pos = line.find ('|');
          if (pos >= 0) {
            if (lesson_pending) {
              lesson_pending = false;
@@ -166,47 +166,47 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
            spot.en = line.mid(0, pos);
            spot.de = line.mid(pos+1, line.length()-pos-1);
 
-           if ((pos = spot.en.tqfind(" UK") ) >= 0) {
+           if ((pos = spot.en.find(" UK") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.tqfind("(UK)") ) >= 0) {
+           if ((pos = spot.en.find("(UK)") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.tqfind(" N. Am.") ) >= 0) {
+           if ((pos = spot.en.find(" N. Am.") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 7);
            }
-           if ((pos = spot.en.tqfind("(N. Am.)") ) >= 0) {
+           if ((pos = spot.en.find("(N. Am.)") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 8);
            }
 
-           if ((pos = spot.en.tqfind(" US") ) >= 0) {
+           if ((pos = spot.en.find(" US") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.tqfind("(US)") ) >= 0) {
+           if ((pos = spot.en.find("(US)") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.tqfind("ifml.") ) >= 0) {
+           if ((pos = spot.en.find("ifml.") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.tqfind("(ifml.)") ) >= 0) {
+           if ((pos = spot.en.find("(ifml.)") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 7);
            }
 
-           if ((pos = spot.en.tqfind("vulg.") ) >= 0) {
+           if ((pos = spot.en.find("vulg.") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.tqfind("(vulg.)") ) >= 0) {
+           if ((pos = spot.en.find("(vulg.)") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 7);
            }
@@ -311,7 +311,7 @@ int main(int argc, char **argv)
   TQString spot (argv[1]);
   TQString kvtml;
 
-  int dot = spot.tqfindRev('.');
+  int dot = spot.findRev('.');
   if (dot < 0) {
     kvtml = spot + "." KVTML_EXT;
   }
diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp
index efb510f3..a775274e 100644
--- a/kvoctrain/kvoctrain/tools/extractlang.cpp
+++ b/kvoctrain/kvoctrain/tools/extractlang.cpp
@@ -19,19 +19,19 @@ TQString threeLangs;
 
 void parseLanguage(TQString name, TQString three, TQString two)
 {
-  int star = three.tqfind('*');
+  int star = three.find('*');
   if (star > 0)
     three.remove(star, 1);
 
   TQString three_1 = three;
 
-  int slash = three_1.tqfind('/');
+  int slash = three_1.find('/');
   if (slash > 0) {
     three_1.remove(slash, 1);
     three_1.insert(slash, ", ");
   }
 
-  if (!two.tqcontains("&nbsp;")) {
+  if (!two.contains("&nbsp;")) {
       twoLangs.append("\t{{\"");
       twoLangs.append(two);
       twoLangs.append("\"}, {\"");
@@ -43,7 +43,7 @@ void parseLanguage(TQString name, TQString three, TQString two)
   else
     two = "";
 
-  slash = three.tqfind('/');
+  slash = three.find('/');
   if (slash > 0) {
     if (two.length() == 0)
       two = three.mid(slash+1);
@@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
 
 
   uint count = 0;
-  while (line.tqcontains("<td"))
+  while (line.contains("<td"))
     { 
       if (count > 3)
 	return true;
@@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
       parseLanguage(text[0], text[2], text[3]);
     }
 
-  if (line.tqcontains("/tr"))
+  if (line.contains("/tr"))
     return true;
 
   return false;
@@ -130,7 +130,7 @@ int main()
       if (readNext)
 	line = in.readLine();
 
-      if (line.tqcontains("<tr"))
+      if (line.contains("<tr"))
 	{
 	  readNext = parseTR(line, in);
 	}