TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 14 deletions

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;
             }