Rename a number of old tq methods that are no longer tq specific

106 files changed, 744 insertions, 744 deletions

diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp
index cb2b6390..156f52c1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/kfile-plugins/kfile_po.cpp
@@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
 {
   PoInfo poInfo;
   TQStringList wordList;
-  ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
+  ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
   if (status == OK) {
     KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo");
 
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 572c593c..01aa6b41 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -79,7 +79,7 @@
 #include <tqwhatsthis.h>
 #include <tqheader.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 
 using namespace KBabel;
@@ -126,7 +126,7 @@ void CatalogManager::init()
    
    if ( _project == NULL )
    {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile)
 	    , i18n("Project File Error"));
 
 	_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
@@ -136,13 +136,13 @@ void CatalogManager::init()
 	, TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
 
    TQWidget *view = new TQWidget(this);
-   TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
-   tqlayout->setMargin(0);
-   tqlayout->setSpacing(KDialog::spacingHint());
+   TQVBoxLayout* layout= new TQVBoxLayout(view);
+   layout->setMargin(0);
+   layout->setSpacing(KDialog::spacingHint());
 
    _catalogManager=new CatalogManagerView(_project, view,"catalog manager");
-   tqlayout->addWidget(_catalogManager);
-   tqlayout->setStretchFactor(_catalogManager,1);
+   layout->addWidget(_catalogManager);
+   layout->setStretchFactor(_catalogManager,1);
 
    connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
             ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
@@ -162,7 +162,7 @@ void CatalogManager::init()
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
 
-   TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout);
+   TQHBoxLayout* hBoxL = new TQHBoxLayout(layout);
    _progressLabel = new TQLabel(view);
    hBoxL->addWidget(_progressLabel);
    _progressBar=new KProgress(view);
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
     (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
     (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
-      TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
+      TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
     (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
     (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
     _statusProgressBar->hide();
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
+    statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
 
     TQWhatsThis::add(statusBar(),
 	i18n("<qt><p><b>Statusbar</b></p>\n"
@@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar()
 
 void CatalogManager::setNumberOfFound(int toBeSent, int total)
 {
-    _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total));
+    _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total));
 }
 
 void CatalogManager::decreaseNumberOfFound()
@@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen()
     }
     else
     {
-	KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file));
+	KMessageBox::error (this, i18n("Cannot open project file %1").arg(file));
     }
 }
 
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 2473af73..10630c6d 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -80,8 +80,8 @@
 #include <tqwhatsthis.h>
 #include <tqheader.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 using namespace KBabel;
 
@@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks()
 #endif
     {
 	KMessageBox::error(this,i18n(
-	    "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").arg(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.").tqarg(url.prettyURL()));
+		"Maybe it is not a valid file with list of markings.").arg(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").tqarg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").arg(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>").tqarg(i18n("The file %1 already exists. "
-	            "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+        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)
 	{
 	    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" ).tqarg( url.prettyURL()) );
+            i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( 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").tqarg(url.prettyURL()));
+                i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL()));
         }
     }
 
@@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics()
    showStatistics( i, markedDoList );
 }
 
-void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchildrenList )
+void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &childrenList )
 {
    KLocale *locale = KGlobal::locale();
 
@@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchi
       int totalUntranslated=0;
 
       TQStringList::const_iterator it;
-      for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+      for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
       {
          CatManListItem* item = _fileList[(*it)];
 
@@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchi
       if(name.isEmpty())
           msg = i18n("Statistics for all:\n");
       else
-          msg = i18n("Statistics for %1:\n").tqarg(name);
+          msg = i18n("Statistics for %1:\n").arg(name);
 
-      msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0));
+      msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0));
 
       percent=100.0-((double)needworkPo*100.0)/totalPackages;
-      msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0));
+      msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0));
 
       percent=100.0-((double)totalPo*100.0)/totalPackages;
-      msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0));
+      msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0));
       percent=((double)totalNoPot*100.0)/totalPackages;
-      msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0));
+      msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0));
 
-      msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0));
+      msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0));
 
       long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated;
       percent=((double)totalTranslated*100.0)/totalMsgid;
-      msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0));
+      msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0));
 
       percent=((double)totalFuzzy*100.0)/totalMsgid;
-      msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0));
+      msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0));
 
       percent=((double)totalUntranslated*100.0)/totalMsgid;
-      msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0));
+      msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0));
 
    KMessageBox::information(this,msg,i18n("Statistics"));
 }
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
       if(!item->hasPo())
          return;
 
-      Msgfmt::tqStatus status;
+      Msgfmt::Status status;
       TQString output;
       Msgfmt msgfmt;
 
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
    }
    else
    {
-      Msgfmt::tqStatus status;
+      Msgfmt::Status 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").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(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").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(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").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(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").tqarg(name);
+"in folder %1").arg(name);
             }
             else
             {
@@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles()
   CatManListItem* item = (CatManListItem*)currentItem();
   if(item->isDir()) {
     TQStringList filesToSend;
-    TQStringList tqchildrenList = item->allChildrenList(true);
+    TQStringList childrenList = item->allChildrenList(true);
 
     TQStringList::const_iterator it;
-    for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+    for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
       CatManListItem* i = _fileList[(*it)];
       if (i->hasPo()) {
 	filesToSend << i->poFile();
@@ -1023,10 +1023,10 @@ void CatalogManagerView::packageFiles( )
     CatManListItem* item = (CatManListItem*)currentItem();
     if(item->isDir()) {
         TQStringList filesToPackage;
-        TQStringList tqchildrenList = item->allChildrenList(true);
+        TQStringList childrenList = item->allChildrenList(true);
 
         TQStringList::const_iterator it;
-        for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+        for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
           CatManListItem* i = _fileList[(*it)];
           if (i->hasPo()) {
 	    filesToPackage << i->poFile();
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
   doCVSCommand( CVS::Commit, true );
 }
 
-void CatalogManagerView::cvstqStatus( )
+void CatalogManagerView::cvsStatus( )
 {
-  doCVSCommand( CVS::tqStatus );
+  doCVSCommand( CVS::Status );
 }
 
 void CatalogManagerView::cvsStatusMarked( )
 {
-  doCVSCommand( CVS::tqStatus, true );
+  doCVSCommand( CVS::Status, 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 tqchildren including directories
+      // all children 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 tqchildren including directories
+      // all children including directories
             TQStringList svnItems = item->allChildrenFileList (true, false, true);
             if ( !svnItems.isEmpty( ) )
                 svnhandler->execSVNCommand( this, cmd, svnItems, templates, config );
@@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
    const TQString search = options.findStr.lower().simplifyWhiteSpace();
    TQStringList searchWords = TQStringList::split(' ', search);
 
-   TQStringList tqchildrenList;
-   if( i->isFile() ) tqchildrenList.append(i->name());
-   else tqchildrenList =i->allChildrenList(true);
+   TQStringList childrenList;
+   if( i->isFile() ) childrenList.append(i->name());
+   else childrenList =i->allChildrenList(true);
 
-   emit prepareFindProgressBar(tqchildrenList.size());
+   emit prepareFindProgressBar(childrenList.size());
 
    TQStringList::const_iterator it;
-   for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+   for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
    {
 	 CatManListItem* item = _fileList[(*it)];
 
@@ -1341,7 +1341,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 		const TQString foundItemFile = itemFile;
 
 		it++;
-		while( it != tqchildrenList.constEnd() )
+		while( it != childrenList.constEnd() )
 		{
         	    CatManListItem *item = _fileList[(*it)];
 
@@ -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?").tqarg(item->poFile());
+      const TQString msg=i18n("Do you really want to delete the file %1?").arg(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!").tqarg(item->poFile()));
+             KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile()));
          }
       }
    }
@@ -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.").tqarg(_settings.poBaseDir));
+"Please check your settings in the project settings dialog.").arg(_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.").tqarg(_settings.potBaseDir));
+"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir));
    }
 
    cvshandler->setPOTBaseDir( _settings.potBaseDir );
@@ -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->tqsizeHint() );
+	_validateOptions->resize( _validateOptions->sizeHint() );
 
 	// setup stored values
 	_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index d923a3bb..fe4b7d35 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -161,7 +161,7 @@ public slots:
    void cvsUpdateMarked( );
    void cvsCommit( );
    void cvsCommitMarked( );
-   void cvstqStatus( );
+   void cvsStatus( );
    void cvsStatusMarked( );
    void cvsUpdateTemplate( );
    void cvsUpdateMarkedTemplate( );
@@ -235,7 +235,7 @@ public slots:
 
    /**
    * Returns the list of all currently selected files. If current selection is dir,
-   * it returns list of all its tqchildren.
+   * it returns list of all its children.
    */
    TQStringList current();
    /**
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index d5997dd5..52f248e2 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -183,7 +183,7 @@ void CatManListItem::setOpen(bool open)
 
 TQStringList CatManListItem::allChildrenList(bool onlyFiles) const
 {
-   TQStringList tqchildrenList;
+   TQStringList childrenList;
 
    CatManListItem * myChild = (CatManListItem*)firstChild();
    while( myChild )
@@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const
 
       if(myChild->isFile())
       {
-         tqchildrenList.append(name);
+         childrenList.append(name);
       }
       else if(myChild->isDir())
       {
          if(!onlyFiles)
-            tqchildrenList.append(name);
+            childrenList.append(name);
 
-         tqchildrenList+=myChild->allChildrenList(onlyFiles);
+         childrenList+=myChild->allChildrenList(onlyFiles);
       }
 
       myChild = (CatManListItem*)myChild->nextSibling();
    }
 
-   return tqchildrenList;
+   return childrenList;
 }
 
 
 TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const
 {
-   TQStringList tqchildrenList;
+   TQStringList childrenList;
 
    CatManListItem * myChild = (CatManListItem*)firstChild();
    while( myChild )
@@ -219,22 +219,22 @@ TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs,
       if(myChild->isFile() && myChild->hasPo() &&
        !(!myChild->isModified() && onlyModified))
       {
-         tqchildrenList.append(myChild->poFile());
+         childrenList.append(myChild->poFile());
       }
       else if(myChild->isDir())
       {
          if(!onlyFiles && (emptyDirs || myChild->_primary.exists() ))
 	 {
-            tqchildrenList.append(myChild->poFile());
+            childrenList.append(myChild->poFile());
 	 }
 
-         tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
+         childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
       }
 
       myChild = (CatManListItem*)myChild->nextSibling();
    }
 
-   return tqchildrenList;
+   return childrenList;
 }
 
 
@@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
 
              if(showPoInfo)
              {
-                _lastUpdated=TQDateTime::tqcurrentDateTime();
+                _lastUpdated=TQDateTime::currentDateTime();
 
 			    bool neededWork=needsWork();
 				bool needWork=false;
@@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
                     const CVSHandler* cvsHandler = _view->cvsHandler();
                     const SVNHandler* svnHandler = _view->svnHandler();
                     
-                    const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() );
-                    const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() );
+                    const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() );
+                    const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() );
 
-                    _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus )
-                        || svnHandler->isConsideredModified( svnFiletqStatus );
+                    _isModified = cvsHandler->isConsideredModified( cvsFileStatus )
+                        || svnHandler->isConsideredModified( svnFileStatus );
 
                     TQString versionControl;
-                    if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
-                        versionControl = cvsHandler->filetqStatus( cvsFiletqStatus );
-                    else if  ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
-                        versionControl = svnHandler->filetqStatus( svnFiletqStatus );
+                    if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+                        versionControl = cvsHandler->fileStatus( cvsFileStatus );
+                    else if  ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+                        versionControl = svnHandler->fileStatus( svnFileStatus );
                     else
                         versionControl = i18n("No version control");
 
@@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
 
              if(showPoInfo)
              {
-                _lastUpdated=TQDateTime::tqcurrentDateTime();
+                _lastUpdated=TQDateTime::currentDateTime();
 
 		// clean previous state information
 		setText(COL_FUZZY,TQString());
@@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
         TQString name=_primary.fileName();
         setText(COL_NAME,name.left(name.length()-3));
 
-        _lastUpdated=TQDateTime::tqcurrentDateTime();
+        _lastUpdated=TQDateTime::currentDateTime();
 
 	bool neededWork=needsWork();
 	bool needWork=false;
@@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
         TQPixmap icon;
 	_hasErrors=false;
 
-        const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile());
-        const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile());
+        const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile());
+        const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile());
 
         TQString versionControl;
-        if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
-            versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus );
-        else if  ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
-            versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus );
+        if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+            versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus );
+        else if  ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+            versionControl = _view->svnHandler()->fileStatus( svnFileStatus );
         else
             versionControl = i18n("No version control");
  
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h
index ac22e2e8..b94a0618 100644
--- a/kbabel/catalogmanager/catmanlistitem.h
+++ b/kbabel/catalogmanager/catmanlistitem.h
@@ -68,11 +68,11 @@ public:
 
    /**
 	* returns the package names (including relative path) of the
-	* tqchildren of this item
+	* children of this item
 	*/
    TQStringList contentsList(bool onlyFiles=false) const;
    /**
-   * returns the package names of all tqchildren of this item
+   * returns the package names of all children of this item
    * (including all subdirectries)
    * @param onlyFiles flag, if only the names of files should be returned
    * @see CatManListItem::contentsList
@@ -80,7 +80,7 @@ public:
    TQStringList allChildrenList(bool onlyFiles=false) const;
 
    /**
-   * returns the relative file names of all tqchildren of this item
+   * returns the relative file names of all children of this item
    * (including all subdirectries)
    * @param onlyFiles flag, if only the names of files should be returned
    * @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should be returned
@@ -183,7 +183,7 @@ private:
    * @param showPoInfo if true, reads information about the
    * file using @ref Catalog::info
    * ( slow for big files )
-   * @param includeChildren flag, if possible tqchildren should be updated,too
+   * @param includeChildren flag, if possible children should be updated,too
    * @param noParents flag, if parents should be updated, when state
    * of the item has changed
    */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 25c37594..6fa274d4 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -34,7 +34,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kconfig.h>
@@ -48,7 +48,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
 		:FindDialog(forReplace, parent)
 {
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
-	mainWidget()->tqlayout()->add(box);
+	mainWidget()->layout()->add(box);
 
 	_inAllFiles = new TQCheckBox(i18n("&In all files"),box);
 	_inMarked = new TQCheckBox(i18n("&Marked files"),box);
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..04ecd906 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -38,13 +38,13 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextedit.h>
-#include <tqtextcodec.h>
+#include <textedit.h>
+#include <textcodec.h>
 // KDE include files
 #include <kconfig.h>
 #include <kdebug.h>
@@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the CVS command.
   switch ( cmd ) {
@@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "Commit the following files:" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "Get status for the following files:" );
       break;
     case CVS::Diff:
       temp = i18n( "Get diff for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'cvs commit'.
   if ( cmd == CVS::Commit ) {
@@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( label );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( label );
+    layout->addWidget( logedit );
 
     label = new TQLabel( i18n( "E&ncoding:" ), this );
     m_encodingComboBox = new KComboBox( this );
     label->setBuddy( m_encodingComboBox );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( m_encodingComboBox );
+    layout->addWidget( label );
+    layout->addWidget( m_encodingComboBox );
     TQStringList encodingList;
     // The last encoding will be added at the top of the list, when the seetings will be read.
-    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() );
+    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
     m_encodingComboBox->insertStringList( encodingList );
     
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "&Commit" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "&Get Status" );
       break;
     case CVS::Diff:
@@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 
   if ( cmd == CVS::Commit )
     logedit->setFocus( );
@@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( )
 
     if ( !codec )
     {
-        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) );
+        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) );
         return;
     }
     else if ( !codec->canEncode( msg ) )
     {
         const int res = KMessageBox::warningContinueCancel( this,
             i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n"
-            "Do you want to continue?" ).tqarg( m_encoding ) );
+            "Do you want to continue?" ).arg( m_encoding ) );
         if ( res != KMessageBox::Continue )
             return;
     }
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
   output->setCursorPosition( output->lines( ), 0 );
 
   // If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
-  if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+  if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
     _statusOutput += TQString::fromLocal8Bit( buffer, len );
 }
 
@@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void CVSDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -383,9 +383,9 @@ void CVSDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
     {
-      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
       if ( !logMessage.isEmpty() )
       {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -398,7 +398,7 @@ void CVSDialog::readSettings( )
     }
 
     m_encoding = config->readEntry( "CVSEncoding", "UTF-8" );
-    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0);
+    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0);
   }
 }
 
@@ -413,7 +413,7 @@ void CVSDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
 
     config->writeEntry( "CVSEncoding", m_encoding );
   }
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..b0be0345 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
   emit signalIsPOTRepository( _isPOTRepository );
 }
 
-TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
   }
 }
 
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -130,7 +130,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
   // ### FIXME: it does not take care of CVS/Entries.Log
   // a line in CVS/Entries has the following format:
   // [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE
-  TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) );
+  TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) );
 
   TQString temp;
   TQTextStream stream( &entries );
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
   return UP_TO_DATE;
 }
 
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( const TQString& filename ) const
 {
   return map[filename];
 }
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( TQStringList( filename ) );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       command += "status";
       break;
     case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( files );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       command += "status";
       break;
     case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
   }
 
   if ( dia->exec( ) == KDialog::Accepted ) {
-    if ( cmd == CVS::tqStatus )
+    if ( cmd == CVS::Status )
       processStatusOutput( dia->statusOutput( ) );
     if ( cmd == CVS::Diff )
       processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
     KMessageBox::error( 0, error );
 }
 
-bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
 {
   /*
    * A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
   TQ_OBJECT
 
   public:
-    enum FiletqStatus {
+    enum FileStatus {
       NO_REPOSITORY,
       NOT_IN_CVS,
       LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FiletqStatus fstatus( const TQString& filename ) const;
-    TQString filetqStatus( const FiletqStatus status ) const;
-    TQString cvstqStatus( const TQString& filename ) const;
+    FileStatus fstatus( const TQString& filename ) const;
+    TQString fileStatus( const FileStatus status ) const;
+    TQString cvsStatus( const TQString& filename ) const;
 
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FiletqStatus status ) const;
+    bool isConsideredModified( const FileStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
 #define CVSRESOURCES_H
 
 namespace CVS {
-  enum Command { Update, Commit, tqStatus, Diff };
+  enum Command { Update, Commit, Status, Diff };
 }
 
 #endif // CVSRESOURCES_H
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 756ace69..075a8235 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -38,12 +38,12 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 // KDE include files
 #include <kconfig.h>
 #include <kdebug.h>
@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the SVN command.
   switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
       temp = i18n( "Get information for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'svn commit'.
   if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( label );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( label );
+    layout->addWidget( logedit );
 
     connect( oldMessages, TQT_SIGNAL( activated( int ) ),
       this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 
   if ( cmd == SVN::Commit )
     logedit->setFocus( );
@@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void SVNDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -362,9 +362,9 @@ void SVNDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
       {
-        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
         if ( !logMessage.isEmpty() )
         {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -390,7 +390,7 @@ void SVNDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
   }
   m_config->sync();
 }
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 5f91e1e8..d00c0858 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir )
   emit signalIsPOTRepository( _isPOTRepository );
 }
 
-TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
+TQString SVNHandler::fileStatus( const FileStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
   }
 }
 
-SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
   int errorLine, errorCol;
   TQDomNodeList nodelist;
   TQDomNode node;
-  TQDomElement entry, wctqStatus;
+  TQDomElement entry, wcStatus;
 
   // Parse the output.
   if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
   if ( node.isNull() )
     return ERROR_IN_WC;
 
-  wctqStatus = node.toElement();
+  wcStatus = node.toElement();
 
-  if ( wctqStatus.attributeNode("item").value() == "normal" )
+  if ( wcStatus.attributeNode("item").value() == "normal" )
     return UP_TO_DATE;
-  if ( wctqStatus.attributeNode("item").value() == "modified" )
+  if ( wcStatus.attributeNode("item").value() == "modified" )
     return LOCALLY_MODIFIED;
-  if ( wctqStatus.attributeNode("item").value() == "conflicted" )
+  if ( wcStatus.attributeNode("item").value() == "conflicted" )
     return CONFLICT;
-  if ( wctqStatus.attributeNode("item").value() == "unversioned" )
+  if ( wcStatus.attributeNode("item").value() == "unversioned" )
     return NOT_IN_SVN;
   // TODO Ignored entry should have separate return value probably.
-  if ( wctqStatus.attributeNode("item").value() == "ignored" )
+  if ( wcStatus.attributeNode("item").value() == "ignored" )
     return NOT_IN_SVN;
-  if ( wctqStatus.attributeNode("item").value() == "added" )
+  if ( wcStatus.attributeNode("item").value() == "added" )
     return LOCALLY_ADDED;
-  if ( wctqStatus.attributeNode("item").value() == "deleted" )
+  if ( wcStatus.attributeNode("item").value() == "deleted" )
     return LOCALLY_REMOVED;
   // TODO What to do with "missing", "incomplete", "replaced", "merged",
   // "obstructed", "external"? Can these appear at all in our case?
@@ -269,7 +269,7 @@ no_status_xml:
 
 }
 
-TQString SVNHandler::svntqStatus( const TQString& filename ) const
+TQString SVNHandler::svnStatus( const TQString& filename ) const
 {
   return map[filename];
 }
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
     KMessageBox::error( 0, error );
 }
 
-bool SVNHandler::isConsideredModified( const FiletqStatus status ) const
+bool SVNHandler::isConsideredModified( const FileStatus status ) const
 {
   /*
    * A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index 57ce13b4..2506d0bd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -58,7 +58,7 @@ class SVNHandler : public TQObject
   TQ_OBJECT
 
   public:
-    enum FiletqStatus {
+    enum FileStatus {
       NO_REPOSITORY,
       NOT_IN_SVN,
       LOCALLY_ADDED,
@@ -74,9 +74,9 @@ class SVNHandler : public TQObject
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FiletqStatus fstatus( const TQString& filename ) const;
-    TQString filetqStatus( const FiletqStatus status ) const;
-    TQString svntqStatus( const TQString& filename ) const;
+    FileStatus fstatus( const TQString& filename ) const;
+    TQString fileStatus( const FileStatus status ) const;
+    TQString svnStatus( const TQString& filename ) const;
 
     void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
     void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -86,7 +86,7 @@ class SVNHandler : public TQObject
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FiletqStatus status ) const;
+    bool isConsideredModified( const FileStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 16373a0b..56074c66 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -36,7 +36,7 @@
 #include "multiroughtransdlg.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -58,9 +58,9 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
     filesProgressbar->setTextEnabled(true);
     filesProgressbar->setFormat("%v/%m (%p%)");
     filesProgressbar->setTotalSteps(files.count());
-    TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout());
-    mytqlayout->add(label);
-    mytqlayout->add(filesProgressbar); 
+    TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout());
+    mylayout->add(label);
+    mylayout->add(filesProgressbar); 
     
     msgButtonClicked(0);
 }
@@ -82,7 +82,7 @@ void MultiRoughTransDlg::translate()
 	    if( catalog->openURL( url ) != OK )
 	    {
 		KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
-		    "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+		    "Maybe it is not a valid PO file.").arg(url.prettyURL()));
 		filesProgressbar->advance(1);
 		continue;
 	    }
@@ -94,7 +94,7 @@ void MultiRoughTransDlg::translate()
 	    if( catalog->openURL( poturl, url ) != OK )
 	    {
 		KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
-		    "Maybe it is not a valid PO file.").tqarg(poturl.prettyURL()));
+		    "Maybe it is not a valid PO file.").arg(poturl.prettyURL()));
 		filesProgressbar->advance(1);
 		continue;
 	    }
@@ -131,13 +131,13 @@ void MultiRoughTransDlg::showAllStatistics()
             "Exact translations: %2 (%3%)\n"
             "Approximate translations: %4 (%5%)\n"
             "Nothing found: %6 (%7%)")
-            .tqarg( locale->formatNumber(tt,0) )
-            .tqarg( locale->formatNumber(etc,0) )
-            .tqarg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
-            .tqarg( locale->formatNumber(ptc,0) )
-            .tqarg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
-            .tqarg( locale->formatNumber(nothing,0) )
-            .tqarg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
+            .arg( locale->formatNumber(tt,0) )
+            .arg( locale->formatNumber(etc,0) )
+            .arg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
+            .arg( locale->formatNumber(ptc,0) )
+            .arg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
+            .arg( locale->formatNumber(nothing,0) )
+            .arg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
 
     KMessageBox::information(this, statMsg
             , i18n("Rough Translation Statistics"));
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 42fd3f39..8ac02c0d 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -187,7 +187,7 @@ void ValidateProgressDialog::validate_internal()
 	"\n"
 	"Checked files: %1\n"
 	"Number of errors: %2\n"
-	"Number of ignored errors: %3").tqarg(checked).tqarg(errors).tqarg(ignorederrors),i18n("Validation Done"));
+	"Number of ignored errors: %3").arg(checked).arg(errors).arg(ignorederrors),i18n("Validation Done"));
     }
 
     delete _tool;
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index 01cb4c5f..a1573341 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -28,7 +28,7 @@
                     <property name="name">
                         <cstring>_currentAction</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>92</width>
                             <height>0</height>
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h
index 70655c72..e6fddef2 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui.h
+++ b/kbabel/catalogmanager/validateprogresswidget.ui.h
@@ -44,5 +44,5 @@ void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue )
     TQString t = text[0].upper()+text.mid(1)+":";
     
     _currentAction->setText(t);
-    _currentAction->tqrepaint();
+    _currentAction->repaint();
 }
diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui
index 23c3cb71..88169f7a 100644
--- a/kbabel/catalogmanager/validationoptions.ui
+++ b/kbabel/catalogmanager/validationoptions.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 00c9491d..7470ad87 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -31,13 +31,13 @@
   your version.
   
 **************************************************************************** */
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqdatetime.h>
 
 #include <kconfig.h>
@@ -497,7 +497,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
    }
 
    temp="X-Generator: KBabel %1\\n";
-   temp=temp.tqarg(VERSION);
+   temp=temp.arg(VERSION);
    found=false;
 
    for( it = headerList.begin(); it != headerList.end(); ++it )
@@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
 
 
    temp="Plural-Forms: %1\\n";
-   temp=temp.tqarg(identityOptions.gnuPluralFormHeader);
+   temp=temp.arg(identityOptions.gnuPluralFormHeader);
    found=false;
 
    // update plural form header
@@ -578,12 +578,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
     		if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove) 
 		    (*it).remove(" YEAR Free Software Foundation, Inc");
 		else 
-		    (*it).replace("YEAR", TQDate::tqcurrentDate().toString("yyyy"));
+		    (*it).replace("YEAR", TQDate::currentDate().toString("yyyy"));
 	    } else
 	    if( saveOptions.FSFCopyright == ProjectSettingsBase::Update )
 	    {
 		    //update years
-		    TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+		    TQString cy = TQDate::currentDate().toString("yyyy");
 		    if( !(*it).contains( TQRegExp(cy)) ) // is the year already included?
 		    {
 			int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
@@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         {
             temp+=(" <"+identityOptions.authorEmail+">");
         }
-        temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+".";
+        temp+=", "+TQDate::currentDate().toString("yyyy")+".";
 
         // ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory)
         TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" );
@@ -721,7 +721,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
             found = false;
             bool foundAuthor = false;
     
-            const TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+            const TQString cy = TQDate::currentDate().toString("yyyy");
 
             ait = foundAuthors.end();
             for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it )
@@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on)
 
 }
 
-void Catalog::removeFuzzytqStatus(uint index)
+void Catalog::removeFuzzyStatus(uint index)
 {
     setFuzzy(index,false);
 }
@@ -888,10 +888,10 @@ TQString Catalog::encoding() const
     return encodingStr;
 }
 
-ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
 {
    TQString target;
-   ConversiontqStatus error = OK;
+   ConversionStatus error = OK;
 
    if(KIO::NetAccess::download(url, target, NULL))
    {
@@ -992,10 +992,10 @@ ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
    }
 }
 
-ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
 {
    TQString target;
-   ConversiontqStatus error = OK;
+   ConversionStatus error = OK;
 
    if(KIO::NetAccess::download(openUrl, target, NULL))
    {
@@ -1093,7 +1093,7 @@ ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, co
    }
 }
 
-Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
+Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
 {
    if( !d->_mimeTypes.contains( "application/x-gettext" ) )
 	return Msgfmt::Unsupported;
@@ -1112,7 +1112,7 @@ Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
    }
 
    Msgfmt msgfmt;
-   Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
+   Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
 
    if( clearErrors) clearErrorList();
 
@@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index)
 	}
 }
 
-TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
+TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
 {
     if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1207,7 +1207,7 @@ TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool
 	return item.errors();
 }
 
-TQStringList Catalog::itemtqStatus(uint index)
+TQStringList Catalog::itemStatus(uint index)
 {
        if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const
 
 TQString Catalog::dateTime() const
 {
-    const TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    const TQDateTime dt = TQDateTime::currentDateTime();
     TQString dateTimeString;
     
     const SaveSettings options = d->_project->saveSettings();
@@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const
 }
 
 
-ConversiontqStatus Catalog::saveFile()
+ConversionStatus Catalog::saveFile()
 {
    if(d->_url.isEmpty())
    {
@@ -1947,11 +1947,11 @@ ConversiontqStatus Catalog::saveFile()
    return saveFileAs(d->_url,true);
 }
 
-ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
+ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
 {
    if( d->_active ) return BUSY;
 
-   ConversiontqStatus status=OK;
+   ConversionStatus status=OK;
 
    bool newName=false;
    KURL targetURL=d->_url;
@@ -2043,7 +2043,7 @@ TQString Catalog::saveTempFile()
 }
 
 
-ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
+ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
 {
    TQFileInfo info(localFile);
 
@@ -2066,7 +2066,7 @@ ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
       }
    }
 
-    ConversiontqStatus error = OK;
+    ConversionStatus error = OK;
     CatalogExportPlugin* filter=0;
 
     // gimme plugin for this MIME type
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->tqprocessEvents(10);
+		kapp->processEvents(10);
 
 		if( d->_stop || endReached)
 		{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->tqprocessEvents(10);
+		kapp->processEvents(10);
 
 		if( d->_stop || beginReached)
 		{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
                 bestId = (*it);
             }
 
-            kapp->tqprocessEvents(10);
+            kapp->processEvents(10);
 
 	    if( d->_stop )
 	    {
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
         {
             oldPercent = percent;
             emit signalProgress(percent);
-            kapp->tqprocessEvents(10);
+            kapp->processEvents(10);
         }
 
         TQString id = (*it).msgid;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index dd8c3a30..a034375e 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -226,7 +226,7 @@ public:
     * @return the list of errors found for a given item index
     * @param index index of the item to check
     */
-   TQStringList itemtqStatus(uint index);
+   TQStringList itemStatus(uint index);
 
    /**
     * @return the list of errors found for a given item index
@@ -234,7 +234,7 @@ public:
     * @param recheck flag, if the item status should be checked now
     * @param whatToCheck what checks to do (a list of tools to be used
     */
-   TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
+   TQStringList itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
 
    /**
    * replaces msgstr in catalog item at index index with msgstr
@@ -253,7 +253,7 @@ public:
    bool setHeader(CatalogItem header);
 
    /** removes string ", fuzzy" from comment */
-   void removeFuzzytqStatus(uint index);
+   void removeFuzzyStatus(uint index);
 
    /** sets or unsets fuzzy status of entry index */
    void setFuzzy(uint index, bool on);
@@ -297,19 +297,19 @@ public:
    * opens file url by using KDE's network downlad and calls
    * openFile with a local filename
    */
-   ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString());
+   ConversionStatus openURL(const KURL& url, const TQString& package=TQString());
 
    /**
    * opens file openURL by using KDE's network downlad and calls
    * openFile with a local filename
    * sets current URL to saveURL
    */
-   ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
+   ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
 
    /** save the file under the old filename */
-   ConversiontqStatus saveFile();
+   ConversionStatus saveFile();
    /** saves the file under a new filename */
-   ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false);
+   ConversionStatus saveFileAs(const KURL& url,bool overwrite=false);
 
    /**
    * saves the current catalog in a temporary file and
@@ -342,7 +342,7 @@ public:
     * @param clearError should the errors be cleared before running msgfmt
     * @return the file codec used for the current catalog
     */
-   Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true);
+   Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true);
 
    /**
     * checks using an external tool. The tool must provide the "validate" command
@@ -484,7 +484,7 @@ public:
    * the search in po-files. This way, I can easily find the first
    * catalog entry in the textstream
    */
-//   static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header);
+//   static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header);
 
 
    void registerView(CatalogView* view);
@@ -612,7 +612,7 @@ private:
    void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false);
 
    /** do the actual file write using plugin */
-   ConversiontqStatus writeFile(TQString localfile, bool overwrite=false);
+   ConversionStatus writeFile(TQString localfile, bool overwrite=false);
 
    /**
    * generates  lists that contain indexes of all fuzzy and untranslated entries
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index d4e72a76..631a94b3 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -50,7 +50,7 @@ class CatalogExportPluginPrivate;
 /**
  * Result of the conversion
  */
-enum ConversiontqStatus { 
+enum ConversionStatus { 
     OK,
     NOT_IMPLEMENTED,
     NO_FILE,
@@ -97,7 +97,7 @@ public:
      * @param catalog  the catalog to be filled
      * @return result of the operation
      */
-    ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
+    ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
     
     /**
     * Reimplement this method to load the local file passed as an argument.
@@ -109,7 +109,7 @@ public:
     * @param file file to be loaded
     * @param mimetype the expected MIME type (the type used for plugin selection
     */
-    virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0;
+    virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0;
     /**
     * Reimplement this method to return unique identification of your plugin
     */
@@ -183,7 +183,7 @@ class KDE_EXPORT CatalogExportPlugin: public TQObject
 public:
     CatalogExportPlugin(TQObject* parent, const char* name);
     virtual ~CatalogExportPlugin();
-    virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
+    virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
 
     static TQStringList availableExportMimeTypes();
 
diff --git a/kbabel/common/catalogitem.cpp b/kbabel/common/catalogitem.cpp
index 234637d1..0dd1a9ae 100644
--- a/kbabel/common/catalogitem.cpp
+++ b/kbabel/common/catalogitem.cpp
@@ -40,8 +40,8 @@
 
 #include "regexpextractor.h"
 
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <textstream.h>
+#include <textcodec.h>
 #include <tqdom.h>
 
 using namespace KBabel;
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index 24d469ec..4dc9cca1 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqregexp.h>
 
 #include <stdlib.h>
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index ed6d15ef..e75deca7 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes )
     d->_mimeTypes=mimetypes;
 }
 
-ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
+ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
 {
     d->_stopped=false;
     d->_catalog=catalog;
     startTransaction();
     
-    ConversiontqStatus result = load(file, mimetype);
+    ConversionStatus result = load(file, mimetype);
     if( d->_stopped ) 
     {
 	d->_started=false;
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 90f61256..18c679b1 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
       kapp->invokeMailer("", "", "", "", "", "", fileName);
     else
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
     }
   }
   else
@@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
 #endif
     TQString poTempName;
     if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) {
-      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
       continue;
     }
 
@@ -205,7 +205,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
       poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) );
     if ( !archive.addLocalFile( poTempName, poArchFileName ) ) 
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) );
     }
    
     KIO::NetAccess::removeTempFile(poTempName);
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index f91f25f9..6a2f9d2b 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -39,7 +39,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 #include <stdlib.h>
@@ -51,9 +51,9 @@ Msgfmt::Msgfmt(TQObject* parent,const char* name)
 {
 }
 
-Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
+Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
 {
-   tqStatus stat=Ok;
+   Status stat=Ok;
    // this method does not return the right retrun values at the moment :-(
 
    KProcess proc;
@@ -92,9 +92,9 @@ Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
    return stat;
 }
 
-Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
+Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
 {
-   tqStatus stat=Ok;
+   Status stat=Ok;
 
    // this method does not return the right return values at the moment :-(
    KProcess proc;
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 025a2fdd..c711cf48 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -47,11 +47,11 @@ class KDE_EXPORT Msgfmt : private TQObject
    Q_OBJECT
   TQ_OBJECT
 public:
-   enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
+   enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
    Msgfmt(TQObject* parent=0,const char* name=0);
 
-   tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
-   tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
+   Status checkSyntax(TQString file,TQString& output, bool gnu = false);
+   Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
 
 private slots:
    void addToOutput(KProcess*,char *buffer, int buflen);
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 63a01d38..3ab33287 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -48,7 +48,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include "libgettext/pofiles.h"
 #include "libgettext/tokens.h"
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
 }
 
 
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
 {
     return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
 }
 
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
 {
    stopStaticRead = false;
 
@@ -372,7 +372,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
             // First check file with msgfmt to be sure, it is syntactically correct
             Msgfmt msgfmt;
             TQString output;
-            Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
+            Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
             if(stat == Msgfmt::SyntaxError)
             {
                 KIO::NetAccess::removeTempFile(target);
@@ -395,11 +395,11 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
 	   lexer->yylex();
 	   
            // now parse the rest of the file
-           ConversiontqStatus success=OK;
+           ConversionStatus success=OK;
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
-               if( interactive ) kapp->tqprocessEvents(10);
+               if( interactive ) kapp->processEvents(10);
 	       
 	       if( stopStaticRead )
 	       {
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
            // first read header
 	   CatalogItem temp;
 	   
-	   ConversiontqStatus status = fastRead( temp, lexer, true );
+	   ConversionStatus status = fastRead( temp, lexer, true );
 	   if( status != OK || !temp.msgid().first().isEmpty() ) 
 	   {
 		delete lexer;
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		   }
 		   case T_MSGID: 
 		   case T_MSGIDPLURAL: {
-	    		kapp->tqprocessEvents(10);
+	    		kapp->processEvents(10);
 			
 			// if stopped, return not found
 			if( stopStaticRead ) 
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 }
 
 // this does not like any incorrect files
-ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
 {
    item.clear();
    _gettextPluralForm = false;
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 58e0bc66..70ba652a 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -105,7 +105,7 @@ public:
     *        being parsed?
     * @since KBabel 1.11 (KDE 3.5)
     */
-   static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
+   static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
 
    /** 
     * @brief Get information about the PO file
@@ -121,7 +121,7 @@ public:
     *       KBabel 1.11.1 (KDE 3.5.1)
     * @note This function always call Gettext's mgfmt before parsing each file
     */
-   static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
+   static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
 
    static PoInfo headerInfo(const CatalogItem&);
    static bool findInFile(const TQString& url, FindOptions options );
@@ -147,7 +147,7 @@ private:
     */
    static void cacheRead();
 
-   static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
+   static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
    
    static bool _gettextPluralForm;
 };
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index df8ce38a..77abf661 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -35,7 +35,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <klocale.h>
@@ -45,38 +45,38 @@
 CmdEdit::CmdEdit(TQWidget* parent, const char* name)
        : TQWidget(parent,name)
 {
-    TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* layout = new TQGridLayout( this , 1 , 1 );
+    layout->setSpacing( KDialog::spacingHint() );
 
     TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this);
     TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this);
-    tqlayout->addWidget( nameLabel, 0 , 0 );
-    tqlayout->addWidget( cmdLabel, 0 , 1 );
+    layout->addWidget( nameLabel, 0 , 0 );
+    layout->addWidget( cmdLabel, 0 , 1 );
 
     _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" );
     _cmdNameEdit->setMaxLength(20);
     nameLabel->setBuddy(_cmdNameEdit);
-    tqlayout->addWidget( _cmdNameEdit , 1 , 0 );
+    layout->addWidget( _cmdNameEdit , 1 , 0 );
 
     _cmdEdit = new TQLineEdit( this , "cmdEdit" );
     cmdLabel->setBuddy(_cmdEdit);
-    tqlayout->addWidget( _cmdEdit , 1 , 1 );
+    layout->addWidget( _cmdEdit , 1 , 1 );
 
 
     _addButton = new TQPushButton( i18n("&Add"), this );
     _addButton->setEnabled(false);
-    tqlayout->addWidget( _addButton , 1 , 2 );
+    layout->addWidget( _addButton , 1 , 2 );
 
     _editButton = new TQPushButton( i18n("&Edit"), this );
     _editButton->setEnabled(false);
-    tqlayout->addWidget( _editButton , 3 , 2 );
+    layout->addWidget( _editButton , 3 , 2 );
 
     _removeButton = new TQPushButton( i18n("&Remove"), this );
     _removeButton->setEnabled(false);
-    tqlayout->addWidget( _removeButton , 4 , 2 );
+    layout->addWidget( _removeButton , 4 , 2 );
 
     TQHBoxLayout* hbox = new TQHBoxLayout();
-    tqlayout->addLayout(hbox,5,2);
+    layout->addLayout(hbox,5,2);
 
     _upButton = new TQToolButton(UpArrow,this);
     _upButton->setFixedSize(20,20);
@@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
 
     _commandNames = new TQListBox( this , "commandNamesBox" );
     _commandNames->setMinimumSize(100, 100);
-    tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
+    layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
 
     _commands = new TQListBox( this , "commandsBox" );
     _commands->setMinimumSize(160, 100);
-    tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
+    layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
 
 
-    tqlayout->setColStretch(0,1);
-    tqlayout->setColStretch(1,2);
-    tqlayout->setColStretch(2,0);
+    layout->setColStretch(0,1);
+    layout->setColStretch(1,2);
+    layout->setColStretch(2,0);
 
-    tqlayout->addRowSpacing(2, KDialog::spacingHint());
-    tqlayout->addRowSpacing(6, KDialog::spacingHint());
+    layout->addRowSpacing(2, KDialog::spacingHint());
+    layout->addRowSpacing(6, KDialog::spacingHint());
 
-    setMinimumSize(tqlayout->tqsizeHint());
+    setMinimumSize(layout->sizeHint());
 
 
     connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index cb54e884..338506f9 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui
index c52e3c27..a1bfd757 100644
--- a/kbabel/commonui/diffpreferences.ui
+++ b/kbabel/commonui/diffpreferences.ui
@@ -72,7 +72,7 @@ in KBabel's main window.&lt;/p&gt;&lt;/qt&gt;</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -116,7 +116,7 @@ the database are used for diffing.&lt;/p&gt;&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 980f9802..3205c062 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 
@@ -57,15 +57,15 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 		, _regExpEditDialog(0), _replaceDlg(forReplace)
 {
 	TQWidget* page = new TQWidget(this);
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("&Find:"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	_findCombo = new KComboBox(true, page, "findCombo");
 	_findCombo->setMaxCount(10);
 	_findCombo->setInsertionPolicy(KComboBox::AtTop);
-	tqlayout->addWidget(_findCombo);
+	layout->addWidget(_findCombo);
 	label->setBuddy(_findCombo);
 
 	TQString msg=i18n("<qt><p><b>Find text</b></p>"
@@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
                 setButtonOK(i18n("&Replace"));
 
 		_replaceLabel = new TQLabel(i18n("&Replace with:"),page);
-		tqlayout->addWidget(_replaceLabel);
+		layout->addWidget(_replaceLabel);
 		_replaceCombo = new KComboBox(true, page, "replaceCombo");
 		_replaceCombo->setMaxCount(10);
 		_replaceCombo->setInsertionPolicy(KComboBox::AtTop);
-		tqlayout->addWidget(_replaceCombo);
+		layout->addWidget(_replaceCombo);
 		_replaceLabel->setBuddy(_replaceCombo);
 
 	    	msg=i18n("<qt><p><b>Replace text</b></p>"
@@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 	_buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page);
 	connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int)));
-	tqlayout->addWidget(_buttonGrp);
+	layout->addWidget(_buttonGrp);
 
 	_inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp);
 	_inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp);
@@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 
 	_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box);
 	_wholeWords = new TQCheckBox(i18n("O&nly whole words"),box);
@@ -536,10 +536,10 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent)
                    , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All"))
 {
 	TQWidget* page = plainPage();
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("Replace this string?"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace()));
 	connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next()));
diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp
index 9e5d3e79..3f23b24d 100644
--- a/kbabel/commonui/kactionselector.cpp
+++ b/kbabel/commonui/kactionselector.cpp
@@ -38,7 +38,7 @@
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index b31497b4..4b7eeb0d 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -97,7 +97,7 @@
                                     <property name="name">
                                         <cstring>_list</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>200</width>
                                             <height>200</height>
@@ -172,7 +172,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index f34d2cc2..9994b514 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -37,7 +37,7 @@
 #include "diffpreferences.h"
 #include "kbprojectsettings.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 163b4eeb..e10ba1bf 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -58,7 +58,7 @@
 #include <kurldrag.h>
 #include <kurlrequester.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
@@ -71,7 +71,7 @@
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqwhatsthis.h>
 
 using namespace KBabel;
@@ -79,9 +79,9 @@ using namespace KBabel;
 static TQSize sizeHintForWidget(const TQWidget* widget)
 {
   //
-  // The size is computed by adding the tqsizeHint().height() of all
-  // widget tqchildren and taking the width of the widest child and adding
-  // tqlayout()->margin() and tqlayout()->spacing()
+  // The size is computed by adding the sizeHint().height() of all
+  // widget children and taking the width of the widest child and adding
+  // layout()->margin() and layout()->spacing()
   //
 
   TQSize size;
@@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
       numChild += 1;
       TQWidget *w=((TQWidget*)o);
 
-      TQSize s = w->tqsizeHint();
+      TQSize s = w->sizeHint();
       if( s.isEmpty() == true )
       {
           s = TQSize( 50, 100 ); // Default size
@@ -109,8 +109,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
 
   if( numChild > 0 )
   {
-    size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
-    size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
+    size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
+    size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
   }
   else
   {
@@ -127,12 +127,12 @@ SavePreferences::SavePreferences(TQWidget *parent)
     :  KTabCtl(parent)
 {
     TQWidget* page = new TQWidget(this);
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     box->setMargin(KDialog::marginHint());
     _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate");
@@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete");
     
     TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page);
-    tqlayout->addWidget(descBox);
+    layout->addWidget(descBox);
     
     descBox->setMargin(KDialog::marginHint());
     _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString");
@@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding")
                                   ,page);
     encodingBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(encodingBox);
+    layout->addWidget(encodingBox);
     TQHBox *b = new TQHBox(encodingBox);
 
     TQLabel* tempLabel=new TQLabel(i18n("Default:"),b);
@@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent)
 
     _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page );
     _autoSaveBox->setMargin( KDialog::marginHint( ) );
-    tqlayout->addWidget( _autoSaveBox );
+    layout->addWidget( _autoSaveBox );
     _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" );
     _autoSaveDelay->setRange( 0, 60 );
     _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) );
     _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&General"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page);
-    tqlayout->addWidget(gridBox);
+    layout->addWidget(gridBox);
     gridBox->setMargin(KDialog::marginHint());
 
     _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate");
@@ -204,7 +204,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject");
 
     TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
-    tqlayout->addWidget(dateBox);
+    layout->addWidget(dateBox);
     box->setMargin(KDialog::marginHint());
 
     // we remove/insert default date button to correctly map TQt::DateFormat to our Ids
@@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String")
                                   ,page);
     projectBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(projectBox);
+    layout->addWidget(projectBox);
     b = new TQHBox(projectBox);
 
     tempLabel=new TQLabel(i18n("Project-Id:"),b);
@@ -234,31 +234,31 @@ SavePreferences::SavePreferences(TQWidget *parent)
     b->setSpacing(KDialog::spacingHint());
     tempLabel->setBuddy(_projectEdit);
     
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&Header"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page);
     translatorCopyrightBox->setMargin(KDialog::marginHint());
     _translatorCopyrightButton = 
 	new TQCheckBox(i18n("Update &translator copyright")
 	    ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright");
-    tqlayout->addWidget(translatorCopyrightBox);
+    layout->addWidget(translatorCopyrightBox);
 
     TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
-    tqlayout->addWidget(fsfBox);
+    layout->addWidget(fsfBox);
 
     fsfBox->setMargin(KDialog::marginHint());
     _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox);
     _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox);
     _nochangeFSFButton = new TQRadioButton(i18n("Do &not change"),fsfBox);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("Cop&yright"));
 
@@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "<ul><li><b>%1</b>: this is the encoding that fits the character "
 "set of your system language.</li>"
 "<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>"
-"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) );
+"</ul></qt>").arg(defaultName).arg(utf8Name) );
 
 
     TQWhatsThis::add(_oldEncodingButton
@@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "in the online help.</p>"
 "</qt>") );
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -402,18 +402,18 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     if( !project.isEmpty() )
     {
 	// show the project name in the widget at the top
-	tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page));
+	layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
     }
 
     TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
     
     TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group);
@@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
     tempLabel=new TQLabel(i18n("&Language mailing list:"),group);
     _listEdit = new TQLineEdit(group, "kcfg_Mailinglist");
-    _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height());
+    _listEdit->setMinimumSize(100,_listEdit->sizeHint().height());
     tempLabel->setBuddy(_listEdit);
  
     tempLabel=new TQLabel(i18n("&Timezone:"), group);
     _timezoneEdit = new TQLineEdit(group, "kcfg_Timezone");
-    _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height());
+    _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height());
     tempLabel->setBuddy(_timezoneEdit);
 
 
@@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
 
     group = new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
 
     hbox = new TQHBox(group);
@@ -534,11 +534,11 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 	    "GNU gettext tools for currently set language; just press the <b>Lookup</b> "
 	    "button.</p></qt>"));
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 
     _mailEdit->installEventFilter(this);
     _listEdit->installEventFilter(this);
@@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm()
                 "of singular/plural forms automatically for the "
                 "language code \"%1\".\n"
                 "Do you have tdelibs.po installed for this language?\n"
-                "Please set the correct number manually.").tqarg(lang);
+                "Please set the correct number manually.").arg(lang);
     }
     else
     {
         msg = i18n("The number of singular/plural forms found for "
-                "the language code \"%1\" is %2.").tqarg(lang).tqarg(number);
+                "the language code \"%1\" is %2.").arg(lang).arg(number);
     }
 
     if(!msg.isEmpty())
@@ -663,13 +663,13 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQHBox *hbox = new TQHBox(box);
     hbox->setSpacing(KDialog::spacingHint());
@@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     vbgroup->setTitle(i18n("Compression Method for Mail Attachments"));
     vbgroup->setRadioButtonExclusive(true);
     vbgroup->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(vbgroup);
+    layout->addWidget(vbgroup);
 
     bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression");
     gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup);
@@ -723,7 +723,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     compressSingle = new TQCheckBox(i18n("&Use compression when sending "
 					"a single file"), vbgroup, "kcfg_CompressSingleFile");
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 }
 
@@ -794,30 +794,30 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
 
     onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck");
-    tqlayout->addWidget(onFlyBtn);
+    layout->addWidget(onFlyBtn);
 
     TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>"
         "<p>Activate this to let KBabel spell check the text "
 	"as you type. Mispelled words will be colored by the error color.</p></qt>"));
 	
     spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false);
-    tqlayout->addWidget(spellConfig);
+    layout->addWidget(spellConfig);
     remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored");
-    tqlayout->addWidget(remIgnoredBtn);
+    layout->addWidget(remIgnoredBtn);
     
     connect( spellConfig, TQT_SIGNAL( configChanged() )
 	, this, TQT_SIGNAL ( settingsChanged() ) );
 
     TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page);
-    tqlayout->addWidget(tempLabel);
+    layout->addWidget(tempLabel);
     ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL");
-    tqlayout->addWidget(ignoreURLEdit);
+    layout->addWidget(ignoreURLEdit);
     tempLabel->setBuddy(ignoreURLEdit);
 
     connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit
@@ -833,11 +833,11 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
     TQWhatsThis::add(tempLabel,msg);
     TQWhatsThis::add(ignoreURLEdit,msg);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -879,13 +879,13 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box);
     TQHBox* hbox = new TQHBox(box);
@@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 												
     _poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir");
     _poDirEdit->setMode( mode );
-    _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height());
+    _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height());
     label->setBuddy(_poDirEdit);
 
 
@@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     _potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir");
     _potDirEdit->setMode( mode );
-    _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height());
+    _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height());
     label->setBuddy(_potDirEdit);
 
 
@@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow");
 
@@ -956,11 +956,11 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
         "so invalid PO files could be shown as good ones, "
         "even if Gettext tools would reject such files.</p></qt>") );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -981,13 +981,13 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _dirCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n"
@@ -1010,10 +1010,10 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1044,13 +1044,13 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _fileCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n"
@@ -1074,10 +1074,10 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1107,13 +1107,13 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" );
     _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" );
@@ -1126,11 +1126,11 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
     TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n"
      "<p></p></qt>"));
      
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1148,9 +1148,9 @@ void ViewPreferences::defaults(const CatManSettings& _settings)
 SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
     
     TQHBox* box = new TQHBox(page);
     box->setSpacing(KDialog::spacingHint());
@@ -1159,21 +1159,21 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
     const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
     _coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" );
     _coderootEdit->setMode( mode );
-    _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() );
+    _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
     tempLabel->setBuddy( _coderootEdit );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 												
     // FIXME: use KConfigXT    
     _pathsEditor = new KListEditor(page);
     _pathsEditor->setTitle(i18n("Path Patterns"));
-    tqlayout->addWidget(_pathsEditor);
+    layout->addWidget(_pathsEditor);
     
     connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ())
 	, this, TQT_SIGNAL (itemsChanged ()));
     
     _pathsEditor->installEventFilter(this);
 				    
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 SourceContextPreferences::~SourceContextPreferences()
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 00a88631..31b4ab86 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -138,7 +138,7 @@ void ProjectWizard::next()
     if( file.exists() )
     {
 	if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n"
-	    "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
+	    "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
 		return;
     }
 
diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui
index c9329be7..8fae37ec 100644
--- a/kbabel/commonui/projectwizardwidget.ui
+++ b/kbabel/commonui/projectwizardwidget.ui
@@ -40,7 +40,7 @@ and also a type of the translation project.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui
index 97030b94..ef1fb414 100644
--- a/kbabel/commonui/projectwizardwidget2.ui
+++ b/kbabel/commonui/projectwizardwidget2.ui
@@ -46,7 +46,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -88,7 +88,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -138,7 +138,7 @@ will not work.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>100</height>
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 57fb21d0..7f671d43 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -44,7 +44,7 @@
 #include <tqcheckbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqtimer.h>
 #include <tqvgroupbox.h>
@@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
     progressbar = new KProgress(mw,"progressbar");
     progressbar->setTextEnabled(true);
     progressbar->setFormat("%v/%m (%p%)");
-    TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout);
-    pbtqlayout->add(label);
-    pbtqlayout->add(progressbar);
+    TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout);
+    pblayout->add(label);
+    pblayout->add(progressbar);
 
     transButton->setChecked(config->readBoolEntry("Translated",false));
     untransButton->setChecked(config->readBoolEntry("Untranslated",true));
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
     for(int i = 0; i < total; i++)
     {
         progressbar->setProgress(i+1);
-        kapp->tqprocessEvents(100);
+        kapp->processEvents(100);
 
         if(stop || cancel) break;
 
@@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics()
             "Exact translations: %2 (%3%)\n"
             "Approximate translations: %4 (%5%)\n"
             "Nothing found: %6 (%7%)")
-            .tqarg( locale->formatNumber(totalTried,0) )
-            .tqarg( locale->formatNumber(exactTransCounter,0) )
-            .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
-            .tqarg( locale->formatNumber(partTransCounter,0) )
-            .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
-            .tqarg( locale->formatNumber(nothing,0) )
-            .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
+            .arg( locale->formatNumber(totalTried,0) )
+            .arg( locale->formatNumber(exactTransCounter,0) )
+            .arg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
+            .arg( locale->formatNumber(partTransCounter,0) )
+            .arg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
+            .arg( locale->formatNumber(nothing,0) )
+            .arg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
 
     KMessageBox::information(this, statMsg
             , i18n("Rough Translation Statistics"));
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 3a40eac1..eca0be81 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -55,7 +55,7 @@ RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList &
 	i18n("which check found errors","translation has inconsistent length");
 	loadExpressions();
 	if ( ! _error.isNull() )
-		KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).tqarg( _error ) );
+		KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).arg( _error ) );
 }
 
 bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 31cca29f..1543afc8 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -41,7 +41,7 @@
 #include "kbprojectsettings.h"
 
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -56,7 +56,7 @@ GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, con
 {
 }
 
-ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
+ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
 {
    // check, whether we know how to handle the extra data
    if( catalog->importPluginID() != "GNU gettext") 
@@ -164,7 +164,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
             
             stream << "\n";
 
-	 kapp->tqprocessEvents(10);
+	 kapp->processEvents(10);
 	 if( isStopped() )
 	 {
 	    return STOPPED;
@@ -181,7 +181,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
     	  {
               stream << (*oit) << "\n\n";
 
-	      kapp->tqprocessEvents(10);
+	      kapp->processEvents(10);
 	      if( isStopped() )
 	      {
 		  return STOPPED;
@@ -196,7 +196,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
    }
    else
    {
-      //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii()));
+      //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii()));
       return OS_ERROR;
    }
 
diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h
index 695105d2..9732ac73 100644
--- a/kbabel/filters/gettext/gettextexport.h
+++ b/kbabel/filters/gettext/gettextexport.h
@@ -54,7 +54,7 @@ class GettextExportPlugin: public KBabel::CatalogExportPlugin
 {
 public:
     GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &);
-    virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
+    virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
     
 private:
     /**
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index a48e327b..e087490b 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -42,7 +42,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -57,7 +57,7 @@ GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, con
 {
 }
 
-ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
+ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
 {
    kdDebug( KBABEL ) << k_funcinfo << endl;
    
@@ -106,7 +106,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
       //recoveredErrorInHeader = true;
    }
    
-   TQIODevice *dev = stream.tqdevice();
+   TQIODevice *dev = stream.device();
    int fileSize = dev->size();
 
    // if somethings goes wrong with the parsing, we don't have deleted the old contents
@@ -117,7 +117,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
    kdDebug(KBABEL) << "start parsing..." << endl;
 
    // first read header
-   const ConversiontqStatus status = readHeader(stream);
+   const ConversionStatus status = readHeader(stream);
 
 
    if ( status == RECOVERED_PARSE_ERROR )
@@ -173,13 +173,13 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
 
    while( !stream.eof() )
    {
-      kapp->tqprocessEvents(10);
+      kapp->processEvents(10);
       if( isStopped() )
       {
          return STOPPED;
       }
 
-      const ConversiontqStatus success=readEntry(stream);
+      const ConversionStatus success=readEntry(stream);
 
       if(success==OK)
       {
@@ -302,7 +302,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
    stream.setEncoding( TQTextStream::Latin1 );
 
    // first read header
-   ConversiontqStatus status = readHeader(stream);
+   ConversionStatus status = readHeader(stream);
    if(status!=OK && status != RECOVERED_PARSE_ERROR)
    {
        kdDebug(KBABEL) << "wasn't able to read header" << endl;
@@ -360,18 +360,18 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
    return codec;
 }
 
-ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
 {
    CatalogItem temp;
-   int filePos=stream.tqdevice()->at();
-   ConversiontqStatus status=readEntry(stream);
+   int filePos=stream.device()->at();
+   ConversionStatus status=readEntry(stream);
 
    if(status==OK || status==RECOVERED_PARSE_ERROR)
    {
       // test if this is the header
       if(!_msgid.first().isEmpty())
       {
-         stream.tqdevice()->at(filePos);
+         stream.device()->at(filePos);
       }
 
       return status;
@@ -380,7 +380,7 @@ ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
    return PARSE_ERROR;
 }
 
-ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
 {
    //kdDebug( KBABEL ) << k_funcinfo << " START" << endl;
    enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin;
@@ -402,7 +402,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
    
    while( !stream.eof() )
    {
-       const int pos=stream.tqdevice()->at();
+       const int pos=stream.device()->at();
 
        line=stream.readLine();
 
@@ -761,7 +761,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
             else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1))
             {
                // We have read successfully one entry, so end loop.
-               stream.tqdevice()->at(pos);// reset position in stream to beginning of this line
+               stream.device()->at(pos);// reset position in stream to beginning of this line
                break;
             }
             else if(line.startsWith("msgstr"))
diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h
index fa20aa62..e5f81679 100644
--- a/kbabel/filters/gettext/gettextimport.h
+++ b/kbabel/filters/gettext/gettextimport.h
@@ -50,13 +50,13 @@ class GettextImportPlugin: public KBabel::CatalogImportPlugin
 {
 public:
     GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &);
-    virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype);
+    virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype);
     virtual const TQString id() { return "GNU gettext"; }
 
 private:
     TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec);
-    KBabel::ConversiontqStatus readHeader(TQTextStream& stream);
-    KBabel::ConversiontqStatus readEntry(TQTextStream& stream);
+    KBabel::ConversionStatus readHeader(TQTextStream& stream);
+    KBabel::ConversionStatus readEntry(TQTextStream& stream);
     
     // description of the last read entry
     TQString _msgctxt;
diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp
index 10fc37e2..29a9788e 100644
--- a/kbabel/filters/linguist/linguistexport.cpp
+++ b/kbabel/filters/linguist/linguistexport.cpp
@@ -40,7 +40,7 @@
 #include "tqregexp.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kgenericfactory.h>
 
@@ -58,7 +58,7 @@ LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name
 {
 }
 
-ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
 {
   // Check whether we know how to handle the extra data.
   if ( catalog->importPluginID( ) != "TQt translation source" )
diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h
index d468fce4..18b52460 100644
--- a/kbabel/filters/linguist/linguistexport.h
+++ b/kbabel/filters/linguist/linguistexport.h
@@ -52,7 +52,7 @@ class LinguistExportPlugin : public KBabel::CatalogExportPlugin
 {
   public:
     LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& );
-    virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+    virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
     
   private:
     const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy );
diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp
index 6d8dda81..b4476d52 100644
--- a/kbabel/filters/linguist/linguistimport.cpp
+++ b/kbabel/filters/linguist/linguistimport.cpp
@@ -60,7 +60,7 @@ LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name
 {
 }
 
-ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
 {
   if ( filename.isEmpty( ) ) {
     kdDebug( ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h
index b0bc51d9..11b5c6d1 100644
--- a/kbabel/filters/linguist/linguistimport.h
+++ b/kbabel/filters/linguist/linguistimport.h
@@ -52,7 +52,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin
   public:
     LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& );
     
-    virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+    virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
     virtual const TQString id( ) { return "TQt translation source"; }
     
   private:
diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp
index c633e8b1..ad0a9f33 100644
--- a/kbabel/filters/xliff/xliffexport.cpp
+++ b/kbabel/filters/xliff/xliffexport.cpp
@@ -40,7 +40,7 @@
 #include "tqregexp.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kgenericfactory.h>
 
@@ -58,7 +58,7 @@ XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, cons
 {
 }
 
-ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
 {
   // Check whether we know how to handle the extra data.
   if ( catalog->importPluginID( ) != "XLIFF 1.1" )
diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h
index eccc311c..ac550ccc 100644
--- a/kbabel/filters/xliff/xliffexport.h
+++ b/kbabel/filters/xliff/xliffexport.h
@@ -52,7 +52,7 @@ class XLIFFExportPlugin : public KBabel::CatalogExportPlugin
 {
   public:
     XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& );
-    virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+    virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
     
   private:
     TQDomElement extractComment( TQDomDocument& doc, const TQString& s );
diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp
index 246b8c24..807a624d 100644
--- a/kbabel/filters/xliff/xliffimport.cpp
+++ b/kbabel/filters/xliff/xliffimport.cpp
@@ -73,7 +73,7 @@ XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, cons
 {
 }
 
-ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
 {
   if ( filename.isEmpty( ) ) {
     kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h
index a32a686b..8901afd2 100644
--- a/kbabel/filters/xliff/xliffimport.h
+++ b/kbabel/filters/xliff/xliffimport.h
@@ -52,7 +52,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin
   public:
     XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& );
     
-    virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+    virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
     virtual const TQString id( ) { return "XLIFF 1.1"; }
     
   private:
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index 9a19e5ec..cd7454c7 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -33,7 +33,7 @@
 
 #include "charselectview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -52,14 +52,14 @@ using namespace KBabel;
 CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    layout->setSpacing( KDialog::spacingHint() );
     
     TQHBox* bar = new TQHBox(this);
     bar->setSpacing( KDialog::spacingHint() );
-    tqlayout->addWidget (bar);
+    layout->addWidget (bar);
     
     TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar );
     _tableNum = new TQSpinBox( 0, 255, 1, bar );
@@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent
     _table->setNumRows(16);
     
     scroll->addChild(_table);
-    tqlayout->addWidget (scroll);
+    layout->addWidget (scroll);
     
     connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) );
     connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) ));
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index ae8e57fe..63a0dcf1 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index 44a049dc..e8a2e286 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -35,11 +35,11 @@
 
 #include "commentview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
-#include <tqtextview.h>
+#include <textview.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -67,7 +67,7 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 {
     setAcceptDrops(true);
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
 
     commentEdit = new MsgMultiLineEdit(0, 0, this);
     commentEdit->setMinimumHeight(50);
@@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 
     TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(commentEdit);
-    tqlayout->setStretchFactor(commentEdit,1);
+    layout->addWidget(commentEdit);
+    layout->setStretchFactor(commentEdit,1);
 
     TQWhatsThis::add(this,
        i18n("<qt><p><b>Comment Editor</b></p>\n\
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 11d8434a..4af2881e 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -35,8 +35,8 @@
 
 #include "contextview.h"
 
-#include <tqlayout.h>
-#include <tqtextview.h>
+#include <layout.h>
+#include <textview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _textview = new TQTextView (this, "context textview");
     KCursor::setAutoHideCursor(_textview->viewport(),true);
     _textview->setReadOnly(true);
     
-    tqlayout->addWidget (_textview);
+    layout->addWidget (_textview);
 
     TQWhatsThis::add(this,
         i18n("<qt><p><b>PO Context</b></p>"
@@ -137,7 +137,7 @@ void ContextView::updateView()
 		temp = "";
 		for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i)
 		{
-		    temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i);
+		    temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i);
 		}
 	    }
             temp = TQStyleSheet::convertFromPlainText(temp);
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 33460635..7aa23aad 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 15498f32..77c64683 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
                             <cstring>buttonGroup1</cstring>
                         </property>
                         <property name="title">
-                            <string>tqStatus LEDs</string>
+                            <string>Status LEDs</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;tqStatus LEDs&lt;/b&gt;&lt;/p&gt;
+                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;Status LEDs&lt;/b&gt;&lt;/p&gt;
 &lt;p&gt;Choose here where the status LEDs are displayed and what color they have.&lt;/p&gt;&lt;/qt&gt;</string>
                         </property>
                         <hbox>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>51</width>
                                         <height>20</height>
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>29</height>
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 719798d3..ef8c8008 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -35,8 +35,8 @@
 
 #include "errorlistview.h"
 
-#include <tqlayout.h>
-#include <tqtextview.h>
+#include <layout.h>
+#include <textview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
+	layout->setResizeMode( TQLayout::Minimum );
 
 	_textview = new TQTextView (this);
 	KCursor::setAutoHideCursor(_textview->viewport(),true);
 	_textview->setReadOnly(true);
 
-	tqlayout->addWidget(_textview);
+	layout->addWidget(_textview);
 
 	TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>"
 			"<p>This window shows the list of errors found by validator tools "
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
 	if( _catalog->numberOfEntries() == 0 )
 		return;
 
-	_textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
+	_textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
 }
 
 #include "errorlistview.moc"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 553724bc..62275cdd 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -108,7 +108,7 @@ bool HeaderEditor::isModified()
 
 void HeaderEditor::readHeader(bool readOnly)
 {
-   setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL()));
+   setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL()));
 
    _editor->headerEdit->setReadOnly(readOnly);
    _editor->commentEdit->setReadOnly(readOnly);
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index 3d0b128a..a3dcb3c3 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals )
   MsgMultiLineEdit* pl;
   for(uint i=0 ; i< _numberOfPlurals ; i++)
   {
-     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit());
+     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit());
      _allEdits.append(pl);
-     _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1));
+     _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1));
      if( _eventFilter )
         pl->installEventFilter(_eventFilter);
   }
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 24c3eae9..c98ccf59 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -54,7 +54,7 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <tqsize.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
 
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
 public:
     MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
     {
-        tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+        setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     }
-    TQSize tqsizeHint() const { return TQSize( 1, 1);}
+    TQSize sizeHint() const { return TQSize( 1, 1);}
 };
 
 KBabelMW::KBabelMW(TQString projectFile)
@@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile)
     
     if ( _project == NULL ) // FIXME should not happen anymore
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
 
     if ( _project == NULL )
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog)
                    "The minimum requirement is to fill out the Identity page.\n"
                    "Also check the encoding on the Save page, which is currently "
                    "set to %1. You may want to change this setting "
-                   "according to the settings of your language team.").tqarg(encodingStr));
+                   "according to the settings of your language team.").arg(encodingStr));
 
       TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
     }
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
                    ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
 
    a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
-                 , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
+                 , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
    action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
          actionCollection(), "edit_edit_header");
 
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
        _errorLed->setFixedSize(15,12);
        new TQLabel(i18n("faulty")+" ",statusBox);
 
-       statusBox->setFixedWidth(statusBox->tqsizeHint().width());
+       statusBox->setFixedWidth(statusBox->sizeHint().width());
        statusBar()->addWidget(statusBox);
     }
 
@@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar()
 
     statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY);
 
-    statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1)
+    statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1)
             ,ID_STATUS_CURSOR);
 
     TQHBox* progressBox = new TQHBox(statusBar(),"progressBox");
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
     progressBox->setStretchFactor(_progressBar,1);
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
+    statusBar()->setMinimumHeight(progressBox->sizeHint().height());
 
     TQWhatsThis::add(statusBar(),
        i18n("<qt><p><b>Statusbar</b></p>\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
    KBabelView *view = KBabelView::viewForURL(url,TQString());
    if(view)
    {
-       KWin::activateWindow(view->tqtopLevelWidget()->winId());
+       KWin::activateWindow(view->topLevelWidget()->winId());
        return;
    }
 
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
    if(view)
    {
         kdDebug(KBABEL) << "there is a such view" << endl;
-       KWin::activateWindow(view->tqtopLevelWidget()->winId());
+       KWin::activateWindow(view->topLevelWidget()->winId());
        return;
    }
 
@@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag)
 
 void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos)
 {
-   statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT);
+   statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT);
   _currentIndex = pos.item;
 }
 
 void KBabelMW::setNumberOfTotal(uint number)
 {
-   statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL);
+   statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL);
 }
 
 void KBabelMW::setNumberOfFuzzies(uint number)
 {
-   statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY);
+   statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY);
 }
 
 void KBabelMW::setNumberOfUntranslated(uint number)
 {
-   statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS);
+   statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS);
 }
 
 void KBabelMW::hasFuzzyAfterwards(bool flag)
@@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp()
     if(!error.isEmpty())
     {
         KMessageBox::sorry(this,i18n("An error occurred while "
-                "trying to open the gettext info page:\n%1").tqarg(error));
+                "trying to open the gettext info page:\n%1").arg(error));
     }
 }
 
@@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus()
 
 void KBabelMW::updateCursorPosition(int line, int col)
 {
-    statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1)
+    statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1)
             ,ID_STATUS_CURSOR);
 }
 
@@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file)
     }
     else 
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
 	m_view->useProject(_project);
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 785943d8..848d506f 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set tqgeometry, with support for Xinerama systems
+  // Set geometry, with support for Xinerama systems
   TQRect r;
-  r.setSize(tqsizeHint());
+  r.setSize(sizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
   r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
   setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 4c50a7e9..c4f84b2c 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -39,7 +39,7 @@
 #include "kbabelsettings.h"
 #include "kbprojectsettings.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>
@@ -48,10 +48,10 @@
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
 #include <tqpopupmenu.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtabwidget.h>
-#include <tqtextview.h>
-#include <tqtextstream.h>
+#include <textview.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
 
@@ -307,7 +307,7 @@ void KBabelView::initDockWidgets()
     TQWidget *tempWidget=new TQWidget(this,"msgidWidget");
     tempWidget->setMinimumSize(350,150);
 
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget);
+    TQVBoxLayout *layout=new TQVBoxLayout(tempWidget);
 
     msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel");
     msgidLabel->installEventFilter(this);
@@ -328,16 +328,16 @@ void KBabelView::initDockWidgets()
 "and the behavior of KBabel and to Stephan Kulow, who always\n"
 "lends me a helping hand.\n\n"
 "Many good ideas, especially for the Catalog Manager, are taken\n"
-"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006));
+"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006));
 
     TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(msgidLabel);
-    tqlayout->setStretchFactor(msgidLabel,1);
+    layout->addWidget(msgidLabel);
+    layout->setStretchFactor(msgidLabel,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Original String</b></p>\n\
@@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>"));
     tempWidget=new TQWidget(this,"msgstrWidget");
     tempWidget->setMinimumSize(350,150);
 
-    tqlayout=new TQVBoxLayout(tempWidget);
+    layout=new TQVBoxLayout(tempWidget);
 
     // if undefined number of plural forms, use 1
     int pf = _catalog->defaultNumberOfPluralForms();
@@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>"));
 
     label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget);
 
-    hb=new TQHBoxLayout(tqlayout);
+    hb=new TQHBoxLayout(layout);
     hb->setSpacing(KDialog::spacingHint());
 
     hb->addSpacing(KDialog::marginHint());
@@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>"));
        TQWhatsThis::add(_errorLed,ledMsg);
     }
 
-    tqlayout->addWidget(msgstrEdit);
-    tqlayout->setStretchFactor(msgstrEdit,1);
+    layout->addWidget(msgstrEdit);
+    layout->setStretchFactor(msgstrEdit,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Translation Editor</b></p>\n\
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
    if(KBabelSettings::autoUnsetFuzzy())
    {
       connect(msgstrEdit,TQT_SIGNAL(textChanged())
-		  ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+		  ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    setupAutoCheckTools();
@@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project)
    {
     // turn off spellchecker
     msgstrEdit->setSpellChecker(0);
-    // tqinvalidate the current settings, to make sure they are updated when needed
+    // invalidate the current settings, to make sure they are updated when needed
     _spellcheckSettings.valid = false;
    }
 
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
     }
 
     disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
 
    if(KBabelSettings::autoUnsetFuzzy())
    {
          connect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
    cu.cleanPath();
    if(checkIfModified && !url.isEmpty() && cu==url)
    {
-       KWin::activateWindow(tqtopLevelWidget()->winId());
+       KWin::activateWindow(topLevelWidget()->winId());
        return;
    }
 
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
 		return;
 	   }
 	   else {
-	        KWin::activateWindow(v->tqtopLevelWidget()->winId());
+	        KWin::activateWindow(v->topLevelWidget()->winId());
         	return;
 	   }
        }
 
-       ConversiontqStatus stat=_catalog->openURL(url, package);
+       ConversionStatus stat=_catalog->openURL(url, package);
 
        switch(stat)
        {
@@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           {
               KMessageBox::error(this
                  ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(url.prettyURL()));
               break;
           }
           case NO_ENTRY_ERROR:
           {
               KMessageBox::error(this
                   ,i18n("Error while reading the file:\n %1\n"
-                  "No entry found.").tqarg(url.prettyURL()));
+                  "No entry found.").arg(url.prettyURL()));
               break;
           }
           case RECOVERED_PARSE_ERROR:
@@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           case NO_PERMISSIONS:
           {
              KMessageBox::error(this,i18n(
-               "You do not have permissions to read file:\n %1").tqarg(url.prettyURL()));
+               "You do not have permissions to read file:\n %1").arg(url.prettyURL()));
              break;
           }
           case NO_FILE:
           {
              KMessageBox::error(this,i18n(
-                 "You have not specified a valid file:\n %1").tqarg(url.prettyURL()));
+                 "You have not specified a valid file:\n %1").arg(url.prettyURL()));
              break;
           }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case STOPPED:
@@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           default:
           {
              KMessageBox::error(this,i18n(
-                  "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+                  "Error while trying to open file:\n %1").arg(url.prettyURL()));
              break;
           }
 
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
        setCursor(KCursor::waitCursor());*/
 
 
-       ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
+       ConversionStatus stat=_catalog->openURL(openURL,saveURL);
 
        switch(stat)
        {
@@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                 KMessageBox::sorry(this,
                     i18n("There was an error while reading the file header of file:\n %1")
-                    .tqarg(openURL.prettyURL()));
+                    .arg(openURL.prettyURL()));
                 break;
            }
            case PARSE_ERROR:
            {
                KMessageBox::error(this
                        ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(openURL.prettyURL()));
                break;
            }
            case NO_ENTRY_ERROR:
            {
                KMessageBox::error(this
                     ,i18n("Error while reading the file:\n %1\n"
-                       "No entry found.").tqarg(openURL.prettyURL()));
+                       "No entry found.").arg(openURL.prettyURL()));
                break;
            }
            case RECOVERED_PARSE_ERROR:
@@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                KMessageBox::sorry(this,
                    i18n("Minor syntax errors were found while reading file:\n %1")
-                   .tqarg(openURL.prettyURL()));
+                   .arg(openURL.prettyURL()));
                break;
 	  }
 	  case NO_PERMISSIONS:
 	  {
-	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL()));
 	      break;
 	  }
 	  case NO_FILE:
 	  {
-	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
           case STOPPED:
             break;
 	  default:
 	  {
-	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL()));
+	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
    }
    else
    {
-      ConversiontqStatus stat=_catalog->saveFile();
+      ConversionStatus stat=_catalog->saveFile();
 
       int whatToDo = -1;
 
@@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("You do not have permission to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
 	 case NO_PLUGIN:
 	 {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case UNSUPPORTED_TYPE:
 	 {
              KMessageBox::error(this,i18n(
-                 "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case BUSY:
@@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("An error occurred while trying to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
@@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    if (KIO::NetAccess::exists(url, false, this))
    {
-       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-						       "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+						       "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
       {
 	 return false;
       }
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    bool wasReadOnly=_catalog->isReadOnly();
 
-   ConversiontqStatus stat=_catalog->saveFileAs(url,true);
+   ConversionStatus stat=_catalog->saveFileAs(url,true);
 
 
    // if the file was not saved sucessfully ask for saving to another file
@@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 	      case NO_PERMISSIONS:
 	      {
 		  message=i18n("You do not have permission to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_FILE:
 	      {
 		 message=i18n("You have specified a folder:\n%1\n"
-			      "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			      "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_PLUGIN:
 	      {
-	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL());
+	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      case UNSUPPORTED_TYPE:
 	      {
                  message=i18n(
-                    "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL());
+                    "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      default:
 	      {
 		  message=i18n("An error occurred while trying to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		  break;
 	      }
 	  }
@@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 		if (KIO::NetAccess::exists(url, false, this))
 		{
 		    if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
-								    "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
+								    "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
 		   {
 		      stat=_catalog->saveFileAs(url);
 		      if(stat!=OK)
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
    bool returnCode=true;
    TQString output;
 
-   Msgfmt::tqStatus result=_catalog->checkSyntax( output );
+   Msgfmt::Status result=_catalog->checkSyntax( output );
 
    const TQStringList outputLines = TQStringList::split("\n",output);
    
@@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay)
 
    if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
    {
-       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
-   msgidLabel->tqrepaint();
+   msgidLabel->repaint();
 
    msgstrEdit->setText(_catalog->msgstr(_currentIndex));
    msgstrEdit->showForm( form );
-   msgstrEdit->tqrepaint();
+   msgstrEdit->repaint();
    m_cataloglistview->setSelectedItem(_currentIndex);
 
    if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
    {
-      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
 
 	while(success)
 	{
-		kapp->tqprocessEvents(100);
+		kapp->processEvents(100);
 
 		_replacesTotal++;
 
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
    }
 }
 
-void KBabelView::removeFuzzytqStatus()
+void KBabelView::removeFuzzyStatus()
 {
    bool newState =  !_catalog->isFuzzy(_currentIndex);
    _catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
          TQPalette palette=msgstrEdit->palette();
          palette.setColor( TQColorGroup::Text, red );
 
-	 if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
+	 if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
          else
-	 if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+	 if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
    emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
 }
 
-void KBabelView::autoRemoveFuzzytqStatus()
+void KBabelView::autoRemoveFuzzyStatus()
 {
    // only at first text change remove fuzzy status
-   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
 
-   //removeFuzzytqStatus();
+   //removeFuzzyStatus();
 }
 
 void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
 
       _catalog->applyBeginCommand(_currentIndex,Msgstr,this);
 
-      removeFuzzytqStatus();
+      removeFuzzyStatus();
    }
 
    cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 {
    if( !_autocheckTools.isEmpty() )
    {
-        TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
+        TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
 
-	TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
+	TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
 
 	// if there is more than one view, the status changes only in
 	// one view, so we have to update always.
-	if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
+	if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
 		return;
 
 	if( !status.isEmpty() )
@@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		else msg += ", "+locale->translate("what check found errors",(*it).utf8());
 	    }
 
-	    //i18n: translators: tqStatus bar text that automatic checks have found some errors
-	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
+	    //i18n: translators: Status bar text that automatic checks have found some errors
+	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg));
 	    emit signalFaultyDisplayed(true);
 
 	    if(KBabelSettings::autoCheckColorError())
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 	    {
 		if(onlyWhenChanged)
 		{
-		    if(oldtqStatus != status && oldtqStatus.isEmpty() )
+		    if(oldStatus != status && oldStatus.isEmpty() )
 		    {
 			KNotifyClient::beep();
 		    }
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		}
 	    }
 	}
-	else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
+	else if( _catalog->itemStatus(_currentIndex).isEmpty() )
 	{
 	    _catalog->removeFromErrorList(_currentIndex);
 
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
 	    if(emitProgress)
 	    {
 		emit signalResetProgressBar(i18n("Preparing spell check"),100);
-		kapp->tqprocessEvents(100);
+		kapp->processEvents(100);
 	    }
 
 	    uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
 		    lastPercent++;
 		    emit signalProgress(lastPercent);
 
-		    kapp->tqprocessEvents(100);
+		    kapp->processEvents(100);
 		}
 
 		TQStringList msgs=_catalog->msgstr(i);
@@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *)
 				KMessageBox::sorry(this,
 				            i18n("Error opening the file that contains words "
 				            "to ignore during spell checking:\n"
-							"%1").tqarg(file.name()));
+							"%1").arg(file.name()));
 			}
 		}
 		else
@@ -4012,13 +4012,13 @@ void KBabelView::spellStart(KSpell *)
 			KMessageBox::sorry(this,
 			            i18n("Only local files are allowed for saving "
 			                 "ignored words to during spell checking:\n"
-							 "%1").tqarg(urlString));
+							 "%1").arg(urlString));
 		}
 
 		if(spell.ignoreList.count() > 0)
 		{
 			emit signalResetProgressBar(i18n("Preparing spell check"),100);
-			kapp->tqprocessEvents(100);
+			kapp->processEvents(100);
 
 			uint total = spell.ignoreList.count();
 			uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
 				{
 					oldPercent++;
 					emit signalProgress(oldPercent);
-					kapp->tqprocessEvents(100);
+					kapp->processEvents(100);
 				}
 
 				spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 3398457d..af7fff86 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
     void skipToTagFromTool(int index);
     void wordCount();
 
-    void removeFuzzytqStatus();
+    void removeFuzzyStatus();
     /** opens the header editor for the po-file */
     void editHeader();
 
@@ -451,7 +451,7 @@ protected slots:
 
 private slots:
    void msgstrPluralFormChanged (uint index);
-   void autoRemoveFuzzytqStatus();
+   void autoRemoveFuzzyStatus();
 
    /** connected to the catalog. it is called when a new file is opened*/
    void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c70b42e7..2458d3dc 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -45,7 +45,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqvbox.h>
@@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf)
     	            KMessageBox::sorry(this
         	        ,i18n("An error occurred while trying to get the list "
                         "of messages for this file from the database:\n"
-                        "%1").tqarg(error));
+                        "%1").arg(error));
 
             	    _diffing=false;
                     _diffEnabled=false;
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
     connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
     emit signalResetProgressBar(i18n("loading file for diff"),100);
 
-    ConversiontqStatus stat = cat.openURL(url);
+    ConversionStatus stat = cat.openURL(url);
 
     emit signalClearProgressBar();
 
@@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff)
             {
                 KMessageBox::sorry(this
                     ,i18n("Error while trying to read file:\n %1\n"
-                   "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                   "Maybe it is not a valid PO file.").arg(url.prettyURL()));
                 break;
             }
             case NO_PERMISSIONS:
             {
                 KMessageBox::sorry(this,i18n(
                 "You do not have permissions to read file:\n %1")
-                        .tqarg(url.prettyURL()));
+                        .arg(url.prettyURL()));
                 break;
             }
             case NO_FILE:
             {
                  KMessageBox::sorry(this,i18n(
                  "You have not specified a valid file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                 break;
             }
 	    case NO_PLUGIN:
 	    {
 	         KMessageBox::error(this,i18n(
-	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
 	         break;
 	    }
 	    case UNSUPPORTED_TYPE:
 	    {
 	          KMessageBox::error(this,i18n(
-	               "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+	               "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
                   break;
 	    }
             default:
             {
                  KMessageBox::sorry(this,i18n(
                   "Error while trying to open file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                  break;
             }
 
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
 	         "However, the string might be found "
 		 "in the files being searched at the moment.\n"
 		 "Please try later."), contents);
-    label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
-    label2->setMinimumSize(label2->tqsizeHint());
+    label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+    label2->setMinimumSize(label2->sizeHint());
     lay->add( label2 );
     lay->addStretch(1);
 
@@ -1020,6 +1020,6 @@ void KBabelView::wordCount()
     KMessageBox::information( this
 	, i18n("Total words: %1\n\n"
 "Words in untranslated messages: %2\n\n"
-"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy)
+"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy)
 	, i18n("Word Count") );
 }
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index d9f080cb..488a4281 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b)
 
   // if it's okay then add the bookmark
   _list.append(b);
-  _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()),
+  _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()),
     this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex());
 }
 
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index cd48f274..3b98d355 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kglobalsettings.h>
 
 using namespace KBabel;
@@ -38,7 +38,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
  : TQWidget(parent)
 {
     m_catalog= catalog;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
     
     m_listview = new KListView(this, "catalogListView");
     m_listview->addColumn(i18n("Id"));
@@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
     m_listview->setAllColumnsShowFocus(true);
     m_listview->resize(this->size());
 
-    tqlayout->addWidget(m_listview);
-    tqlayout->setStretchFactor(m_listview,1);
+    layout->addWidget(m_listview);
+    layout->setStretchFactor(m_listview,1);
     
     connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *)));
 }
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index dd14221c..4bbc3049 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st)
 {
     m_msgid = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 void KBCatalogListViewItem::setMsgStr(const TQString& st)
 {
     m_msgstr = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 uint KBCatalogListViewItem::getId()
@@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id)
 {
     m_id = id;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index c67d56a7..d9e7daaa 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -37,7 +37,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include "kapplication.h"
 #include <kconfig.h>
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
             this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
 
 	// wait for KSpell to startup correctly
-	kapp->tqprocessEvents(500);
+	kapp->processEvents(500);
     }    
     
     highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f36a0b94..85158efa 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     KBabelMW *kb = KBabelMW::winForURL(u,project);
     if(kb)
     {
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
     }
     else
     {
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && mw->winId() == window)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        	KWin::activateWindow(kb->topLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	{
 	    // here, we don't care about "open in new window", because
 	    // it's empty
-    	    KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
+    	    KWin::setActiveWindow(kb->topLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
     	    kb->open(u,TQString::fromUtf8(package),false);
 
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        	KWin::activateWindow(kb->topLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    kb = new KBabelMW(project);
     	    kb->show();
 	} else kb = static_cast<KBabelMW*>(mw);
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
         kb->open(u,TQString::fromUtf8(package),newWindow);
     }
     
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
     KBabelMW *kb = KBabelMW::winForURL(u, project);
     if(kb)
     {
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
     }
     else
     {
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
         {
             kb = static_cast<KBabelMW*>(mw);
-            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+            KWin::activateWindow(kb->topLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
             kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
         }
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         {
             kb = new KBabelMW(project);
             kb->show();
-            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+            KWin::activateWindow(kb->topLevelWidget()->winId());
             kb->openTemplate(t,u,TQString::fromUtf8(package));
         }
     }
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
 
 	if(kb)
 	{
-    	    KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+    	    KWin::activateWindow(kb->topLevelWidget()->winId());
 	}
     }
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index af824fdd..cc84b3c3 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -46,7 +46,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqapplication.h>
 #include <tqdragobject.h>
 //#include <private/tqrichtext_p.h>
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
 
   TQPalette _visibleHighlight( palette() );
   TQPalette _invisibleHighlight( palette() );
-  TQColorGroup newcg( tqcolorGroup() );
+  TQColorGroup newcg( colorGroup() );
   newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
   newcg.setColor( TQColorGroup::Highlight, newcg.base() );
   if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
    
    TQPalette _visibleHighlight( palette() );
    TQPalette _invisibleHighlight( palette() );
-   TQColorGroup newcg( tqcolorGroup() );
+   TQColorGroup newcg( colorGroup() );
    newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
    newcg.setColor( TQColorGroup::Highlight, newcg.base() );
    if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
                 _cleverEditing(false),
                 _highlightBg(false),
                 _spacePoints(false),
-                _bgColor(tqcolorGroup().base().dark(110)),
+                _bgColor(colorGroup().base().dark(110)),
 		_textColor(KGlobalSettings::textColor()),
 		_errorColor(TQt::red),
 		_currentColor(KGlobalSettings::textColor()),
@@ -885,7 +885,7 @@ void MsgMultiLineEdit::setFont(const TQFont& font)
    _wsOffsetX = TQMAX(fm.width(' ')/2-2,1);
    _wsOffsetY = TQMAX(fm.height()/2-1,0);
    
-   tqrepaint();
+   repaint();
 }
 
 void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut)
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
 void MsgMultiLineEdit::setTextColor(const TQColor &color )
 {
   TQPalette p( palette() );
-  TQColorGroup newcg( tqcolorGroup() );
+  TQColorGroup newcg( colorGroup() );
   newcg.setColor( TQColorGroup::Text, color );
   if( hasFocus() ) p.setActive( newcg );
   else p.setInactive( newcg );
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
             int i = s.find( " " );
             while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
             {
-                TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+                TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws;
                 TQRect r = mapToView( curpara, i );
                 r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
                 r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
@@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints()
     }
 }
 
-void MsgMultiLineEdit::tqrepaint()
+void MsgMultiLineEdit::repaint()
 {
     highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::forceUpdate()
@@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate()
     _firstChangedLine=0;
     _lastChangedLine=paragraphs()-1;
     highlighter->highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::ensureCursorVisible()
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
     
     TQColor bg;
     if( _highlightBg ) bg = _bgColor;
-    else bg = tqcolorGroup().base(); 
+    else bg = colorGroup().base(); 
 
     for( int i = 0 ; i < paragraphs() ; i++ )
 	    setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index 272878da..ba6a96e6 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -229,7 +229,7 @@ public slots:
    /**
    *  reimplemented to call highlight()
    */
-   void tqrepaint(); 
+   void repaint(); 
    void forceUpdate();
    void emittedTextChanged();
    
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index c00e537f..e5177523 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -51,7 +51,7 @@ in the toolbar pressed for a while.&lt;/p&gt;&lt;/qt&gt;</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -96,7 +96,7 @@ the desired dictionary from &lt;b&gt;Settings-&gt;Configure Dictionary&lt;/b&gt;
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>91</height>
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index 33b0d27b..7a2965ac 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -34,7 +34,7 @@
 #include "sourceview.h"
 #include "context.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -48,11 +48,11 @@ using namespace KBabel;
 SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _contextView = new SourceContext (this, project);
-    tqlayout->addWidget (_contextView);
+    layout->addWidget (_contextView);
     
     connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool)));
 }
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 62d4eba5..751a2701 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -33,7 +33,7 @@
 
 #include "taglistview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -47,12 +47,12 @@ using namespace KBabel;
 TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _tagBox = new KListBox (this, "taglist textview");
     
-    tqlayout->addWidget (_tagBox);
+    layout->addWidget (_tagBox);
     
     connect(_tagBox,TQT_SIGNAL(selected(const TQString&))
             , this, TQT_SIGNAL(signalTagSelected(const TQString&)));
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index d3b8df63..d0353d04 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -36,7 +36,7 @@
 #include "resources.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kconfig.h>
 #include <klistbox.h>
@@ -52,18 +52,18 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     tempConfig.setAutoDelete(true);
 
     dictList = box->moduleInfos();
-    TQGridLayout *tqlayout = new TQGridLayout(this);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    TQGridLayout *layout = new TQGridLayout(this);
+    layout->setSpacing(KDialog::spacingHint());
 
 
     TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this);
-    tqlayout->addWidget(label,0,0);
+    layout->addWidget(label,0,0);
 
     label = new TQLabel(i18n("dictionary to use","Use:"),this);
-    tqlayout->addWidget(label,0,2);
+    layout->addWidget(label,0,2);
 
     unselectedBox = new KListBox(this,"unselectedBox");
-    tqlayout->addWidget(unselectedBox,1,0);
+    layout->addWidget(unselectedBox,1,0);
 
 
     TQVBoxLayout *bLayout = new TQVBoxLayout();
@@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     unselectBtn->setEnabled(false);
     bLayout->addWidget(unselectBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,1);
+    layout->addLayout(bLayout,1,1);
 
     selectedBox = new KListBox(this,"selectedBox");
-    tqlayout->addWidget(selectedBox,1,2);
+    layout->addWidget(selectedBox,1,2);
 
 
     bLayout = new TQVBoxLayout();
@@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     configureBtn = new TQPushButton(i18n("Con&figure..."), this);
     bLayout->addWidget(configureBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,3);
+    layout->addLayout(bLayout,1,3);
 
 
     dictList.setAutoDelete(true);
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index d850f9a6..759468c9 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -112,11 +112,11 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId
         TQString keyString=key;
         if(keyString.contains("%1"))
         {
-            keyString=key.tqarg(accel2id.count()+1);
+            keyString=key.arg(accel2id.count()+1);
     	}
         KShortcut k(keyString);
 
-    	KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() );
+    	KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
 	uint id = maxId++;
         dictionaryAction->plug(popup,id);
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index de0f747f..7e49402b 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -58,14 +58,14 @@
 #include <ktrader.h>
 #include <twin.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqpushbutton.h>
-#include <tqtextview.h>
-#include <tqstylesheet.h>
+#include <textview.h>
+#include <stylesheet.h>
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
@@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
    mainLayout->addLayout(hbox);
    
    totalResultsLabel->setNum(100000);
-   totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint());
+   totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint());
    totalResultsLabel->setNum(0);
    currentLabel->setNum(100000);
-   currentLabel->setFixedSize(currentLabel->tqsizeHint());
+   currentLabel->setFixedSize(currentLabel->sizeHint());
    currentLabel->setNum(0);
 
    setRMBMenu(new TQPopupMenu(this));
@@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item)
                 if(!info->filePath.isEmpty())
                 {
                     rmbPopup->changeItem(editFileIndex
-                        ,i18n("Edit File %1").tqarg(info->location));
+                        ,i18n("Edit File %1").arg(info->location));
                     rmbPopup->setItemEnabled(editFileIndex,true);
                 }
                 else
@@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo()
             if(!info->filePath.isEmpty())
             {
                 rmbPopup->changeItem(editFileIndex
-                        ,i18n("Edit File %1").tqarg(info->location));
+                        ,i18n("Edit File %1").arg(info->location));
                 rmbPopup->setItemEnabled(editFileIndex,true);
             }
             else
@@ -1255,7 +1255,7 @@ void KBabelDictBox::about()
          if(aboutData->bugAddress() != "submit@bugs.kde.org")
          {
             text += "\n" + i18n("Send bugs to %1")
-                  .tqarg(aboutData->bugAddress()) +"\n";
+                  .arg(aboutData->bugAddress()) +"\n";
          }
 
          TQLabel *label = new TQLabel(text,0);
@@ -1410,7 +1410,7 @@ void KBabelDictBox::copy()
    }
    else
    {
-      TQClipboard *cb = KApplication::tqclipboard();
+      TQClipboard *cb = KApplication::clipboard();
       cb->setText(translation());
    }
 }
@@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal)
    {
       if(e->id() == id)
       {
-         TQString caption = i18n("Configure Dictionary %1").tqarg(e->name());
+         TQString caption = i18n("Configure Dictionary %1").arg(e->name());
          KDialogBase *dialog = new KDialogBase(this,"prefDialog"
                    , modal, caption
                    , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel|
@@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile()
                  {
                      KMessageBox::sorry(this
                              ,i18n("There was an error starting KBabel:\n%1")
-                                    .tqarg(error));
+                                    .arg(error));
                      return;
                  }
              }
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 18bb20ac..d8dc90f9 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -41,7 +41,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index a62cec5f..56c5e3a8 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set tqgeometry, with support for Xinerama systems
+  // Set geometry, with support for Xinerama systems
   TQRect r;
-  r.setSize(tqsizeHint());
+  r.setSize(sizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
   r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
   setGeometry(r);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 4c79bacd..a3b20183 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -28,7 +28,7 @@
  *   your version.                                                         *
 */
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqprogressdialog.h>
 
 #include <tqinputdialog.h>
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	step = 100;
 
     emit progress (0);
-    kapp->tqprocessEvents (100);
+    kapp->processEvents (100);
     if (stopNow)
     {
 	stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	    {
 		emit progress (100 * count / /*TQMAX( */
 			       totalprogress /*,1) */ );
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 
 		if (stopNow)
 		{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
 				  {
 				      emit
 				      progress (100 * count / totalprogress);
-				      kapp->tqprocessEvents (100);
+				      kapp->processEvents (100);
 				  }
 				  if (stopNow)
 				  {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 95ec19dd..699e3530 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags)
     else
       {
 	  kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1").
-	      tqarg (ret) << endl;
+	      arg (ret) << endl;
 
 	  return DataBaseItem ();
       }
@@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory,
 
     rename (filename.local8Bit (), filename.local8Bit () + ",old");
 
-//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl;
+//kdDebug(0) << TQString("Creating %1").arg(filename) << endl;
 
     iAmOk = true;
 
@@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory,
 	loadInfo ();
     else
 	kdDebug (KBABEL_SEARCH) << TQString ("I am NOT  ok : %1").
-	    tqarg (ret) << endl;
+	    arg (ret) << endl;
 
 //THIS IS WRONG, rewrite the error handling. 
     return iAmOk;
@@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n)
 	  return InfoItem ();
       }
 
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
 
     InfoItem it ((char *) data.data, language);
 //free(data.data);  // Read docu for this!!!!
@@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key)
     else
 	ret = *(uint32 *) key.data;
 
-//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl;
+//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl;
 
 
     free (data.data);
@@ -1353,7 +1353,7 @@ DataBaseManager::getKey (uint32 n)
 
     return TQString::fromUtf8 ((char *) data.data);
 
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
 
 }
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 2969a9df..47bc8fa9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -57,7 +57,7 @@ if (!called)
 { pb=true; count=0;}
 called=true;
  
-kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl;
 
 if(pb)
 {emit patternStarted();
@@ -128,7 +128,7 @@ emit fileLoading(0);
 
 KURL u(fileName);
 
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
 if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
 {
         delete catalog;
@@ -149,7 +149,7 @@ tot=catalog->numberOfEntries();
 bool fuzzy;
 bool untra;
 
-//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl;
+//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl;
 
 for (i=0;i<tot;i++)  //Skip header        = ????
 {
@@ -159,7 +159,7 @@ for (i=0;i<tot;i++)  //Skip header        = ????
   { 
    emit fileProgress(100*i/tot);
    emit added(count);
-   kapp->tqprocessEvents(100);
+   kapp->processEvents(100);
   }
 
   fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index b457bf74..7833bef3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -262,7 +262,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -332,7 +332,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -384,7 +384,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -415,7 +415,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -487,7 +487,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                         <property name="text">
                                             <string>[A-Za-z0-9_%</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index a2c8c289..23ac1cd5 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -3,7 +3,7 @@
 #include <tqspinbox.h>  
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kurlrequester.h>
@@ -17,15 +17,15 @@
 PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePref(this);
 	dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly);
 	
-	tqlayout->addWidget(dbpw);
-	resize(TQSize(200,200).expandedTo(tqminimumSizeHint()));
+	layout->addWidget(dbpw);
+	resize(TQSize(200,200).expandedTo(minimumSizeHint()));
 
 //    connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
 
@@ -99,12 +99,12 @@ TQString defaultDir;
 
 void PreferencesWidget::setName(TQString n)
 {
-dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n));
+dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n));
 }
 
 void PreferencesWidget::setEntries(int i)
 {
-dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i));
+dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i));
 
 }
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 23f0b7d2..923d9897 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -138,7 +138,7 @@ if (!called)
 { pb=true; count=0;}
 called=true;
  
-kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl;
 
 if(pb)
 {
@@ -212,7 +212,7 @@ emit fileLoading(0);
 
 bool error;
 
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
 if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
 {
         delete catalog;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
index 285319e5..685e86bd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
@@ -109,7 +109,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -147,7 +147,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -380,7 +380,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -496,7 +496,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -669,7 +669,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index 64a74b8a..e3ef3776 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -265,7 +265,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -335,7 +335,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -387,7 +387,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -418,7 +418,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -490,7 +490,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                         <property name="text">
                                             <string>[A-Za-z0-9_%</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index ff767436..995f3b05 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -3,7 +3,7 @@
 #include <tqspinbox.h>  
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kurlrequester.h>
@@ -18,14 +18,14 @@
 KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name) 
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePrefWidget(this);
 	dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly);
 	dbpw->show();	
-	tqlayout->addWidget(dbpw);
+	layout->addWidget(dbpw);
 	setMinimumSize(300,300);
 
 	standard();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
index 39e1f2ac..a34953df 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -72,7 +72,7 @@
                     </rect>
                 </property>
                 <property name="text">
-                    <string>tqStatus: </string>
+                    <string>Status: </string>
                 </property>
             </widget>
             <widget class="KLineEdit">
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 9025d716..9fc74519 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -39,7 +39,7 @@
 
 #include <tqregexp.h>
 #include <tqtimer.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include "poauxiliary.h"
 #include "preferenceswidget.h"
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
 
     clearResults();
    
-    kapp->tqprocessEvents(100);
+    kapp->processEvents(100);
 
     text.replace("\n","");
     
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
 
     clearResults();
    
-    kapp->tqprocessEvents(100);
+    kapp->processEvents(100);
 
     Entry *entry = msgstrDict[text];
     if(entry)
@@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary()
             {
                 TQString dir=directory(editedFile,number);
                 TQString s("@DIR%1@");
-                path.replace(s.tqarg(number),dir);
+                path.replace(s.arg(number),dir);
 
                 pos+=dir.length();
             }
@@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary()
     connect(catalog, TQT_SIGNAL(signalProgress(int))
                         , this, TQT_SIGNAL(progress(int)));
       
-    ConversiontqStatus stat = catalog->openURL(u);
+    ConversionStatus stat = catalog->openURL(u);
     if( stat != OK && stat != RECOVERED_PARSE_ERROR)
     {
         kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl;
@@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary()
 	{
     	    error = true;
     	    errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1")
-                        .tqarg(u.prettyURL());
+                        .arg(u.prettyURL());
     	    emit hasError(errorMsg);
 	}
     }
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
             if( (100*(i+1))%total < 100 )
             {
                 emit progress((100*(i+1))/total);
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
             }
 
             Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 873c07b6..930af5aa 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -47,10 +47,10 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c
         : PrefWidget(parent,name)
         , changed(false)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
         
     prefWidget = new PWidget(this);
-    tqlayout->addWidget(prefWidget);
+    layout->addWidget(prefWidget);
 
 
     connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index b91f98e5..f345eebb 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -7,7 +7,7 @@
         <cstring>PWidget</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -92,14 +92,14 @@ The following variables will be replaced in the path if available:
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index e6565e54..d346bcf5 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url)
     emit progressStarts(i18n("Loading PO compendium"));
     connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
 
-    ConversiontqStatus stat=_catalog->openURL(url);
+    ConversionStatus stat=_catalog->openURL(url);
         
     disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
             , this, TQT_SIGNAL(progress(int)));
@@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url)
                 
         _error = true;
         _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1")
-            .tqarg(url.prettyURL());
+            .arg(url.prettyURL());
 
         emit progressEnds();
 
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
         }
 
 	// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 60de6a4f..fb9171ed 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -42,7 +42,7 @@
 #include <kio/netaccess.h>
 
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include "resources.h"
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
                     emit progress( (50*checkCounter+1)/catalogInfo.total);
                 }
             
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
 
                 TQString origStr = data->catalog()->msgid(*it).first();
                 origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
             continue;
         }
        
-        kapp->tqprocessEvents(100);
+        kapp->processEvents(100);
 
         TQString origStr = data->catalog()->msgid(i).first();
         origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 74321121..0c4064fc 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -48,10 +48,10 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new CompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index f9558dc3..db8de91e 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -8,7 +8,7 @@
         <cstring>PWidget</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -236,14 +236,14 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 7aed4474..380b8908 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -50,10 +50,10 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent,
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new TmxCompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui
index 9d0d4281..875e744f 100644
--- a/kbabel/kbabeldict/modules/tmx/pwidget.ui
+++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui
@@ -171,7 +171,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 9163d7cb..965b7a27 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -41,7 +41,7 @@
 #include <kinstance.h>
 #include <kio/netaccess.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include "tmxcompendiumdata.h"
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                     emit progress( (100*(checkCounter+1))/data->numberOfEntries());
                 }
             
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
 
                 TQString origStr = data->msgid(*it);
                 origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                  continue;
             }
        
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
 
             if(i >= data->numberOfEntries())
             {
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 8646806e..0c186b57 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n"
 	    "%1\n"
 	    "Reason: %2")
-            .tqarg(url.prettyURL()).tqarg(_errorMsg);
+            .arg(url.prettyURL()).arg(_errorMsg);
 
         kdDebug(KBABEL_SEARCH) << "Error:  " << _errorMsg << endl;
 
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
         }
 	
     	TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index c5b28ad5..cafebd1f 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -91,7 +91,7 @@ public:
     TQString projectContext;
     
     /**
-     * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+     * Status of the translation, for example "approved", "spellchecked", "unknown"
      */
     TQString status;
 
@@ -173,7 +173,7 @@ public:
 	, _translators()
 	, _projectKeywords()
 	, _projectContexts()
-	, _translationtqStatus()
+	, _translationStatus()
     {}
     
     virtual ~SearchFilter() {}
@@ -213,10 +213,10 @@ public:
     void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; }
     
     /**
-     * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+     * Status of the translation, for example "approved", "spellchecked", "unknown"
      */
-    void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; }
-    void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; }
+    void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; }
+    void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; }
 
     /**
      *  The key method of the class - check, if the argument
@@ -232,7 +232,7 @@ private:
     TQStringList _translators;
     TQStringList _projectKeywords ;
     TQStringList _projectContexts;
-    TQStringList _translationtqStatus;
+    TQStringList _translationStatus;
 };
 
 /**