1 files changed, 10 insertions, 10 deletions

diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 96c4a093..76452f4b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -41,11 +41,11 @@ UsageOptPage::UsageOptPage
 (
   const vector<TQString> &usages,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  UsageOptPageForm( parent, name ),
+  UsageOptPageForm( tqparent, name ),
   doc(_doc)
 {
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
@@ -84,7 +84,7 @@ void UsageOptPage::slotNewUsage()
 {
   bool ok;
   TQString getUsage = KInputDialog::getText(
-              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString::null, &ok );
+              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString(), &ok );
   if( !ok )
     return;
   TQString str;
@@ -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.find (USAGE_TAG);
+    int pos = str.tqfind (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.find (USAGE_TAG);
+    int pos = str.tqfind (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.find(t) >= 0 ) {
+        if (ul.tqfind(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.find (USAGE_TAG);
+    int pos = str.tqfind (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.find(UL_USAGE_DIV)) >= 0) {
+        if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
           n = t.left(next);
           t.remove (0, next+1);
         }
@@ -253,7 +253,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_usages, (int) usageIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_usages, (int) usageIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -277,7 +277,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
           TQString n;
           t.remove (0, 1);
           int next;
-          if ((next = t.find(UL_USAGE_DIV)) >= 0) {
+          if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
             n = t.left(next);
             t.remove (0, next+1);
           }