TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 16 insertions, 16 deletions

diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 4bfe29fc..49f5402c 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -44,7 +44,7 @@ using namespace std;
 //  KEduVocDocument
 //********************************************************
 
-KEduVocDocument::KEduVocDocument(TQObject * /*parent*/)
+KEduVocDocument::KEduVocDocument(TQObject * /*tqparent*/)
 {
   Init();
 }
@@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   if (!url.isEmpty())
     doc_url = url;
 
-  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+  // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -107,7 +107,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
     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 false;
     }
 
@@ -163,7 +163,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
         // TODO new readers provide an explicite error message
         // the two messages should be merged
         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"));
@@ -180,9 +180,9 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
 }
 
 
-bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator)
+bool KEduVocDocument::saveAs(TQObject * /*tqparent*/, const KURL & url, FileType ft, const TQString & generator)
 {
-//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
+//  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), tqparent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   KURL tmp (url);
 
@@ -211,7 +211,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType 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;
     }
 
@@ -253,7 +253,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
       // TODO new writers provide an explicite error message
       // the two messages should be merged
       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"));
@@ -717,7 +717,7 @@ void KEduVocDocument::setLeitnerSystem( LeitnerSystem* system )
 {
 	leitnerSystem = system;
 	
-	/*KWordQuizApp* app = (KWordQuizApp*) parent();
+	/*KWordQuizApp* app = (KWordQuizApp*) tqparent();
 	app->slotLeitnerSystem();*/
 }
 
@@ -901,11 +901,11 @@ int KEduVocDocument::search(TQString substr, int id,
    if (id == 0) {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         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)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
+         if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
            return i;
        }
      }
@@ -913,11 +913,11 @@ int KEduVocDocument::search(TQString substr, int id,
    else {
      for (int i = first; i < last; i++) {
        if (word_start) {
-         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;
        }
        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;
        }
      }
@@ -972,7 +972,7 @@ KEduVocDocument::FileType KEduVocDocument::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
@@ -989,13 +989,13 @@ KEduVocDocument::FileType KEduVocDocument::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)