1 files changed, 11 insertions, 11 deletions

diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index c89129b8..48fc09e1 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -40,11 +40,11 @@ TypeOptPage::TypeOptPage
 (
   const vector<TQString> &types,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  TypeOptPageForm( parent, name ),
+  TypeOptPageForm( tqparent, name ),
   doc(_doc)
 {
   connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );
@@ -83,7 +83,7 @@ void TypeOptPage::slotNewType()
 {
   bool ok;
   TQString getType = KInputDialog::getText(
-              i18n( "Type Description" ), i18n( "Enter type description:" ), TQString::null, &ok );
+              i18n( "Type Description" ), i18n( "Enter type description:" ), TQString(), &ok );
   if( !ok )
     return;
   TQString str;
@@ -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.find (TYPE_TAG);
+    int pos = str.tqfind (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.find (TYPE_TAG);
+    int pos = str.tqfind (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -144,7 +144,7 @@ void TypeOptPage::slotDeleteType()
 
     TQString t;
     t.setNum(typeIndex[act_type]+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);
@@ -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.find (TYPE_TAG);
+    int pos = str.tqfind (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     ret_type.push_back (str);
   }
@@ -196,7 +196,7 @@ void TypeOptPage::slotCleanup()
   for (int col = 0; col < doc->numLangs(); col++)
     for (int i = 0; i < (int) doc->numEntries(); i++) {
       TQString t = doc->getEntry(i)->getType(col);
-      if (t.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
+      if (t.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) {
         t.remove (0, 1);
         int idx = t.toInt();
         if ((int) used_type.size() < idx)
@@ -230,7 +230,7 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, i
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_types, (int) typeIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_types, (int) typeIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -248,14 +248,14 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, i
   for (int col = 0; col < doc->numLangs(); col++) {
     for (int i = 0; i < doc->numEntries(); i++) {
       TQString old = doc->getEntry(i)->getType (col);
-      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();
 
         TQString newtype;
         if (translate_index[o] != 0) {
           newtype.setNum (translate_index[o]);
-          newtype.insert (0, QM_USER_TYPE);
+          newtype.insert (0, TQM_USER_TYPE);
           doc->getEntry(i)->setType (col, newtype);
         }
         else