1 files changed, 18 insertions, 18 deletions

diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index a10aa28a..9f2c0124 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -91,13 +91,13 @@ void kvoctrainDoc::Init ()
 }
 
 
-kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
+kvoctrainDoc::kvoctrainDoc(TQObject *tqparent, const KURL& url)
 {
   Init();
   if (!url.isEmpty())
     doc_url = url;
 
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -105,7 +105,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
       return;
     }
 
@@ -166,7 +166,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
           return;
         }
         TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
-        TQString msg = format.arg(url.path());
+        TQString msg = format.tqarg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
                                                         kapp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
@@ -187,15 +187,15 @@ kvoctrainDoc::~kvoctrainDoc()
 }
 
 
-bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft)
+bool kvoctrainDoc::saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft)
 {
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   KURL tmp (url);
   if (title == i18n("Untitled"))
-    title = TQString::null;
+    title = TQString();
   if (title == doc_url.fileName())
-    title = TQString::null;
+    title = TQString();
 
   if (ft == automatic)
   {
@@ -222,7 +222,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
 
     if (!f.open(IO_WriteOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
       return false;
     }
 
@@ -262,7 +262,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
 
     if (!saved) {
       TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
-      TQString msg = format.arg(tmp.path());
+      TQString msg = format.tqarg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -848,10 +848,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 	{
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
+         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).tqfind (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().find (substr, 0, false) > -1)  // case insensitive
+         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
            	return i;
 	}
        }
@@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
 
    TQDataStream is( &f );
 
-   Q_INT8 c1, c2, c3, c4, c5;
+   TQ_INT8 c1, c2, c3, c4, c5;
    is >> c1
       >> c2
       >> c3
@@ -937,19 +937,19 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
    line.insert (0, c1);
    f.close();
 
-   bool stat = is.device()->status();
+   bool stat = is.tqdevice()->status();
    if (stat != IO_Ok)
      return kvd_none;
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.find (VCB_SEPARATOR) >= 0)
+   if (line.tqfind (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
      return vt_lex;
 
-   if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
+   if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]"))))
      return vt_voc;
 
    return csv;