1 files changed, 10 insertions, 10 deletions

diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 00325b7b..30ed7369 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -40,11 +40,11 @@ TenseOptPage::TenseOptPage
 (
   const vector<TQString> &tenses,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  TenseOptPageForm( parent, name )
+  TenseOptPageForm( tqparent, name )
 {
   connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
@@ -83,7 +83,7 @@ void TenseOptPage::slotNewTense()
 {
   bool ok;
   TQString getTense = KInputDialog::getText(
-              i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString::null, &ok );
+              i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString(), &ok );
   if( !ok )
     return;
 
@@ -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.find (TENSE_TAG);
+    int pos = str.tqfind (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.find (TENSE_TAG);
+    int pos = str.tqfind (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -146,7 +146,7 @@ void TenseOptPage::slotDeleteTense()
 
     TQString t;
     t.setNum(tenseIndex[act_tense]+1);
-    t.insert (0, QM_USER_TYPE);
+    t.insert (0, TQM_USER_TYPE);
     for (int ent = 0; ent < doc->numEntries(); ent++) {
       // FIXME: ProgressDlg here?
       kvoctrainExpr *exp = doc->getEntry(ent);
@@ -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.find (TENSE_TAG);
+    int pos = str.tqfind (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     ret_tense.push_back (str);
   }
@@ -239,7 +239,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_tenses, (int) tenseIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_tenses, (int) tenseIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -260,7 +260,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
       bool dirty = false;
       for (int ci = 0; ci < conj.numEntries(); ci++) {
         TQString old = conj.getType(ci);
-        if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
+        if (!old.isEmpty() && old.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) {
           old.remove (0, 1);
           int o = old.toInt();
 
@@ -268,7 +268,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
           TQString newtense;
           if (translate_index[o] != 0) {
             newtense.setNum (translate_index[o]);
-            newtense.insert (0, QM_USER_TYPE);
+            newtense.insert (0, TQM_USER_TYPE);
             conj.setType(ci, newtense);
           }
           else