TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 96 insertions, 96 deletions

diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 991e1899..49e10c05 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -23,11 +23,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -91,15 +91,15 @@ const char* columnNames[] = {
     I18N_NOOP("Fuzzy"),
     I18N_NOOP("Untranslated"),
     I18N_NOOP("Total"),
-    I18N_NOOP("CVS/SVN Status"),
+    I18N_NOOP("CVS/SVN tqStatus"),
     I18N_NOOP("Last Revision"),
     I18N_NOOP("Last Translator")
 };
 
 #define COLTEXT(a)  (i18n(columnNames[a]))
 
-CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name)
-              : TQListView(parent,name)
+CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent,const char* name)
+              : TQListView(tqparent,name)
 	      , _dirWatch(0)
 	      , _readInfoCount(0)
 	      , _active(false)
@@ -143,7 +143,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
    setColumnAlignment(2,AlignCenter);
    addColumn(COLTEXT(COL_TOTAL));
    setColumnAlignment(3,AlignCenter);
-   addColumn(TQString::null); // CVS/SVN column, header is set later
+   addColumn(TQString()); // CVS/SVN column, header is set later
    addColumn(COLTEXT(COL_REVISION));
    addColumn(COLTEXT(COL_TRANSLATOR));
 
@@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks()
 #endif
     {
 	KMessageBox::error(this,i18n(
-	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
 	return;
     }
 
@@ -471,7 +471,7 @@ void CatalogManagerView::loadMarks()
 	{
     	    KMessageBox::error(this
 		,i18n("Error while trying to read file:\n %1\n"
-		"Maybe it is not a valid file with list of markings.").arg(url.prettyURL()));
+		"Maybe it is not a valid file with list of markings.").tqarg(url.prettyURL()));
 	    f.close();
 	    return;
 	}
@@ -480,7 +480,7 @@ void CatalogManagerView::loadMarks()
     else
     {
 	KMessageBox::error(this,i18n(
-	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
     }
 
     KIO::NetAccess::removeTempFile( filename );
@@ -516,8 +516,8 @@ void CatalogManagerView::saveMarks()
     // ### FIXME: why is the file dialog not doing this?
     if ( KIO::NetAccess::exists( url2, false, this ) )
     {
-        if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
-	            "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+        if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
+	            "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
 	{
 	    return;
 	}
@@ -568,7 +568,7 @@ void CatalogManagerView::saveMarks()
     {
         // ### KDE4 FIXME: strip the final \n of the message
         KMessageBox::error( this,
-            i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( url.prettyURL()) );
+            i18n( "An error occurred while trying to write to file:\n%1\n" ).tqarg( url.prettyURL()) );
     }
     else if ( !localFile )
     {
@@ -577,7 +577,7 @@ void CatalogManagerView::saveMarks()
         {
             // ### KDE4 FIXME: strip the final \n of the message
             KMessageBox::error(this,
-                i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL()));
+                i18n("An error occurred while trying to upload the file:\n%1\n").tqarg(url.prettyURL()));
         }
     }
 
@@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics()
    showStatistics( i, markedDoList );
 }
 
-void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &childrenList )
+void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchildrenList )
 {
    KLocale *locale = KGlobal::locale();
 
@@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &child
       int totalUntranslated=0;
 
       TQStringList::const_iterator it;
-      for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
+      for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
       {
          CatManListItem* item = _fileList[(*it)];
 
@@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &child
       if(name.isEmpty())
           msg = i18n("Statistics for all:\n");
       else
-          msg = i18n("Statistics for %1:\n").arg(name);
+          msg = i18n("Statistics for %1:\n").tqarg(name);
 
-      msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0));
+      msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0));
 
       percent=100.0-((double)needworkPo*100.0)/totalPackages;
-      msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0));
+      msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0));
 
       percent=100.0-((double)totalPo*100.0)/totalPackages;
-      msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0));
+      msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0));
       percent=((double)totalNoPot*100.0)/totalPackages;
-      msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0));
+      msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0));
 
-      msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0));
+      msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0));
 
       long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated;
       percent=((double)totalTranslated*100.0)/totalMsgid;
-      msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0));
+      msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0));
 
       percent=((double)totalFuzzy*100.0)/totalMsgid;
-      msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0));
+      msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0));
 
       percent=((double)totalUntranslated*100.0)/totalMsgid;
-      msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0));
+      msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0));
 
    KMessageBox::information(this,msg,i18n("Statistics"));
 }
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
       if(!item->hasPo())
          return;
 
-      Msgfmt::Status status;
+      Msgfmt::tqStatus status;
       TQString output;
       Msgfmt msgfmt;
 
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
    }
    else
    {
-      Msgfmt::Status status;
+      Msgfmt::tqStatus status;
       TQString output;
       Msgfmt msgfmt;
 
@@ -866,7 +866,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n").arg(name)+output;
+"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
             }
             else
             {
@@ -882,7 +882,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").arg(name)+output;
+"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
             }
             else
             {
@@ -898,7 +898,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").arg(name)+output;
+"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
             }
             else
             {
@@ -914,7 +914,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
               msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" "
-"in folder %1").arg(name);
+"in folder %1").tqarg(name);
             }
             else
             {
@@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles()
   CatManListItem* item = (CatManListItem*)currentItem();
   if(item->isDir()) {
     TQStringList filesToSend;
-    TQStringList childrenList = item->allChildrenList(true);
+    TQStringList tqchildrenList = item->allChildrenList(true);
 
     TQStringList::const_iterator it;
-    for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
+    for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
       CatManListItem* i = _fileList[(*it)];
       if (i->hasPo()) {
 	filesToSend << i->poFile();
@@ -1023,23 +1023,23 @@ void CatalogManagerView::packageFiles( )
     CatManListItem* item = (CatManListItem*)currentItem();
     if(item->isDir()) {
         TQStringList filesToPackage;
-        TQStringList childrenList = item->allChildrenList(true);
+        TQStringList tqchildrenList = item->allChildrenList(true);
 
         TQStringList::const_iterator it;
-        for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
+        for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
           CatManListItem* i = _fileList[(*it)];
           if (i->hasPo()) {
 	    filesToPackage << i->poFile();
           }
         }
-	TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this);
-	mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false );
+	TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this);
+	mailer->buildArchive( filesToPackage, packageFileName, TQString(), false );
     }
     else {
         if (item->hasPo()) {
           TQStringList fileToPackage(item->poFile());
-	  TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this);
-	  mailer->buildArchive( fileToPackage, packageFileName, TQString::null, false );
+	  TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this);
+	  mailer->buildArchive( fileToPackage, packageFileName, TQString(), false );
         }
     }
 }
@@ -1057,8 +1057,8 @@ void CatalogManagerView::packageMarkedFiles( )
       }
     }
 
-    TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this);
-    mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false );
+    TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this);
+    mailer->buildArchive( filesToPackage, packageFileName, TQString(), false );
 }
 
 // CVS
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
   doCVSCommand( CVS::Commit, true );
 }
 
-void CatalogManagerView::cvsStatus( )
+void CatalogManagerView::cvstqStatus( )
 {
-  doCVSCommand( CVS::Status );
+  doCVSCommand( CVS::tqStatus );
 }
 
 void CatalogManagerView::cvsStatusMarked( )
 {
-  doCVSCommand( CVS::Status, true );
+  doCVSCommand( CVS::tqStatus, true );
 }
 
 void CatalogManagerView::cvsUpdateTemplate( )
@@ -1137,7 +1137,7 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ
     TQString cvsItem;
     CatManListItem * item = (CatManListItem*)currentItem( );
     if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) {
-      // all children including directories
+      // all tqchildren including directories
       TQStringList cvsItems = item->allChildrenFileList (true, false, true);
       if ( !cvsItems.isEmpty( ) )
         cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config );
@@ -1249,7 +1249,7 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ
         TQString svnItem;
         CatManListItem * item = (CatManListItem*)currentItem( );
         if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) {
-      // all children including directories
+      // all tqchildren including directories
             TQStringList svnItems = item->allChildrenFileList (true, false, true);
             if ( !svnItems.isEmpty( ) )
                 svnhandler->execSVNCommand( this, cmd, svnItems, templates, config );
@@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog()
    _logWindow->show();
 }
 
-TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
+TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest )
 {
    CatManListItem* i=(CatManListItem*) currentItem();
 
@@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
    const TQString search = options.findStr.lower().simplifyWhiteSpace();
    TQStringList searchWords = TQStringList::split(' ', search);
 
-   TQStringList childrenList;
-   if( i->isFile() ) childrenList.append(i->name());
-   else childrenList =i->allChildrenList(true);
+   TQStringList tqchildrenList;
+   if( i->isFile() ) tqchildrenList.append(i->name());
+   else tqchildrenList =i->allChildrenList(true);
 
-   emit prepareFindProgressBar(childrenList.size());
+   emit prepareFindProgressBar(tqchildrenList.size());
 
    TQStringList::const_iterator it;
-   for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
+   for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
    {
 	 CatManListItem* item = _fileList[(*it)];
 
@@ -1341,11 +1341,11 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 		const TQString foundItemFile = itemFile;
 
 		it++;
-		while( it != childrenList.constEnd() )
+		while( it != tqchildrenList.constEnd() )
 		{
         	    CatManListItem *item = _fileList[(*it)];
 
-		    itemFile = TQString::null;
+		    itemFile = TQString();
 		    if( options.inTemplates )
 		    {
 			if( item->hasPot() ) itemFile=item->potFile();
@@ -1353,7 +1353,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 			if( item->hasPo() )itemFile=item->poFile();
 		    }
 		    if( options.inMarkedFiles && !item->marked() )
-			itemFile=TQString::null;
+			itemFile=TQString();
 
 		    if( !itemFile.isNull())
 		    {
@@ -1380,10 +1380,10 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 	    _stopSearch = false;
 	    rest.clear();
 	    if( _updateNesting == 0 && !_stop ) emit updateFinished();
-	    return TQString::null;
+	    return TQString();
 	}
    }
-   return TQString::null;
+   return TQString();
 }
 
 bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList &searchWords)
@@ -1391,8 +1391,8 @@ bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList
     for( TQStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 )
 	for( TQStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 )
 	    if( *it1 == *it2
-		|| (*it1).contains(*it2)
-		|| (*it2).contains(*it1) ) return true;
+		|| (*it1).tqcontains(*it2)
+		|| (*it2).tqcontains(*it1) ) return true;
     return false;
 }
 
@@ -1499,12 +1499,12 @@ void CatalogManagerView::slotDeleteFile()
 
    if(item && item->isFile() && item->hasPo() && !item->hasPot())
    {
-      const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile());
+      const TQString msg=i18n("Do you really want to delete the file %1?").tqarg(item->poFile());
       if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue)
       {
          if(!TQFile::remove(item->poFile()))
          {
-             KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile()));
+             KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").tqarg(item->poFile()));
          }
       }
    }
@@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index)
    if(index>=0 && item && item->isDir())
    {
       TQString cmd=*(_settings.dirCommands).at(index);
-      cmd.replace("@PACKAGE@",item->name());
-      cmd.replace("@PODIR@",item->poFile());
-      cmd.replace("@POTDIR@",item->potFile());
-      cmd.replace("@POFILES@",current().join(" "));
-      cmd.replace("@MARKEDPOFILES@",marked().join(" "));
+      cmd.tqreplace("@PACKAGE@",item->name());
+      cmd.tqreplace("@PODIR@",item->poFile());
+      cmd.tqreplace("@POTDIR@",item->potFile());
+      cmd.tqreplace("@POFILES@",current().join(" "));
+      cmd.tqreplace("@MARKEDPOFILES@",marked().join(" "));
 
       kdDebug(KBABEL_CATMAN) << cmd << endl;
 
@@ -1638,15 +1638,15 @@ void CatalogManagerView::slotFileCommand(int index)
 
    if(index>=0 && item && item->isFile())
    {
-      CatManListItem* parent = (CatManListItem*)item->parent();
+      CatManListItem* tqparent = (CatManListItem*)item->tqparent();
 
       TQString cmd=*(_settings.fileCommands).at(index);
-      cmd.replace("@PACKAGE@",item->name());
-      cmd.replace("@POFILE@",item->poFile());
-      cmd.replace("@POTFILE@",item->potFile());
-      cmd.replace("@PODIR@",parent->poFile());
-      cmd.replace("@POTDIR@",parent->potFile());
-      cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR));
+      cmd.tqreplace("@PACKAGE@",item->name());
+      cmd.tqreplace("@POFILE@",item->poFile());
+      cmd.tqreplace("@POTFILE@",item->potFile());
+      cmd.tqreplace("@PODIR@",tqparent->poFile());
+      cmd.tqreplace("@POTDIR@",tqparent->potFile());
+      cmd.tqreplace("@POEMAIL@",item->text(COL_TRANSLATOR));
 
       kdDebug(KBABEL_CATMAN) << cmd << endl;
 
@@ -1660,7 +1660,7 @@ void CatalogManagerView::slotFileCommand(int index)
       connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this
                ,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
 
-      *proc << "cd" << parent->poFile() << ";" << cmd;
+      *proc << "cd" << tqparent->poFile() << ";" << cmd;
       proc->start(KProcess::NotifyOnExit,KProcess::AllOutput);
    }
 
@@ -1765,7 +1765,7 @@ void CatalogManagerView::buildTree()
    {
       KMessageBox::error(this,i18n("You have not specified a valid folder "
 "for the base folder of the PO files:\n%1\n"
-"Please check your settings in the project settings dialog.").arg(_settings.poBaseDir));
+"Please check your settings in the project settings dialog.").tqarg(_settings.poBaseDir));
 
       _active=false;
       _updateNesting--;
@@ -1782,7 +1782,7 @@ void CatalogManagerView::buildTree()
    {
       KMessageBox::error(this,i18n("You have not specified a valid folder "
 "for the base folder of the PO template files:\n%1\n"
-"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir));
+"Please check your settings in the project settings dialog.").tqarg(_settings.potBaseDir));
    }
 
    cvshandler->setPOTBaseDir( _settings.potBaseDir );
@@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir
              _fileList.insert(file,item);
              _readInfoFileList.prepend(file);
 
-             if(_markerList.contains(file))
+             if(_markerList.tqcontains(file))
              {
                 item->setMarked(true);
              }
@@ -1953,7 +1953,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir
           }
 
           TQString subDir=relDir+(*it)+"/";
-          if(!_dirWatch->contains(baseDir+subDir))
+          if(!_dirWatch->tqcontains(baseDir+subDir))
           {
               _dirWatch->addDir(baseDir+subDir);
           }
@@ -2027,7 +2027,7 @@ void CatalogManagerView::updateDir(TQString relDir)
              item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file);
              _fileList.insert(file,item);
 
-             if(_markerList.contains(file))
+             if(_markerList.tqcontains(file))
              {
                 item->setMarked(true);
              }
@@ -2056,7 +2056,7 @@ void CatalogManagerView::updateDir(TQString relDir)
           bool newDirAdded=false;
 
           TQString subDir=relDir+(*it)+"/";
-          if(!_dirWatch->contains(potBaseDir+subDir))
+          if(!_dirWatch->tqcontains(potBaseDir+subDir))
           {
               _dirWatch->addDir(potBaseDir+subDir);
 
@@ -2109,7 +2109,7 @@ void CatalogManagerView::updateDir(TQString relDir)
              item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file);
              _fileList.insert(file,item);
 
-             if(_markerList.contains(file))
+             if(_markerList.tqcontains(file))
              {
                 item->setMarked(true);
              }
@@ -2138,7 +2138,7 @@ void CatalogManagerView::updateDir(TQString relDir)
           bool newDirAdded=false;
 
           TQString subDir=relDir+(*it)+"/";
-          if(!_dirWatch->contains(poBaseDir+subDir))
+          if(!_dirWatch->tqcontains(poBaseDir+subDir))
           {
                _dirWatch->addDir(poBaseDir+subDir);
                newDirAdded=true;
@@ -2206,8 +2206,8 @@ void CatalogManagerView::updateDir(TQString relDir)
 	     deleteDirItem(relDir);
 
           // if this directory has to be removed, check, if
-		  // the parent directory has to be removed too
-          const int index=relDir.findRev("/",relDir.length()-2);
+		  // the tqparent directory has to be removed too
+          const int index=relDir.tqfindRev("/",relDir.length()-2);
           if(index<0)
           {
             relDir="/";
@@ -2266,12 +2266,12 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
    CatManListItem* thisItem=_dirList[relDir];
    if(!thisItem)
    {
-      // if this item is not in the list search for next existing parent item
+      // if this item is not in the list search for next existing tqparent item
       TQString prevRelDir;
       do
       {
           prevRelDir=relDir;
-          const int index=relDir.findRev("/",relDir.length()-2);
+          const int index=relDir.tqfindRev("/",relDir.length()-2);
           if(index<0)
           {
             relDir="/";
@@ -2289,7 +2289,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
       }
       else
       {
-          // if a parent item dir is found, create the needed item in this dir
+          // if a tqparent item dir is found, create the needed item in this dir
           // and build the tree from this item on
           kdDebug(KBABEL_CATMAN) << "building dir: " << prevRelDir << endl;
           CatManListItem* item = new CatManListItem(this, thisItem,_settings.poBaseDir+prevRelDir
@@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir)
 
 void CatalogManagerView::fileInfoRead( TQString filename )
 {
-    if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) {
+    if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) {
 	emit progress( ++_readInfoCount);
 	_readInfoFileList.remove( filename );
     }
@@ -2518,8 +2518,8 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
    if(event->state() & LeftButton)
    {
       const int delay = KGlobalSettings::dndEventDelay();
-      if(QABS( event->pos().x() - _pressPos.x() ) >= delay ||
-         QABS( event->pos().y() - _pressPos.y() ) >= delay)
+      if(TQABS( event->pos().x() - _pressPos.x() ) >= delay ||
+         TQABS( event->pos().y() - _pressPos.y() ) >= delay)
       {
          CatManListItem* item = (CatManListItem*)itemAt(contentsToViewport(_pressPos));
          if(item && item->isFile())
@@ -2624,7 +2624,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
 	{
 	    while( !static_cast<CatManListItem *>( item->nextSibling() ) )
 	    {
-		item = static_cast<CatManListItem *>( item->parent() );
+		item = static_cast<CatManListItem *>( item->tqparent() );
 		if( !item ) return item;
 	    }
 	    return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2634,7 +2634,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
     {
 	while( !static_cast<CatManListItem *>( item->nextSibling() ) )
 	{
-	    item =  static_cast<CatManListItem *>( item->parent());
+	    item =  static_cast<CatManListItem *>( item->tqparent());
 	    if( !item ) return item;
 	}
 	return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2651,7 +2651,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
 	{
 	    while( !static_cast<CatManListItem *>( item->previousSibling() ) )
 	    {
-		item = static_cast<CatManListItem *>( item->parent() );
+		item = static_cast<CatManListItem *>( item->tqparent() );
 		if( !item ) return item;
 	    }
 	    return static_cast<CatManListItem *>( item->previousSibling() );
@@ -2661,7 +2661,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
     {
 	while( !static_cast<CatManListItem *>( item->previousSibling() ) )
 	{
-	    item =  static_cast<CatManListItem *>( item->parent());
+	    item =  static_cast<CatManListItem *>( item->tqparent());
 	    if( !item ) return item;
 	}
 	return static_cast<CatManListItem *>( item->previousSibling() );
@@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
 	    true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel);
 	_validateOptions = new ValidationOptions(_validateOptionsDlg);
 	_validateOptionsDlg->setMainWidget( _validateOptions );
-	_validateOptions->resize( _validateOptions->sizeHint() );
+	_validateOptions->resize( _validateOptions->tqsizeHint() );
 
 	// setup stored values
 	_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
@@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show )
 }
 
 #include "catalogmanagerview.moc"
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;