TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

44 files changed, 423 insertions, 417 deletions

diff --git a/kbabel/common/argextractor.cpp b/kbabel/common/argextractor.cpp
index ec5d659f..5666acdc 100644
--- a/kbabel/common/argextractor.cpp
+++ b/kbabel/common/argextractor.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.	    
diff --git a/kbabel/common/argextractor.h b/kbabel/common/argextractor.h
index dd84f1c2..83545520 100644
--- a/kbabel/common/argextractor.h
+++ b/kbabel/common/argextractor.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt.  If you modify this file, you may extend this exception to
+  TQt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -58,7 +58,7 @@ public:
   /**
    * Create an argument extractor for "string"
    */ 
-  ArgExtractor(TQString string=TQString::null);
+  ArgExtractor(TQString string=TQString());
 
   /**
    * Set a new list of tag regular expressions. It also
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index d6501c3e..3639748c 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -70,8 +70,8 @@
 #include <kmessagebox.h>
 using namespace KBabel;
 
-Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
-        : TQObject(parent,name)
+Catalog::Catalog(TQObject* tqparent, const char* name, TQString projectFile)
+        : TQObject(tqparent,name)
 {
    if ( projectFile.isEmpty() )
         projectFile = KBabel::ProjectManager::defaultProjectName();
@@ -79,7 +79,7 @@ Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
    readPreferences();
 }
 
-Catalog::Catalog(const Catalog& c): TQObject(c.parent(),c.name()
+Catalog::Catalog(const Catalog& c): TQObject(c.tqparent(),c.name()
 )
 {
    kdFatal() << "Copy constructor of Catalog, please report how to reproduce to the authors" << endl;
@@ -93,7 +93,7 @@ Catalog::~Catalog()
 TQString Catalog::msgctxt(uint index) const
 {
     if (  d->_entries.isEmpty() )
-        return TQString::null;
+        return TQString();
    uint max=d->_entries.count()-1;
    if(index > max)
       index=max;
@@ -103,7 +103,7 @@ TQString Catalog::msgctxt(uint index) const
 TQStringList Catalog::msgid(uint index, const bool noNewlines) const
 {
    if (  d->_entries.isEmpty() )
-        return TQString::null;
+        return TQString();
     uint max=d->_entries.count()-1;
    if(index > max)
       index=max;
@@ -114,7 +114,7 @@ TQStringList Catalog::msgid(uint index, const bool noNewlines) const
 TQStringList Catalog::msgstr(uint index, const bool noNewlines) const
 {
     if (  d->_entries.isEmpty() )
-        return TQString::null;
+        return TQString();
 
    uint max=d->_entries.count()-1;
    if(index > max)
@@ -126,7 +126,7 @@ TQStringList Catalog::msgstr(uint index, const bool noNewlines) const
 TQString Catalog::comment(uint index) const
 {
     if (  d->_entries.isEmpty() )
-        return TQString::null;
+        return TQString();
    uint max=d->_entries.count()-1;
    if(index > max)
       index=max;
@@ -165,7 +165,7 @@ int Catalog::indexForMsgid(const TQString& id) const
     int i=0;
 	TQValueVector<CatalogItem>::ConstIterator it = d->_entries.begin();
 
-    while(it != d->_entries.end() && !((*it).msgid(true).contains(id)))
+    while(it != d->_entries.end() && !((*it).msgid(true).tqcontains(id)))
     {
         ++it;
         i++;
@@ -290,8 +290,8 @@ bool Catalog::setHeader(CatalogItem newHeader)
    {
       // normalize the values - ensure every key:value pair is only on a single line
       TQString values = newHeader.msgstr().first();
-      values.replace ("\n", "");
-      values.replace ("\\n", "\\n\n");
+      values.tqreplace ("\n", "");
+      values.tqreplace ("\\n", "\\n\n");
       
       kdDebug () << "Normalized header: " << values << endl;
       
@@ -343,7 +343,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
       temp+="\\n";
       for( it = headerList.begin(); it != headerList.end(); ++it )
       {
-         if((*it).contains(TQRegExp("^ *Last-Translator:.*")))
+         if((*it).tqcontains(TQRegExp("^ *Last-Translator:.*")))
          {
             (*it) = temp;
             found=true;
@@ -363,7 +363,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
 
       for( it = headerList.begin(); it != headerList.end(); ++it )
       {
-         if((*it).contains(TQRegExp("^ *PO-Revision-Date:.*")))
+         if((*it).tqcontains(TQRegExp("^ *PO-Revision-Date:.*")))
          {
             (*it) = temp;
             found=true;
@@ -380,11 +380,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
       found=false;
 
       temp="Project-Id-Version: "+saveOptions.projectString+"\\n";
-      temp.replace( "@PACKAGE@", packageName());
+      temp.tqreplace( "@PACKAGE@", packageName());
 
       for( it = headerList.begin(); it != headerList.end(); ++it )
       {
-         if((*it).contains(TQRegExp("^ *Project-Id-Version:.*")))
+         if((*it).tqcontains(TQRegExp("^ *Project-Id-Version:.*")))
          {
             (*it) = temp;
             found=true;
@@ -408,7 +408,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
       temp+="\\n";
       for( it = headerList.begin(); it != headerList.end(); ++it )
       {
-         if((*it).contains(TQRegExp("^ *Language-Team:.*")))
+         if((*it).tqcontains(TQRegExp("^ *Language-Team:.*")))
          {
             (*it) = temp;
             found=true;
@@ -440,7 +440,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         it = headerList.begin();
         while( it != headerList.end() )
         {
-            if( (*it).find( TQRegExp( "^ *Content-Type:.*" ) ) != -1 )
+            if( (*it).tqfind( TQRegExp( "^ *Content-Type:.*" ) ) != -1 )
             {
                 if ( found )
                 {
@@ -483,7 +483,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
 
       for( it = headerList.begin(); it != headerList.end(); ++it )
       {
-         if((*it).contains(TQRegExp("^ *Content-Transfer-Encoding:.*")))
+         if((*it).tqcontains(TQRegExp("^ *Content-Transfer-Encoding:.*")))
          {
             (*it) = temp;
             found=true;
@@ -497,12 +497,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
    }
 
    temp="X-Generator: KBabel %1\\n";
-   temp=temp.arg(VERSION);
+   temp=temp.tqarg(VERSION);
    found=false;
 
    for( it = headerList.begin(); it != headerList.end(); ++it )
    {
-      if((*it).contains(TQRegExp("^ *X-Generator:.*")))
+      if((*it).tqcontains(TQRegExp("^ *X-Generator:.*")))
       {
          (*it) = temp;
          found=true;
@@ -519,7 +519,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
    found=false;
    for( it = headerList.begin(); it != headerList.end(); ++it )
    {
-	if((*it).contains(TQRegExp("^ *MIME-Version:")))
+	if((*it).tqcontains(TQRegExp("^ *MIME-Version:")))
     	{
          (*it) = temp;
          found=true;
@@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
 
 
    temp="Plural-Forms: %1\\n";
-   temp=temp.arg(identityOptions.gnuPluralFormHeader);
+   temp=temp.tqarg(identityOptions.gnuPluralFormHeader);
    found=false;
 
    // update plural form header
@@ -541,7 +541,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
    {
 	for( it = headerList.begin(); it != headerList.end(); ++it )
 	{
-    	    if((*it).contains(TQRegExp("^ *Plural-Forms:")))
+    	    if((*it).tqcontains(TQRegExp("^ *Plural-Forms:")))
     	    {
         	(*it) = temp;
         	found=true;
@@ -564,7 +564,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
       for( it = commentList.begin(); it != commentList.end(); ++it )
       {
          // U+00A9 is the Copyright sign
-         if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 )
+         if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 )
          {
             found=true;
 	    break;
@@ -572,21 +572,21 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
        }
        if(found)
        {
-            if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 )
+            if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 )
 	    {
 		//template string
     		if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove) 
 		    (*it).remove(" YEAR Free Software Foundation, Inc");
 		else 
-		    (*it).replace("YEAR", TQDate::currentDate().toString("yyyy"));
+		    (*it).tqreplace("YEAR", TQDate::tqcurrentDate().toString("yyyy"));
 	    } else
 	    if( saveOptions.FSFCopyright == ProjectSettingsBase::Update )
 	    {
 		    //update years
-		    TQString cy = TQDate::currentDate().toString("yyyy");
-		    if( !(*it).contains( TQRegExp(cy)) ) // is the year already included?
+		    TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+		    if( !(*it).tqcontains( TQRegExp(cy)) ) // is the year already included?
 		    {
-			int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
+			int index = (*it).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
 			if( index == -1 )
 			{
 			    KMessageBox::information(0,i18n("Free Software Foundation Copyright does not contain any year. "
@@ -603,14 +603,14 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
            && ( !saveOptions.descriptionString.isEmpty() ) )
     {
         temp = "# "+saveOptions.descriptionString;
-        temp.replace( "@PACKAGE@", packageName());
-        temp.replace( "@LANGUAGE@", identityOptions.languageName);
+        temp.tqreplace( "@PACKAGE@", packageName());
+        temp.tqreplace( "@LANGUAGE@", identityOptions.languageName);
         temp = temp.stripWhiteSpace();
 
         // The description strings has often buggy variants already in the file, these must be removed
         TQString regexpstr = "^#\\s+" + TQRegExp::escape( saveOptions.descriptionString.stripWhiteSpace() ) + "\\s*$";
-        regexpstr.replace( "@PACKAGE@", ".*" );
-        regexpstr.replace( "@LANGUAGE@", ".*" );
+        regexpstr.tqreplace( "@PACKAGE@", ".*" );
+        regexpstr.tqreplace( "@LANGUAGE@", ".*" );
         //kdDebug() << "REGEXPSTR: " <<  regexpstr << endl;
         TQRegExp regexp ( regexpstr );
 
@@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         {
             temp+=(" <"+identityOptions.authorEmail+">");
         }
-        temp+=", "+TQDate::currentDate().toString("yyyy")+".";
+        temp+=", "+TQDate::tqcurrentDate().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)" );
@@ -683,11 +683,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         while ( it != commentList.end() )
         {
             bool deleteItem = false;
-            if ( (*it).find ( "copyright", 0, false ) != -1 )
+            if ( (*it).tqfind ( "copyright", 0, false ) != -1 )
             {
                 // We have a line with a copyright. It should not be moved.
             }
-            else if ( (*it).find ( regexpYearAlone ) != -1 )
+            else if ( (*it).tqfind ( regexpYearAlone ) != -1 )
             {
                 // We have found a year number that is preceeded by a comma.
                 // That is typical of KBabel 1.10 (and earlier?) when there is neither an author name nor an email
@@ -699,9 +699,9 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
                 // Typical placeholder, remove it.
                 deleteItem = true;
             }
-            else if ( (*it).find ( regexpAuthorYear ) != -1 ) // email address followed by year
+            else if ( (*it).tqfind ( regexpAuthorYear ) != -1 ) // email address followed by year
             {
-                if ( foundAuthors.find( (*it) ) == foundAuthors.end() )
+                if ( foundAuthors.tqfind( (*it) ) == foundAuthors.end() )
                 {
                     // The author line is new (and not a duplicate), so add it to the author line list
                     foundAuthors.append( (*it) );
@@ -721,17 +721,17 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
             found = false;
             bool foundAuthor = false;
     
-            const TQString cy = TQDate::currentDate().toString("yyyy");
+            const TQString cy = TQDate::tqcurrentDate().toString("yyyy");
 
             ait = foundAuthors.end();
             for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it )
             {
-                if ( (*it).find( TQRegExp(
+                if ( (*it).tqfind( TQRegExp(
                     TQRegExp::escape( identityOptions.authorName )+".*"
                     + TQRegExp::escape( identityOptions.authorEmail ) ) ) != -1 )
                 {
                     foundAuthor = true;
-                    if( (*it).find( cy ) != -1 )
+                    if( (*it).tqfind( cy ) != -1 )
                         found = true;
                     else
                         ait = it;
@@ -744,7 +744,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
                 else if ( ait != foundAuthors.end() )
                 {
                     //update years
-                    const int index = (*ait).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
+                    const int index = (*ait).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
                     if ( index == -1 )
                         (*ait)+=", "+cy;
                     else
@@ -760,7 +760,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         it=commentList.end();
         do
             --it;
-        while( ( it != commentList.begin() ) && ( (*it).find( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) );
+        while( ( it != commentList.begin() ) && ( (*it).tqfind( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) );
         ++it;
         for( ait = foundAuthors.begin() ; ait != foundAuthors.end() ; ++ait )
         {
@@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on)
 
 }
 
-void Catalog::removeFuzzyStatus(uint index)
+void Catalog::removeFuzzytqStatus(uint index)
 {
     setFuzzy(index,false);
 }
@@ -838,7 +838,7 @@ TQString Catalog::packageName() const
 
     TQString package=d->_url.fileName();
 
-    int index=package.find(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$"));
+    int index=package.tqfind(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$"));
 
     if(index>0)
       package=package.left(index);
@@ -848,7 +848,7 @@ TQString Catalog::packageName() const
 
 void Catalog::setPackage(const TQString& package )
 {
-    const int pos = package.findRev( '/' );
+    const int pos = package.tqfindRev( '/' );
     if( pos < 0 )
     {
 	d->_packageDir = TQString();
@@ -888,10 +888,10 @@ TQString Catalog::encoding() const
     return encodingStr;
 }
 
-ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
+ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
 {
    TQString target;
-   ConversionStatus error = OK;
+   ConversiontqStatus error = OK;
 
    if(KIO::NetAccess::download(url, target, NULL))
    {
@@ -971,8 +971,8 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
 
             if( package.isEmpty() )
 	    {
-		d->_packageName=TQString::null;
-		d->_packageDir=TQString::null;
+		d->_packageName=TQString();
+		d->_packageDir=TQString();
 	    }
 	    else setPackage(package);
 
@@ -992,10 +992,10 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
    }
 }
 
-ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
+ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
 {
    TQString target;
-   ConversionStatus error = OK;
+   ConversiontqStatus error = OK;
 
    if(KIO::NetAccess::download(openUrl, target, NULL))
    {
@@ -1069,8 +1069,8 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
            d->_url = saveURL;
            if( package.isEmpty() )
 	   {
-		d->_packageName=TQString::null;
-		d->_packageDir=TQString::null;
+		d->_packageName=TQString();
+		d->_packageDir=TQString();
 	   }
 	   else setPackage(package);
 
@@ -1093,9 +1093,9 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
    }
 }
 
-Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
+Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
 {
-   if( !d->_mimeTypes.contains( "application/x-gettext" ) )
+   if( !d->_mimeTypes.tqcontains( "application/x-gettext" ) )
 	return Msgfmt::Unsupported;
 
    TQString filename;
@@ -1112,7 +1112,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
    }
 
    Msgfmt msgfmt;
-   Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
+   Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
 
    if( clearErrors) clearErrorList();
 
@@ -1128,10 +1128,10 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
       const TQStringList lines = TQStringList::split("\n",output);
       for ( TQStringList::const_iterator it = lines.constBegin(); it != lines.constEnd(); ++it )
       {
-         if( (*it).find(TQRegExp("^.+:\\d+:")) >= 0 )
+         if( (*it).tqfind(TQRegExp("^.+:\\d+:")) >= 0 )
          {
-            const int begin=(*it).find(":",0)+1;
-            const int end=(*it).find(":",begin);
+            const int begin=(*it).tqfind(":",0)+1;
+            const int end=(*it).tqfind(":",begin);
 
             const TQString line=(*it).mid(begin,end-begin);
 
@@ -1148,7 +1148,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
 		continue;
 	    }
 
-            if( !d->_errorIndex.contains(currentIndex) )
+            if( !d->_errorIndex.tqcontains(currentIndex) )
             {
                d->_errorIndex.append(currentIndex);
 			   d->_entries[currentIndex].setSyntaxError(true);
@@ -1177,7 +1177,7 @@ void Catalog::clearErrorList()
 
 void Catalog::removeFromErrorList(uint index)
 {
-	if(d->_errorIndex.contains(index))
+	if(d->_errorIndex.tqcontains(index))
 	{
 		d->_errorIndex.remove(index);
 		d->_entries[index].setSyntaxError(false);
@@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index)
 	}
 }
 
-TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
+TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
 {
     if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1207,7 +1207,7 @@ TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool>
 	return item.errors();
 }
 
-TQStringList Catalog::itemStatus(uint index)
+TQStringList Catalog::itemtqStatus(uint index)
 {
        if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1241,7 +1241,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors)
 	{
 	    if( !tool->run( "validate", (void*)(&(*it)), "CatalogItem", "application/x-kbabel-catalogitem" ))
 	    {
-		if( !d->_errorIndex.contains(index) )
+		if( !d->_errorIndex.tqcontains(index) )
 		{
 			d->_errorIndex.append(index);
 			hasErrors=true;
@@ -1461,7 +1461,7 @@ bool Catalog::isUntranslated(uint index) const
 
 bool Catalog::hasError(uint index, DocPosition& pos) const
 {
-    if( d->_errorIndex.contains(index) )
+    if( d->_errorIndex.tqcontains(index) )
     {
 	pos.item=index;
 	pos.form=0;
@@ -1734,7 +1734,7 @@ int Catalog::findNextInList(const TQValueList<uint>& list,uint index) const
     int nextIndex=-1;
 
     // find index in List
-    it=list.find(index);
+    it=list.tqfind(index);
 
     // if the given index is found in the list and not the last entry
     // in the list, return the next listentry
@@ -1765,7 +1765,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const
 
     int prevIndex=-1;
 
-    it=list.find(index);
+    it=list.tqfind(index);
 
     // if the given index is found in the list and not the last entry
     // in the list, return the next listentry
@@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const
 
 TQString Catalog::dateTime() const
 {
-    const TQDateTime dt = TQDateTime::currentDateTime();
+    const TQDateTime dt = TQDateTime::tqcurrentDateTime();
     TQString dateTimeString;
     
     const SaveSettings options = d->_project->saveSettings();
@@ -1831,49 +1831,49 @@ TQString Catalog::dateTime() const
             const TQTime time = dt.time();
 
             // the year
-            dateTimeString.replace( "%Y", TQString::number( date.year() ) );
-            dateTimeString.replace( "%y", TQString::number( date.year() ).right(2) );
+            dateTimeString.tqreplace( "%Y", TQString::number( date.year() ) );
+            dateTimeString.tqreplace( "%y", TQString::number( date.year() ).right(2) );
 
             // the month
             if(date.month()<10)
             {
-                dateTimeString.replace( "%m", "0"+TQString::number( date.month() ) );
+                dateTimeString.tqreplace( "%m", "0"+TQString::number( date.month() ) );
             }
             else
             {
-                dateTimeString.replace( "%m", TQString::number( date.month() ) );
+                dateTimeString.tqreplace( "%m", TQString::number( date.month() ) );
             }
 
-            dateTimeString.replace( "%f", TQString::number( date.month() ) );
+            dateTimeString.tqreplace( "%f", TQString::number( date.month() ) );
 
-            dateTimeString.replace( "%b", date.longMonthName(date.month()) );
-            dateTimeString.replace( "%h", date.longMonthName(date.month()) );
+            dateTimeString.tqreplace( "%b", date.longMonthName(date.month()) );
+            dateTimeString.tqreplace( "%h", date.longMonthName(date.month()) );
 
             // the day
-            dateTimeString.replace( "%j", TQString::number( date.dayOfYear() ) );
-            dateTimeString.replace( "%e", TQString::number( date.day() ) );
+            dateTimeString.tqreplace( "%j", TQString::number( date.dayOfYear() ) );
+            dateTimeString.tqreplace( "%e", TQString::number( date.day() ) );
             if(date.day() < 10)
             {
-                dateTimeString.replace( "%d", "0"+TQString::number( date.day() ) );
+                dateTimeString.tqreplace( "%d", "0"+TQString::number( date.day() ) );
             }
             else
             {
-                dateTimeString.replace( "%d", TQString::number( date.day() ) );
+                dateTimeString.tqreplace( "%d", TQString::number( date.day() ) );
             }
 
-            dateTimeString.replace( "%a", date.longDayName( date.dayOfWeek() ) );
+            dateTimeString.tqreplace( "%a", date.longDayName( date.dayOfWeek() ) );
 
 
             // hour
-            dateTimeString.replace( "%k", TQString::number( time.hour() ) );
+            dateTimeString.tqreplace( "%k", TQString::number( time.hour() ) );
 
             if(time.hour() < 10)
             {
-                dateTimeString.replace( "%H", "0"+TQString::number( time.hour() ) );
+                dateTimeString.tqreplace( "%H", "0"+TQString::number( time.hour() ) );
             }
             else
             {
-                dateTimeString.replace( "%H", TQString::number( time.hour() ) );
+                dateTimeString.tqreplace( "%H", TQString::number( time.hour() ) );
             }
 
             TQString zone; // AM or PM
@@ -1888,46 +1888,46 @@ TQString Catalog::dateTime() const
                 zone="AM";
             }
 
-            dateTimeString.replace( "%I", TQString::number( hour ) );
+            dateTimeString.tqreplace( "%I", TQString::number( hour ) );
 
             if(hour < 10)
             {
-                dateTimeString.replace( "%i", "0"+TQString::number( hour ) );
+                dateTimeString.tqreplace( "%i", "0"+TQString::number( hour ) );
             }
             else
             {
-                dateTimeString.replace( "%i", TQString::number( hour ) );
+                dateTimeString.tqreplace( "%i", TQString::number( hour ) );
             }
 
-            dateTimeString.replace( "%p", zone );
+            dateTimeString.tqreplace( "%p", zone );
 
             // minutes
             if(time.minute() < 10)
             {
-                dateTimeString.replace( "%M", "0"+TQString::number( time.minute() ) );
+                dateTimeString.tqreplace( "%M", "0"+TQString::number( time.minute() ) );
             }
             else
             {
-                dateTimeString.replace( "%M", TQString::number( time.minute() ) );
+                dateTimeString.tqreplace( "%M", TQString::number( time.minute() ) );
             }
 
             // seconds
             if(time.second() < 10)
             {
-                dateTimeString.replace( "%S", "0"+TQString::number( time.second() ) );
+                dateTimeString.tqreplace( "%S", "0"+TQString::number( time.second() ) );
             }
             else
             {
-                dateTimeString.replace( "%S", TQString::number( time.second() ) );
+                dateTimeString.tqreplace( "%S", TQString::number( time.second() ) );
             }
 
             // timezone
-            dateTimeString.replace( "%Z", d->_project->identitySettings().timeZone );
+            dateTimeString.tqreplace( "%Z", d->_project->identitySettings().timeZone );
             TQTime t;
             const int offset = KRFCDate::localUTCOffset();
             const int correction = offset < 0 ? -60 : 60;
             t = t.addSecs( offset * correction );
-            dateTimeString.replace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") );
+            dateTimeString.tqreplace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") );
             break;
         }
     }
@@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const
 }
 
 
-ConversionStatus Catalog::saveFile()
+ConversiontqStatus Catalog::saveFile()
 {
    if(d->_url.isEmpty())
    {
@@ -1947,11 +1947,11 @@ ConversionStatus Catalog::saveFile()
    return saveFileAs(d->_url,true);
 }
 
-ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
+ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
 {
    if( d->_active ) return BUSY;
 
-   ConversionStatus status=OK;
+   ConversiontqStatus status=OK;
 
    bool newName=false;
    KURL targetURL=d->_url;
@@ -2036,14 +2036,14 @@ TQString Catalog::saveTempFile()
    TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po");
    if( writeFile(filename) != OK )
    {
-      filename = TQString::null;
+      filename = TQString();
    }
 
    return filename;
 }
 
 
-ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
+ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
 {
    TQFileInfo info(localFile);
 
@@ -2066,7 +2066,7 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
       }
    }
 
-    ConversionStatus error = OK;
+    ConversiontqStatus error = OK;
     CatalogExportPlugin* filter=0;
 
     // gimme plugin for this MIME type
@@ -2179,72 +2179,72 @@ PoInfo Catalog::headerInfo(const CatalogItem headerItem)
    // extract information from the header
    for(it=header.begin();it!=header.end();++it)
    {
-      if((*it).contains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$")))
+      if((*it).tqcontains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$")))
       {
-         info.project=(*it).replace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),"");
+         info.project=(*it).tqreplace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),"");
 
          if(info.project.right(2)=="\\n")
             info.project.remove(info.project.length()-2,2);
 
          info.project=info.project.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$")))
+      else if((*it).tqcontains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$")))
       {
-         info.creation=(*it).replace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),"");
+         info.creation=(*it).tqreplace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),"");
 
          if(info.creation.right(2)=="\\n")
             info.creation.remove(info.creation.length()-2,2);
 
          info.creation=info.creation.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$")))
+      else if((*it).tqcontains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$")))
       {
-         info.revision=(*it).replace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),"");
+         info.revision=(*it).tqreplace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),"");
 
          if(info.revision.right(2)=="\\n")
             info.revision.remove(info.revision.length()-2,2);
 
          info.revision=info.revision.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$")))
+      else if((*it).tqcontains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$")))
       {
-         info.lastTranslator=(*it).replace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),"");
+         info.lastTranslator=(*it).tqreplace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),"");
 
          if(info.lastTranslator.right(2)=="\\n")
             info.lastTranslator.remove(info.lastTranslator.length()-2,2);
 
          info.lastTranslator=info.lastTranslator.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*")))
+      else if((*it).tqcontains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*")))
       {
-         info.languageTeam=(*it).replace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),"");
+         info.languageTeam=(*it).tqreplace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),"");
 
          if(info.languageTeam.right(2)=="\\n")
             info.languageTeam.remove(info.languageTeam.length()-2,2);
 
          info.languageTeam=info.languageTeam.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*")))
+      else if((*it).tqcontains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*")))
       {
-         info.mimeVersion=(*it).replace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),"");
+         info.mimeVersion=(*it).tqreplace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),"");
 
          if(info.mimeVersion.right(2)=="\\n")
             info.mimeVersion.remove(info.mimeVersion.length()-2,2);
 
          info.mimeVersion=info.mimeVersion.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*")))
+      else if((*it).tqcontains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*")))
       {
-         info.contentType=(*it).replace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),"");
+         info.contentType=(*it).tqreplace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),"");
 
          if(info.contentType.right(2)=="\\n")
             info.contentType.remove(info.contentType.length()-2,2);
 
          info.contentType=info.contentType.simplifyWhiteSpace();
       }
-      else if((*it).contains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*")))
+      else if((*it).tqcontains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*")))
       {
-         info.encoding=(*it).replace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),"");
+         info.encoding=(*it).tqreplace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),"");
 
          if(info.encoding.right(2)=="\\n")
             info.encoding.remove(info.encoding.length()-2,2);
@@ -2590,9 +2590,9 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         }
 
         if(findOpts->ignoreAccelMarker
-                && targetStr.contains(miscOptions.accelMarker))
+                && targetStr.tqcontains(miscOptions.accelMarker))
         {
-            accelMarkerPos = targetStr.find(miscOptions.accelMarker);
+            accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker);
             targetStr.remove(accelMarkerPos,1);
 
             if(docPos.offset > (uint)accelMarkerPos)
@@ -2605,7 +2605,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
 				if(findOpts->wholeWords) {
 					TQString pre=targetStr.mid(pos-1,1);
 					TQString post=targetStr.mid(pos+len,1);
-					if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){
+					if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){
 						success=true;
 						docPos.offset=pos;
 					}
@@ -2617,13 +2617,13 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
 			}
 		}
 		else {
-			if( (pos=targetStr.find(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) {
+			if( (pos=targetStr.tqfind(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) {
 				len=searchStr.length();
 
 				if(findOpts->wholeWords) {
 					TQString pre=targetStr.mid(pos-1,1);
 					TQString post=targetStr.mid(pos+len,1);
-					if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){
+					if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){
 						success=true;
 						docPos.offset=pos;
 					}
@@ -2839,9 +2839,9 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         }
 
         if(findOpts->ignoreAccelMarker
-                && targetStr.contains(miscOptions.accelMarker))
+                && targetStr.tqcontains(miscOptions.accelMarker))
         {
-            accelMarkerPos = targetStr.find(miscOptions.accelMarker);
+            accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker);
             targetStr.remove(accelMarkerPos,1);
 
             if(docPos.offset > (uint)accelMarkerPos)
@@ -2854,7 +2854,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
 		else if( findOpts->isRegExp ) {
 			/*
 			don't work!?
-			if((pos=targetStr.findRev(regexp,docPos.offset)) >= 0 ) {
+			if((pos=targetStr.tqfindRev(regexp,docPos.offset)) >= 0 ) {
 				regexp.match(targetStr,pos,&len); // to get the length of the string
 			*/
 			bool found=false;
@@ -2871,7 +2871,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
 				if(findOpts->wholeWords) {
 					TQString pre=targetStr.mid(pos-1,1);
 					TQString post=targetStr.mid(pos+len,1);
-					if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){
+					if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){
 						success=true;
 						docPos.offset=pos;
 					}
@@ -2882,13 +2882,13 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
 				}
 			}
 		}
-		else if( (pos=targetStr.findRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0
+		else if( (pos=targetStr.tqfindRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0
 		          && (uint)pos < docPos.offset) {
 			len=searchStr.length();
 			if(findOpts->wholeWords) {
 				TQString pre=targetStr.mid(pos-1,1);
 				TQString post=targetStr.mid(pos+len,1);
-				if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){
+				if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){
 					success=true;
 					docPos.offset=pos;
 				}
@@ -3071,8 +3071,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
     // then look if the same msgid is contained in the diff file
     // FIXME: should care about plural forms in msgid
     TQString id = msgid(entry).first();
-    id.replace( "\n","");
-    if(d->msgidDiffList.contains(id))
+    id.tqreplace( "\n","");
+    if(d->msgidDiffList.tqcontains(id))
     {
 	// FIXME:: should care about plural forms in msgid
         *result = msgid(entry).first();
@@ -3091,8 +3091,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
     // then look if there are entries with the same translation
     kdWarning() << "Diff feature (2) does not work with plural forms" << endl;
     TQString str = msgstr(entry).first();
-    str.replace("\n","");
-    if(d->msgstr2MsgidDiffList.contains(str))
+    str.tqreplace("\n","");
+    if(d->msgstr2MsgidDiffList.tqcontains(str))
     {
         TQStringList list = d->msgstr2MsgidDiffList[str];
 
@@ -3134,7 +3134,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
 
         int counter=0;
         int oldPercent=0;
-        int max = QMAX( d->msgidDiffList.count()-1, 1);
+        int max = TQMAX( d->msgidDiffList.count()-1, 1);
 
         TQStringList::ConstIterator it;
         for(it = d->msgidDiffList.begin();
@@ -3193,7 +3193,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
     TQString r = wordDiff(idForDiff,id);
 
     //esp for plural forms
-    *result = r.replace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n");
+    *result = r.tqreplace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n");
 
     s = new TQString(*result);
     if( !d->diffCache.insert(entry,s) )
@@ -3220,7 +3220,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
     d->msgstr2MsgidDiffList.clear();
     d->diffCache.clear();
 
-    uint max = QMAX(list.count()-1,1);
+    uint max = TQMAX(list.count()-1,1);
     int oldPercent=0;
     uint counter=0;
     TQValueList<DiffEntry>::ConstIterator it;
@@ -3236,14 +3236,14 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
         }
 
         TQString id = (*it).msgid;
-        id.replace("\n","");
+        id.tqreplace("\n","");
         TQString str = (*it).msgstr;
-        str.replace("\n","");
+        str.tqreplace("\n","");
         d->msgidDiffList.append(id);
 
         if(!str.isEmpty())
         {
-            if(d->msgstr2MsgidDiffList.contains(str))
+            if(d->msgstr2MsgidDiffList.tqcontains(str))
             {
                 TQStringList sl = d->msgstr2MsgidDiffList[str];
                 sl.append(id);
@@ -3506,4 +3506,4 @@ void Catalog::wordCount (uint &total, uint &fuzzy, uint &untranslated) const
 
 #include "catalog.moc"
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index 6a5c0491..74fbcdd7 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -107,9 +107,10 @@ struct DiffEntry
 * @short Class, that represents a translation catalog(po-file)
 * @author Matthias Kiefer <matthias.kiefer@gmx.de>
 */
-class KDE_EXPORT Catalog : public QObject
+class KDE_EXPORT Catalog : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
    enum DiffResult{DiffOk, DiffNotFound, DiffNeedList};
@@ -127,11 +128,11 @@ public:
 
    /**
    * A constructor for an empty message catalog.
-   * @param parent parent @ref TQObject for this catalog
+   * @param tqparent tqparent @ref TQObject for this catalog
    * @param name   unique name for this object
    * @param configFile configuration file to read config from
    */
-   Catalog(TQObject* parent=0, const char* name=0, TQString projectFile = TQString() );
+   Catalog(TQObject* tqparent=0, const char* name=0, TQString projectFile = TQString() );
 
    /**
    * Deprecated. A copy constructor. Do not use since each Catalog registers
@@ -225,7 +226,7 @@ public:
     * @return the list of errors found for a given item index
     * @param index index of the item to check
     */
-   TQStringList itemStatus(uint index);
+   TQStringList itemtqStatus(uint index);
 
    /**
     * @return the list of errors found for a given item index
@@ -233,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 itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
+   TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
 
    /**
    * replaces msgstr in catalog item at index index with msgstr
@@ -252,7 +253,7 @@ public:
    bool setHeader(CatalogItem header);
 
    /** removes string ", fuzzy" from comment */
-   void removeFuzzyStatus(uint index);
+   void removeFuzzytqStatus(uint index);
 
    /** sets or unsets fuzzy status of entry index */
    void setFuzzy(uint index, bool on);
@@ -296,19 +297,19 @@ public:
    * opens file url by using KDE's network downlad and calls
    * openFile with a local filename
    */
-   ConversionStatus openURL(const KURL& url, const TQString& package=TQString::null);
+   ConversiontqStatus 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
    */
-   ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString::null);
+   ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
 
    /** save the file under the old filename */
-   ConversionStatus saveFile();
+   ConversiontqStatus saveFile();
    /** saves the file under a new filename */
-   ConversionStatus saveFileAs(const KURL& url,bool overwrite=false);
+   ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false);
 
    /**
    * saves the current catalog in a temporary file and
@@ -341,7 +342,7 @@ public:
     * @param clearError should the errors be cleared before running msgfmt
     * @return the file codec used for the current catalog
     */
-   Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true);
+   Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true);
 
    /**
     * checks using an external tool. The tool must provide the "validate" command
@@ -478,12 +479,12 @@ public:
    TagSettings tagSettings() const;
 
    /**
-   * reads the header from QTextstream and puts it in header
+   * reads the header from TQTextstream and puts it in header
    * I made it static to be able to use this function for
    * the search in po-files. This way, I can easily find the first
    * catalog entry in the textstream
    */
-//   static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header);
+//   static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header);
 
 
    void registerView(CatalogView* view);
@@ -611,7 +612,7 @@ private:
    void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false);
 
    /** do the actual file write using plugin */
-   ConversionStatus writeFile(TQString localfile, bool overwrite=false);
+   ConversiontqStatus writeFile(TQString localfile, bool overwrite=false);
 
    /**
    * generates  lists that contain indexes of all fuzzy and untranslated entries
diff --git a/kbabel/common/catalog_private.h b/kbabel/common/catalog_private.h
index e27f1174..a02327b7 100644
--- a/kbabel/common/catalog_private.h
+++ b/kbabel/common/catalog_private.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -112,9 +112,9 @@ public:
    TQStringList _catalogExtra;
    
    CatalogPrivate(Project::Ptr project) : 
-	_packageName( TQString::null ), _packageDir( TQString::null ),
+	_packageName( TQString() ), _packageDir( TQString() ),
 	_header (project), 
-	_importID( TQString::null ), _mimeTypes( "text/plain" ),
+	_importID( TQString() ), _mimeTypes( "text/plain" ),
 	_modified(false), _readOnly(false), _generatedFromDocbook(false), 
 	_active(false), _stop(false),
 	fileCodec(0),  diffCache(30,76), numberOfPluralForms(-1), 
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index 77b760e8..ea7cc245 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -50,7 +50,7 @@ class CatalogExportPluginPrivate;
 /**
  * Result of the conversion
  */
-enum ConversionStatus { 
+enum ConversiontqStatus { 
     OK,
     NOT_IMPLEMENTED,
     NO_FILE,
@@ -79,12 +79,13 @@ enum ConversionStatus {
 * @short Base class for Catalog import plugins
 * @author Stanislav Visnovsky <visnovsky@kde.org>
 */    
-class KDE_EXPORT CatalogImportPlugin: public QObject
+class KDE_EXPORT CatalogImportPlugin: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    CatalogImportPlugin(TQObject* parent, const char* name);
+    CatalogImportPlugin(TQObject* tqparent, const char* name);
     virtual ~CatalogImportPlugin();
     
     /**
@@ -96,7 +97,7 @@ public:
      * @param catalog  the catalog to be filled
      * @return result of the operation
      */
-    ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
+    ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
     
     /**
     * Reimplement this method to load the local file passed as an argument.
@@ -108,7 +109,7 @@ public:
     * @param file file to be loaded
     * @param mimetype the expected MIME type (the type used for plugin selection
     */
-    virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0;
+    virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0;
     /**
     * Reimplement this method to return unique identification of your plugin
     */
@@ -174,14 +175,15 @@ private:
 * @short Base class for Catalog export plugins
 * @author Stanislav Visnovsky <visnovsky@kde.org>
 */    
-class KDE_EXPORT CatalogExportPlugin: public QObject
+class KDE_EXPORT CatalogExportPlugin: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CatalogExportPlugin(TQObject* parent, const char* name);
+    CatalogExportPlugin(TQObject* tqparent, const char* name);
     virtual ~CatalogExportPlugin();
-    virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
+    virtual ConversiontqStatus 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 bd55d7b6..14604438 100644
--- a/kbabel/common/catalogitem.cpp
+++ b/kbabel/common/catalogitem.cpp
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -75,7 +75,7 @@ TQString CatalogItem::msgctxt(const bool noNewlines) const
     if( noNewlines )
     {
         TQString tmp = d->_msgctxt;
-        tmp.replace("\n", " "); // ### TODO: " " or "" ?
+        tmp.tqreplace("\n", " "); // ### TODO: " " or "" ?
         return tmp;
     }
     else
@@ -207,29 +207,29 @@ TQStringList CatalogItem::argList( RegExpExtractor& te)
 
 bool CatalogItem::isFuzzy() const
 {
-    return d->_comment.find( TQRegExp(",\\s*fuzzy") ) != -1;
+    return d->_comment.tqfind( TQRegExp(",\\s*fuzzy") ) != -1;
 }
 
 bool CatalogItem::isCformat() const
 {
     // Allow "possible-c-format" (from xgettext --debug) or "c-format"
     // Note the regexp (?: ) is similar to () but it does not capture (so it is faster)
-    return d->_comment.find( TQRegExp(",\\s*(?:possible-)c-format") ) == -1;
+    return d->_comment.tqfind( TQRegExp(",\\s*(?:possible-)c-format") ) == -1;
 }
 
 bool CatalogItem::isNoCformat() const
 {
-    return d->_comment.find( TQRegExp(",\\s*no-c-format") ) == -1;
+    return d->_comment.tqfind( TQRegExp(",\\s*no-c-format") ) == -1;
 }
 
-bool CatalogItem::isQtformat() const
+bool CatalogItem::isTQtformat() const
 {
-    return d->_comment.find( TQRegExp(",\\s*qt-format") ) == -1;
+    return d->_comment.tqfind( TQRegExp(",\\s*qt-format") ) == -1;
 }
 
-bool CatalogItem::isNoQtformat() const
+bool CatalogItem::isNoTQtformat() const
 {
-    return d->_comment.find( TQRegExp(",\\s*no-qt-format") ) == -1;
+    return d->_comment.tqfind( TQRegExp(",\\s*no-qt-format") ) == -1;
 }
 
 bool CatalogItem::isUntranslated() const
@@ -252,23 +252,23 @@ int CatalogItem::totalLines() const
    int lines=0;
    if(!d->_comment.isEmpty())
    {
-      lines = d->_comment.contains('\n')+1;
+      lines = d->_comment.tqcontains('\n')+1;
    }
    int msgctxtLines=0;
    if(!d->_msgctxt.isEmpty())
    {
-      msgctxtLines=d->_msgctxt.contains('\n')+1;
+      msgctxtLines=d->_msgctxt.tqcontains('\n')+1;
    }
    int msgidLines=0;
    TQStringList::ConstIterator it;
    for(it=d->_msgid.begin(); it != d->_msgid.end(); ++it)
    {
-      msgidLines += (*it).contains('\n')+1;
+      msgidLines += (*it).tqcontains('\n')+1;
    }
    int msgstrLines=0;
    for(it=d->_msgstr.begin(); it != d->_msgstr.end(); ++it)
    {
-      msgstrLines += (*it).contains('\n')+1;
+      msgstrLines += (*it).tqcontains('\n')+1;
    }
 
    if(msgctxtLines>1)
@@ -286,7 +286,7 @@ int CatalogItem::totalLines() const
 
 void CatalogItem::setSyntaxError(bool on)
 {
-	if(on && !d->_errors.contains("syntax error"))
+	if(on && !d->_errors.tqcontains("syntax error"))
 		d->_errors.append("syntax error");
 	else
 		d->_errors.remove("syntax error");
@@ -305,7 +305,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt)
        TQRegExp fuzzyStr(",\\s*fuzzy");
 
        int offset;
-       offset=comment.find(fuzzyStr);
+       offset=comment.tqfind(fuzzyStr);
        while(offset>=0)
        {
           cmd = new DelTextCmd(offset,fuzzyStr.cap(),0);
@@ -314,11 +314,11 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt)
 
           comment.remove(offset,fuzzyStr.cap().length());
 
-          offset=comment.find(fuzzyStr,offset+1);
+          offset=comment.tqfind(fuzzyStr,offset+1);
        }
 
        // remove empty comment lines
-       if( comment.contains( TQRegExp("^#\\s*$") ))
+       if( comment.tqcontains( TQRegExp("^#\\s*$") ))
        {
           cmd = new DelTextCmd(0,comment,0);
           cmd->setPart(Comment);
@@ -326,9 +326,9 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt)
 
           comment="";
        }
-       if( comment.contains( TQRegExp("\n#\\s*$") ))
+       if( comment.tqcontains( TQRegExp("\n#\\s*$") ))
        {
-          offset=comment.find( TQRegExp("\n#\\s*$") );
+          offset=comment.tqfind( TQRegExp("\n#\\s*$") );
           while(offset>=0)
           {
              cmd = new DelTextCmd(offset,comment.mid(offset),0);
@@ -337,15 +337,15 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt)
 
              comment.remove(offset,comment.length()-offset);
 
-             offset=comment.find( TQRegExp("\n#\\s*$"), offset+1 );
+             offset=comment.tqfind( TQRegExp("\n#\\s*$"), offset+1 );
           }
        }
-       if( comment.contains( TQRegExp("\n#\\s*\n") ))
+       if( comment.tqcontains( TQRegExp("\n#\\s*\n") ))
        {
-          offset=comment.find( TQRegExp("\n#\\s*\n") )+1;
+          offset=comment.tqfind( TQRegExp("\n#\\s*\n") )+1;
           while(offset>=0)
           {
-             int endIndex=comment.find("\n",offset)+1;
+             int endIndex=comment.tqfind("\n",offset)+1;
 
              cmd = new DelTextCmd(offset,comment.mid(offset,endIndex-offset),0);
              cmd->setPart(Comment);
@@ -353,7 +353,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt)
 
              comment.remove(offset,endIndex-offset);
 
-             offset=comment.find( TQRegExp("\n#\\s*\n"), offset+1 );
+             offset=comment.tqfind( TQRegExp("\n#\\s*\n"), offset+1 );
           }
        }
 
@@ -499,7 +499,7 @@ void CatalogItem::clearErrors()
 
 void CatalogItem::appendError(const TQString& error )
 {
-    if( !d->_errors.contains( error ) )
+    if( !d->_errors.tqcontains( error ) )
 	d->_errors.append(error);
 }
 
@@ -518,4 +518,4 @@ void CatalogItem::setProject( Project::Ptr project )
     d->_project = project;
 }
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/kbabel/common/catalogitem.h b/kbabel/common/catalogitem.h
index 51b7b21b..bb02b1d8 100644
--- a/kbabel/common/catalogitem.h
+++ b/kbabel/common/catalogitem.h
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -95,14 +95,14 @@ public:
      * if the string ", qt-format" is contained in the comment
      * @since 1.11.2 (KDE 3.5.2)
      */
-    bool isQtformat() const;
+    bool isTQtformat() const;
 
     /**
      * returns true, 
      * if the string ", no-qt-format" is contained in the comment
      * @since 1.11.2 (KDE 3.5.2)
      */
-    bool isNoQtformat() const;
+    bool isNoTQtformat() const;
 
     /**
     * returns true, if the Msgid is untranslated, this means the
diff --git a/kbabel/common/catalogitem_private.h b/kbabel/common/catalogitem_private.h
index 411e76b2..9304adda 100644
--- a/kbabel/common/catalogitem_private.h
+++ b/kbabel/common/catalogitem_private.h
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index 4b87f522..a25920ba 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -59,11 +59,11 @@ TQString KBabel::charsetString(const TQTextCodec *codec)
 	if ( encodingStr.startsWith("CP " ) )
     	    encodingStr.remove( 2, 1 );
 	else if ( encodingStr.startsWith("IBM " ) )
-            encodingStr.replace( "IBM ", "CP" );
+            encodingStr.tqreplace( "IBM ", "CP" );
         return encodingStr;
     }
     else
-      return TQString::null;
+      return TQString();
 }
 
 TQString KBabel::GNUPluralForms(const TQString& lang)
@@ -192,7 +192,7 @@ TQString Defaults::Identity::authorEmail()
 TQString Defaults::Identity::mailingList()
 {
     TQString lang=Defaults::Identity::languageCode();
-    int temp=lang.find("_");
+    int temp=lang.tqfind("_");
     lang=lang.left(temp);
     return lang+"@li.org";
 }
diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h
index 50bdbada..552f88c5 100644
--- a/kbabel/common/catalogsettings.h
+++ b/kbabel/common/catalogsettings.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings
     int encoding;
     bool useOldEncoding;
 
-    Qt::DateFormat dateFormat;
+    TQt::DateFormat dateFormat;
     TQString customDateFormat;
     
     TQString projectString;
@@ -102,7 +102,7 @@ struct KDE_EXPORT MiscSettings
 {
    /** 
     * The char, that marks keyboard accelerators.
-    * Default is '&' as used by Qt
+    * Default is '&' as used by TQt
     */
    TQChar accelMarker;
    
diff --git a/kbabel/common/catalogview.h b/kbabel/common/catalogview.h
index 03056c43..0029c306 100644
--- a/kbabel/common/catalogview.h
+++ b/kbabel/common/catalogview.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/diff.cpp b/kbabel/common/diff.cpp
index 455a26f1..4d38babb 100644
--- a/kbabel/common/diff.cpp
+++ b/kbabel/common/diff.cpp
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/diff.h b/kbabel/common/diff.h
index 2ce055bf..15454f17 100644
--- a/kbabel/common/diff.h
+++ b/kbabel/common/diff.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -81,7 +81,7 @@ typedef enum
 
 inline TQString LCSprinter::getString()
 {
-    return resultString.join("").replace(TQChar('\n'), ""); //w/o replace we'd get whole line colored
+    return resultString.join("").tqreplace(TQChar('\n'), ""); //w/o replace we'd get whole line colored
 }
 
 #endif // DIFF_H
diff --git a/kbabel/common/editcmd.cpp b/kbabel/common/editcmd.cpp
index 4ea98364..b0c8cd09 100644
--- a/kbabel/common/editcmd.cpp
+++ b/kbabel/common/editcmd.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -68,7 +68,7 @@ bool DelTextCmd::merge( EditCommand* other)
             && o->type() == type() && o->pluralNumber==pluralNumber )
    {
       DelTextCmd* o = (DelTextCmd*) other;
-      if ( offset + int(str.length()) == o->offset && !str.contains(TQRegExp("^\\s$")) )
+      if ( offset + int(str.length()) == o->offset && !str.tqcontains(TQRegExp("^\\s$")) )
       {
 	 o->str.prepend( str );
 	 o->offset = offset;
@@ -95,7 +95,7 @@ bool InsTextCmd::merge( EditCommand* other)
    if ( o->index()==index() && o->part() == part()
            && o->type() == type() && o->pluralNumber==pluralNumber )
    {
-      if ( offset == o->offset + int(o->str.length()) && !str.contains(TQRegExp("^\\s$")) )
+      if ( offset == o->offset + int(o->str.length()) && !str.tqcontains(TQRegExp("^\\s$")) )
       {
 	 o->str += str;
 	 return true;
diff --git a/kbabel/common/editcmd.h b/kbabel/common/editcmd.h
index 64bd4b93..5dc1c536 100644
--- a/kbabel/common/editcmd.h
+++ b/kbabel/common/editcmd.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp
index 327e85d0..3aa5af48 100644
--- a/kbabel/common/exportplugin.cpp
+++ b/kbabel/common/exportplugin.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -45,7 +45,7 @@ struct KBabel::CatalogExportPluginPrivate
     bool _stop;
 };
 
-CatalogExportPlugin::CatalogExportPlugin(TQObject* parent, const char* name) : TQObject(parent,name)
+CatalogExportPlugin::CatalogExportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name)
 {
     d = new CatalogExportPluginPrivate;
     d->_stop=false;
diff --git a/kbabel/common/findoptions.h b/kbabel/common/findoptions.h
index 518828df..9274a156 100644
--- a/kbabel/common/findoptions.h
+++ b/kbabel/common/findoptions.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index 711d77cd..4ef1562c 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -43,7 +43,7 @@
 
 using namespace KBabel;
 
-CatalogImportPlugin::CatalogImportPlugin(TQObject* parent, const char* name) : TQObject(parent,name)
+CatalogImportPlugin::CatalogImportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name)
 {
     d = new CatalogImportPluginPrivate;
     d->_catalog = 0;
@@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes )
     d->_mimeTypes=mimetypes;
 }
 
-ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
+ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
 {
     d->_stopped=false;
     d->_catalog=catalog;
     startTransaction();
     
-    ConversionStatus result = load(file, mimetype);
+    ConversiontqStatus result = load(file, mimetype);
     if( d->_stopped ) 
     {
 	d->_started=false;
diff --git a/kbabel/common/importplugin_private.h b/kbabel/common/importplugin_private.h
index 594ce21f..657a1879 100644
--- a/kbabel/common/importplugin_private.h
+++ b/kbabel/common/importplugin_private.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/itempart.h b/kbabel/common/itempart.h
index 842f195b..3aff285e 100644
--- a/kbabel/common/itempart.h
+++ b/kbabel/common/itempart.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/kbabeldatatool.h b/kbabel/common/kbabeldatatool.h
index 207f8bc5..ae1406c6 100644
--- a/kbabel/common/kbabeldatatool.h
+++ b/kbabel/common/kbabeldatatool.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -47,9 +47,10 @@ namespace KBabel
 class KBabelDataTool: public KDataTool
 {
     Q_OBJECT
+  TQ_OBJECT
     
 protected:
-    KBabelDataTool( TQObject* parent, const char* name ) : KDataTool( parent, name ) {}
+    KBabelDataTool( TQObject* tqparent, const char* name ) : KDataTool( tqparent, name ) {}
 public slots:
     /** The only method to be redefined in inherited classes.
      *  This method is called everytime the settings are changed.
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 0526bd74..1cb26723 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -53,8 +53,8 @@
 
 using namespace KBabel;
 
-KBabelMailer::KBabelMailer( TQWidget* parent, Project::Ptr project)
-  : _project( project ), m_parent( parent )
+KBabelMailer::KBabelMailer( TQWidget* tqparent, Project::Ptr project)
+  : _project( project ), m_parent( tqparent )
 {
   m_tempDir.setAutoDelete( true );
   readConfig();
@@ -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.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) );
     }
   }
   else
@@ -133,7 +133,7 @@ TQString KBabelMailer::createArchive(TQStringList fileList, TQString initialName
 
   // do nothing if there are no files in the list
   if (fileList.empty())
-    return TQString::null;
+    return TQString();
 
   // determine the name of the archive, do nothing if none is given
   // or Cancel was pressed
@@ -176,7 +176,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
   KTar archive(archiveName, mimetype);
   if (!archive.open(IO_WriteOnly)) {
     KMessageBox::error( m_parent, i18n("Error while trying to create archive file.") );
-    return TQString::null;
+    return TQString();
   }
 
   // add files to this archive
@@ -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.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) );
       continue;
     }
 
@@ -199,13 +199,13 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
     // actually reside in one of its subdirectories. Else they are stored
     // without relative path.
     TQString poArchFileName = url.path();
-    if (_poBaseDir.isEmpty( ) || poArchFileName.find(_poBaseDir) != 0)
+    if (_poBaseDir.isEmpty( ) || poArchFileName.tqfind(_poBaseDir) != 0)
       poArchFileName = TQFileInfo( poArchFileName ).fileName();
     else
       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.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) );
     }
    
     KIO::NetAccess::removeTempFile(poTempName);
diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h
index 17481636..1f35d6e2 100644
--- a/kbabel/common/kbmailer.h
+++ b/kbabel/common/kbmailer.h
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -62,11 +62,11 @@ class KDE_EXPORT KBabelMailer
     /**
      * Constructor.
      *
-     * @param parent The parent widget.
+     * @param tqparent The tqparent widget.
      * @param project The project to be used.
-     * @since 1.11.2 (KDE 3.5.2): @p parent parameter
+     * @since 1.11.2 (KDE 3.5.2): @p tqparent parameter
      */
-    KBabelMailer( TQWidget* parent, Project::Ptr project);
+    KBabelMailer( TQWidget* tqparent, Project::Ptr project);
     virtual ~KBabelMailer();
 
     /**
@@ -91,7 +91,7 @@ class KDE_EXPORT KBabelMailer
      * @param fileList contains the names of the files to be sent.
      * @param initialName the possible name of the archive
      */
-    void sendFiles(TQStringList fileList, const TQString& initialName = TQString::null);
+    void sendFiles(TQStringList fileList, const TQString& initialName = TQString());
     /**
      * Sets the the PO files' base directory.
      *
@@ -109,7 +109,7 @@ class KDE_EXPORT KBabelMailer
      *  name is queried.
      *
      * @return name of the archive if it was created successfully,
-     *  otherwise TQString::null.
+     *  otherwise TQString().
      */
     TQString createArchive(TQStringList fileList, TQString initialName);
     
@@ -157,7 +157,7 @@ class KDE_EXPORT KBabelMailer
      */
     TQString _poBaseDir;
 
-    /// The parent widget
+    /// The tqparent widget
     TQWidget* m_parent;
 };
 
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 73ac9dbd..99fece7e 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -250,7 +250,7 @@ SaveSettings Project::saveSettings ()
     settings.autoSyntaxCheck = _settings->autoSyntaxCheck();
     settings.saveObsolete = _settings->saveObsolete();
     settings.customDateFormat = _settings->customDateFormat();
-    settings.dateFormat = (Qt::DateFormat)_settings->dateFormat();
+    settings.dateFormat = (TQt::DateFormat)_settings->dateFormat();
     settings.updateDescription = _settings->updateDescription();
     settings.descriptionString = _settings->descriptionString();
     settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright();
diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h
index 4c3d6fc7..b9356c12 100644
--- a/kbabel/common/kbproject.h
+++ b/kbabel/common/kbproject.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -46,6 +46,7 @@ namespace KBabel
     class KDE_EXPORT Project : public TQObject, public KShared
     {
 	    Q_OBJECT
+  TQ_OBJECT
 	public:
 	    typedef KSharedPtr <Project> Ptr;
 
diff --git a/kbabel/common/kbprojectmanager.cpp b/kbabel/common/kbprojectmanager.cpp
index ab117c97..77a2fb9d 100644
--- a/kbabel/common/kbprojectmanager.cpp
+++ b/kbabel/common/kbprojectmanager.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/kbprojectmanager.h b/kbabel/common/kbprojectmanager.h
index abfce3e4..40ec5884 100644
--- a/kbabel/common/kbprojectmanager.h
+++ b/kbabel/common/kbprojectmanager.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/libgettext/pofiles.h b/kbabel/common/libgettext/pofiles.h
index cf2e3ec8..a670bb9a 100644
--- a/kbabel/common/libgettext/pofiles.h
+++ b/kbabel/common/libgettext/pofiles.h
@@ -19,11 +19,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/libgettext/tokens.h b/kbabel/common/libgettext/tokens.h
index dfbf693d..78e19c19 100644
--- a/kbabel/common/libgettext/tokens.h
+++ b/kbabel/common/libgettext/tokens.h
@@ -19,11 +19,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 61525a2f..86632720 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -46,14 +46,14 @@
 
 using namespace KBabel;
 
-Msgfmt::Msgfmt(TQObject* parent,const char* name)
-      : TQObject(parent , name)
+Msgfmt::Msgfmt(TQObject* tqparent,const char* name)
+      : TQObject(tqparent , name)
 {
 }
 
-Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
+Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
 {
-   Status stat=Ok;
+   tqStatus stat=Ok;
    // this method does not return the right retrun values at the moment :-(
 
    KProcess proc;
@@ -80,7 +80,7 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
    }
    else if(proc.normalExit())
    {
-       if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-(
+       if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-(
          stat=SyntaxError;
    }
    else
@@ -92,9 +92,9 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
    return stat;
 }
 
-Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
+Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
 {
-   Status stat=Ok;
+   tqStatus stat=Ok;
 
    // this method does not return the right return values at the moment :-(
    KProcess proc;
@@ -109,7 +109,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
    _output="";
 
    proc << "IFS='\n'; msgfmt --statistics -o /dev/null "
-           "$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")";
+           "$(tqfind" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")";
 
    if(!proc.start(KProcess::Block,KProcess::Stderr))
    {
@@ -117,7 +117,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
    }
    else if(proc.normalExit())
    {
-       if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-(
+       if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-(
          stat=SyntaxError;
    }
    else
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 1a025312..9831a43f 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -42,15 +42,16 @@ class TQString;
 namespace KBabel
 {
 
-class KDE_EXPORT Msgfmt : private QObject
+class KDE_EXPORT Msgfmt : private TQObject
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-   enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
-   Msgfmt(TQObject* parent=0,const char* name=0);
+   enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
+   Msgfmt(TQObject* tqparent=0,const char* name=0);
 
-   Status checkSyntax(TQString file,TQString& output, bool gnu = false);
-   Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
+   tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
+   tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
 
 private slots:
    void addToOutput(KProcess*,char *buffer, int buflen);
diff --git a/kbabel/common/pluralforms.h b/kbabel/common/pluralforms.h
index f65dba01..5e84fa2d 100644
--- a/kbabel/common/pluralforms.h
+++ b/kbabel/common/pluralforms.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 68e13da8..f7245141 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -19,11 +19,11 @@
   
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -123,7 +123,7 @@ void PoInfo::cacheRead()
 
         // Check the file cache version.
         // If it is not the current version, we do not read the cache file
-        Q_UINT32 version;
+        TQ_UINT32 version;
 	s >> version;
         if( version != POINFOCACHE_VERSION ) {
             // Wrong POINFOCACHE_VERSION, so abort
@@ -134,13 +134,13 @@ void PoInfo::cacheRead()
         /*
          * Check the version of the TQDataStream with which the cache file was written
          *
-         * If the cache file was written by an incompatible future version of Qt,
+         * If the cache file was written by an incompatible future version of TQt,
          * the cache file will not be read.
          *
-         * On the other side, a cache file written by a previous version of Qt can be read,
+         * On the other side, a cache file written by a previous version of TQt can be read,
          * by setting the version of the TQDataStream used.
          */
-        Q_INT32 qdatastreamVersion;
+        TQ_INT32 qdatastreamVersion;
         s >> qdatastreamVersion;
         if( qdatastreamVersion > 0 &&  qdatastreamVersion <= s.version() ) {
             s.setVersion( qdatastreamVersion );
@@ -173,13 +173,13 @@ void PoInfo::cacheWrite()
     if( stream ) {
 
         // Write the cache file version
-        // We choose to fix a format (Q_UINT32) for compatibility (Qt version, platforms, architectures)
-	const Q_UINT32 version = POINFOCACHE_VERSION;
+        // We choose to fix a format (TQ_UINT32) for compatibility (TQt version, platforms, architectures)
+	const TQ_UINT32 version = POINFOCACHE_VERSION;
 	*stream << version;
 
-        // Write the version of the QDataStream
-        // Here too we choose a fixed format (Q_INT32) for compatibility
-        const Q_INT32 qdatastreamVersion = stream->version();
+        // Write the version of the TQDataStream
+        // Here too we choose a fixed format (TQ_INT32) for compatibility
+        const TQ_INT32 qdatastreamVersion = stream->version();
         *stream << qdatastreamVersion;
         
         TQDictIterator<poInfoCacheItem> it( _poInfoCache ); // iterator for dict
@@ -209,7 +209,7 @@ bool PoInfo::cacheFind(const TQString url, PoInfo& info)
 	cacheRead();
     }
 
-    poInfoCacheItem *item = _poInfoCache.find( url );
+    poInfoCacheItem *item = _poInfoCache.tqfind( url );
     if( item ) {
 	TQFileInfo fi( url );
 
@@ -297,7 +297,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
    {
       bool knownKey=false;
       // We search for the : character, which is the separator between key and value
-      const int res=(*it).find(':');
+      const int res=(*it).tqfind(':');
       if (res>=0)
       {
          knownKey=true; // We know most keys, if not it will be changed to false in the "else" case
@@ -305,7 +305,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
          TQString value=(*it).mid(res+1);
          // "Chop" the \n at the end
          if (value.endsWith("\\n"))
-            value.remove(value.length()-2,2); // ### Qt4: use  value.chop(2)
+            value.remove(value.length()-2,2); // ### TQt4: use  value.chop(2)
          value=value.simplifyWhiteSpace();
          kdDebug(KBABEL) << "Header key: " << key << " value: " << value << endl;
          if (key=="Project-Id-Version")
@@ -335,7 +335,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
          TQString line=(*it);
 
          if(line.right(2)=="\\n")
-            line.remove(line.length()-2,2); // ### Qt4: use  value.chop(2)
+            line.remove(line.length()-2,2); // ### TQt4: use  value.chop(2)
 
          if(!info.others.isEmpty())
             info.others+='\n';
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
 }
 
 
-ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
 {
     return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
 }
 
-ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
 {
    stopStaticRead = false;
 
@@ -372,7 +372,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
             // First check file with msgfmt to be sure, it is syntactically correct
             Msgfmt msgfmt;
             TQString output;
-            Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
+            Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
             if(stat == Msgfmt::SyntaxError)
             {
                 KIO::NetAccess::removeTempFile(target);
@@ -395,7 +395,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 	   lexer->yylex();
 	   
            // now parse the rest of the file
-           ConversionStatus success=OK;
+           ConversiontqStatus success=OK;
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
@@ -415,7 +415,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
                {
 		  success=OK;
 		  
-		  if( temp.comment().contains("\n#~") ) continue; // skip obsolete
+		  if( temp.comment().tqcontains("\n#~") ) continue; // skip obsolete
 		  
                   if( temp.msgid().first().isEmpty()) //header
 		  {
@@ -453,7 +453,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 		    {
 			TQString w = sl.first();
 			sl.pop_front();
-			if( !wordList.contains(w) ) wordList.append( w );
+			if( !wordList.tqcontains(w) ) wordList.append( w );
 		    }
 		    st = temp.msgstr().join(" " ).simplifyWhiteSpace().lower();
 		    sl = TQStringList::split( ' ', st );
@@ -461,7 +461,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 		    {
 			TQString w = sl.first();
 			sl.pop_front();
-			if( !wordList.contains(w) ) wordList.append( w );
+			if( !wordList.tqcontains(w) ) wordList.append( w );
 		    }
 		    st = temp.comment().simplifyWhiteSpace().lower();
 		    sl = TQStringList::split( ' ', st );
@@ -469,7 +469,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 		    {
 			TQString w = sl.first();
 			sl.pop_front();
-			if( !wordList.contains(w) ) wordList.append( w );
+			if( !wordList.tqcontains(w) ) wordList.append( w );
 		    }
                 }
 	      }
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
            // first read header
 	   CatalogItem temp;
 	   
-	   ConversionStatus status = fastRead( temp, lexer, true );
+	   ConversiontqStatus status = fastRead( temp, lexer, true );
 	   if( status != OK || !temp.msgid().first().isEmpty() ) 
 	   {
 		delete lexer;
@@ -560,15 +560,15 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 			if( options.isRegExp )
 			    pos=regexp.search(text, 0 );
 			else 
-			    pos=text.find(searchStr,0,options.caseSensitive);
+			    pos=text.tqfind(searchStr,0,options.caseSensitive);
 			if( pos >= 0)
 			{
 			    if( options.wholeWords) {
 				len = searchStr.length();
 				TQString pre = text.mid(pos-1,1);
 				TQString post = text.mid(pos+len,1);
-				if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) &&
-				    !post.contains( TQRegExp("[a-zA-Z0-9]") )
+				if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) &&
+				    !post.tqcontains( TQRegExp("[a-zA-Z0-9]") )
 				) {
 				    delete lexer;
 				    delete stream;
@@ -601,7 +601,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		    
 			if( options.ignoreAccelMarker )
 			{
-			    pos = text.find( options.accelMarker );
+			    pos = text.tqfind( options.accelMarker );
 			    if( pos >= 0 )
 				text.remove( pos, 1 );
 			}
@@ -609,7 +609,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 			if( options.isRegExp )
 			    pos=regexp.search(text, 0 );
 			else 
-			    pos=text.find(searchStr,0,options.caseSensitive);
+			    pos=text.tqfind(searchStr,0,options.caseSensitive);
 
 			if( pos >= 0)
 			{
@@ -617,8 +617,8 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 				len = searchStr.length();
 				TQString pre = text.mid(pos-1,1);
 				TQString post = text.mid(pos+len,1);
-				if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) &&
-				    !post.contains( TQRegExp("[a-zA-Z0-9]") )
+				if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) &&
+				    !post.tqcontains( TQRegExp("[a-zA-Z0-9]") )
 				) {
 				    delete lexer;
 				    delete stream;
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 }
 
 // this does not like any incorrect files
-ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
 {
    item.clear();
    _gettextPluralForm = false;
@@ -758,7 +758,7 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b
     {
 	TQStringList msgstrs = item.msgstr();
 	TQString s = TQString::fromUtf8(lexer->YYText());
-	while( lexer->lastToken == T_MSGSTR && s.contains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) )
+	while( lexer->lastToken == T_MSGSTR && s.tqcontains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) )
 	{
 	    if( lexer->yylex() != T_STRING ) return PARSE_ERROR;
 	    it = msgstrs.fromLast();
@@ -778,4 +778,4 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b
     return OK;
 }
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 830d35eb..58e0bc66 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -19,11 +19,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -105,7 +105,7 @@ public:
     *        being parsed?
     * @since KBabel 1.11 (KDE 3.5)
     */
-   static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
+   static ConversiontqStatus 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 ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
+   static ConversiontqStatus 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 ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
+   static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
    
    static bool _gettextPluralForm;
 };
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 3f8f47a3..1d3efd77 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/projectsettings.h b/kbabel/common/projectsettings.h
index 49afc0a6..556088dd 100644
--- a/kbabel/common/projectsettings.h
+++ b/kbabel/common/projectsettings.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -108,7 +108,7 @@ struct SourceContextSettings
      */
     TQStringList sourcePaths;
     
-    void SourceContextSettins() { codeRoot = TQString::null; sourcePaths.clear(); }
+    void SourceContextSettins() { codeRoot = TQString(); sourcePaths.clear(); }
 };
 
 /**
diff --git a/kbabel/common/regexpextractor.cpp b/kbabel/common/regexpextractor.cpp
index 058834ea..d07c36ed 100644
--- a/kbabel/common/regexpextractor.cpp
+++ b/kbabel/common/regexpextractor.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -42,7 +42,7 @@ using namespace KBabel;
 RegExpExtractor::RegExpExtractor(const TQStringList& regexps) :
     _regExpList( regexps )
 {
-    _string=TQString::null;
+    _string=TQString();
     _matches.setAutoDelete(true);
 }
 
@@ -64,7 +64,7 @@ TQString RegExpExtractor::firstMatch()
     if(ti)
         return ti->extracted;
 
-    return TQString::null;
+    return TQString();
 }
 
 TQString RegExpExtractor::nextMatch()
@@ -76,7 +76,7 @@ TQString RegExpExtractor::nextMatch()
     if(ti)
         return ti->extracted;
 
-    return TQString::null;
+    return TQString();
 }
 
 TQString RegExpExtractor::match(uint tagnumber)
@@ -85,7 +85,7 @@ TQString RegExpExtractor::match(uint tagnumber)
     if(ti)
         return ti->extracted;
 
-    return TQString::null;
+    return TQString();
 }
 
 int RegExpExtractor::matchIndex(uint tagnumber)
@@ -103,7 +103,7 @@ TQString RegExpExtractor::prevMatch()
     if(ti)
         return ti->extracted;
     
-    return TQString::null;
+    return TQString();
 }
 
 TQString RegExpExtractor::lastMatch()
@@ -112,7 +112,7 @@ TQString RegExpExtractor::lastMatch()
     if(ti)
         return ti->extracted;
     
-    return TQString::null;
+    return TQString();
 } 
 
 TQStringList RegExpExtractor::matches()
@@ -140,7 +140,7 @@ TQString RegExpExtractor::plainString(bool keepPos)
         {
              s+=' ';
         }
-        tmp.replace(ti->index,len,s);
+        tmp.tqreplace(ti->index,len,s);
         
     }
     if(!keepPos)
@@ -151,18 +151,18 @@ TQString RegExpExtractor::plainString(bool keepPos)
     return tmp;
 }
 
-TQString RegExpExtractor::matchesReplaced(const TQString& replace)
+TQString RegExpExtractor::matchesReplaced(const TQString& tqreplace)
 {    
     TQString tmp=_string;
 
     int posCorrection=0;
-    int replaceLen=replace.length();
+    int replaceLen=tqreplace.length();
 
     MatchedEntryInfo *ti;
     for(ti=_matches.first(); ti != 0; ti=_matches.next())
     {
         uint len=ti->extracted.length();
-        tmp.replace(ti->index + posCorrection,len,replace);
+        tmp.tqreplace(ti->index + posCorrection,len,tqreplace);
         
         posCorrection+=(replaceLen-len);
     }
@@ -213,7 +213,7 @@ void RegExpExtractor::processString()
                 {
                     s+=' ';
                 }
-                tmp.replace(pos,tag.length(),s);
+                tmp.tqreplace(pos,tag.length(),s);
 
                 break;
             }
diff --git a/kbabel/common/regexpextractor.h b/kbabel/common/regexpextractor.h
index 83ff8f60..06de48c0 100644
--- a/kbabel/common/regexpextractor.h
+++ b/kbabel/common/regexpextractor.h
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -125,7 +125,7 @@ public:
   /**
    * @return the string, where matches are replaced with the given string
    */
-  TQString matchesReplaced(const TQString& replace);
+  TQString matchesReplaced(const TQString& tqreplace);
 
   //Functions that allow user to define his own regexps.
   
diff --git a/kbabel/common/resources.h b/kbabel/common/resources.h
index d6054b43..35c2baca 100644
--- a/kbabel/common/resources.h
+++ b/kbabel/common/resources.h
@@ -19,11 +19,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/stringdistance.cpp b/kbabel/common/stringdistance.cpp
index 8de11c98..3ffc4194 100644
--- a/kbabel/common/stringdistance.cpp
+++ b/kbabel/common/stringdistance.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -41,7 +41,7 @@ const int Distance::editCost_replace_base = 1;
 
 const int HammingDistance::editCost = 1;
 
-const int LevenshteinDistance::editCost_replace = 1;
+const int LevenshteinDistance::editCost_tqreplace = 1;
 const int LevenshteinDistance::editCost_insert = 1;
 const int LevenshteinDistance::editCost_delete = 1;
 
@@ -166,9 +166,9 @@ double LevenshteinDistance::calculate(const TQString&  left_string, const TQStri
 	{
 		for(r = 1; r < right_size; r++)
 		{
-			tmp_value = QMIN( ( D(l-1,r)   + editCost_delete ),
+			tmp_value = TQMIN( ( D(l-1,r)   + editCost_delete ),
 			                 ( D(l-1,r-1) + nodeDistance(left_string[l-1], right_string[r-1]) ) ) ;
-			D(l,r) = QMIN( tmp_value,
+			D(l,r) = TQMIN( tmp_value,
 					( D(l,r-1)   + editCost_insert ) );
 		}
 	}
diff --git a/kbabel/common/stringdistance.h b/kbabel/common/stringdistance.h
index 89c60627..7520c863 100644
--- a/kbabel/common/stringdistance.h
+++ b/kbabel/common/stringdistance.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -63,7 +63,7 @@ private:  // emphasize the following members are private
   *
   * The class Distance calculates the distance
   * between two Entities (left & right).
-  * It is the parent for other distance-classes.
+  * It is the tqparent for other distance-classes.
   */
 class Distance : public NonCopyable
 {
@@ -114,8 +114,8 @@ class LevenshteinDistance : public Distance
 {
 protected:
 	virtual double calculate(const TQString& left_string, const TQString& right_string);
-	int editCostReplace() { return editCost_replace; }
-	static const int editCost_replace;
+	int editCostReplace() { return editCost_tqreplace; }
+	static const int editCost_tqreplace;
 	static const int editCost_insert;
 	static const int editCost_delete;
 };
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index fded2703..4fae0e7b 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
diff --git a/kbabel/common/tagextractor.h b/kbabel/common/tagextractor.h
index 3845b9fd..d6018f37 100644
--- a/kbabel/common/tagextractor.h
+++ b/kbabel/common/tagextractor.h
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.