Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

2 files changed, 36 insertions, 36 deletions

diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 44d180fd2..ec4f833a3 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -185,72 +185,72 @@ static int fcSpacing(int spacing)
 
 static int strToWeight(const TQString &str, TQString &newStr)
 {
-    if(0==str.find(i18n(KFI_WEIGHT_THIN), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_THIN), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_THIN).length());
         return FC_WEIGHT_THIN;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_EXTRALIGHT).length());
         return FC_WEIGHT_EXTRALIGHT;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_ULTRALIGHT).length());
         return FC_WEIGHT_ULTRALIGHT;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_LIGHT), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_LIGHT), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_LIGHT).length());
         return FC_WEIGHT_LIGHT;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_REGULAR), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_REGULAR), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_REGULAR).length());
         return FC_WEIGHT_REGULAR;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_NORMAL), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_NORMAL), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_NORMAL).length());
         return FC_WEIGHT_NORMAL;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_MEDIUM), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_MEDIUM), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_MEDIUM).length());
         return FC_WEIGHT_MEDIUM;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_DEMIBOLD), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_DEMIBOLD), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_DEMIBOLD).length());
         return FC_WEIGHT_SEMIBOLD;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_SEMIBOLD), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_SEMIBOLD), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_SEMIBOLD).length());
         return FC_WEIGHT_SEMIBOLD;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_BOLD), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_BOLD), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_BOLD).length());
         return FC_WEIGHT_BOLD;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_EXTRABOLD), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRABOLD), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_EXTRABOLD).length());
         return FC_WEIGHT_EXTRABOLD;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_ULTRABOLD), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRABOLD), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_ULTRABOLD).length());
         return FC_WEIGHT_ULTRABOLD;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_BLACK), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_BLACK), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_BLACK).length());
         return FC_WEIGHT_BLACK;
     }
-    if(0==str.find(i18n(KFI_WEIGHT_HEAVY), 0, false))
+    if(0==str.tqfind(i18n(KFI_WEIGHT_HEAVY), 0, false))
     {
         newStr=str.mid(i18n(KFI_WEIGHT_HEAVY).length());
         return FC_WEIGHT_HEAVY;
@@ -263,47 +263,47 @@ static int strToWeight(const TQString &str, TQString &newStr)
 #ifndef KFI_FC_NO_WIDTHS
 static int strToWidth(const TQString &str, TQString &newStr)
 {
-    if(0==str.find(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_ULTRACONDENSED).length());
         return FC_WIDTH_ULTRACONDENSED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_EXTRACONDENSED).length());
         return FC_WIDTH_EXTRACONDENSED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_CONDENSED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_CONDENSED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_CONDENSED).length());
         return FC_WIDTH_CONDENSED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_SEMICONDENSED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_SEMICONDENSED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_SEMICONDENSED).length());
         return FC_WIDTH_SEMICONDENSED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_NORMAL), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_NORMAL), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_NORMAL).length());
         return FC_WIDTH_NORMAL;
     }
-    if(0==str.find(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_SEMIEXPANDED).length());
         return FC_WIDTH_SEMIEXPANDED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_EXPANDED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_EXPANDED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_EXPANDED).length());
         return FC_WIDTH_EXPANDED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_EXTRAEXPANDED).length());
         return FC_WIDTH_EXTRAEXPANDED;
     }
-    if(0==str.find(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false))
+    if(0==str.tqfind(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false))
     {
         newStr=str.mid(i18n(KFI_WIDTH_ULTRAEXPANDED).length());
         return FC_WIDTH_ULTRAEXPANDED;
@@ -316,9 +316,9 @@ static int strToWidth(const TQString &str, TQString &newStr)
 
 static int strToSlant(const TQString &str)
 {
-    if(-1!=str.find(i18n(KFI_SLANT_ITALIC)))
+    if(-1!=str.tqfind(i18n(KFI_SLANT_ITALIC)))
         return FC_SLANT_ITALIC;
-    if(-1!=str.find(i18n(KFI_SLANT_OBLIQUE)))
+    if(-1!=str.tqfind(i18n(KFI_SLANT_OBLIQUE)))
         return FC_SLANT_OBLIQUE;
     return FC_SLANT_ROMAN;
 }
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
                  ch;
 
     for(ch=0; ch<slen; ++ch)
-        if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
+        if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
             return false;
     return true;
 }
@@ -867,7 +867,7 @@ bool CFcEngine::getInfo(const KURL &url, int faceNo, TQString &full, TQString &f
         {
             int pos;
 
-            if(-1==(pos=itsDescriptiveName.find(", ")))   // No style information...
+            if(-1==(pos=itsDescriptiveName.tqfind(", ")))   // No style information...
                 family=itsDescriptiveName;
             else
                 family=itsDescriptiveName.left(pos);
@@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
             TQTextStream stream(&file);
 
             thumbUrl=stream.readLine();
-            isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
+            isThumbnailUrl=0==thumbUrl.tqfind(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
             file.close();
         }
 
@@ -1003,7 +1003,7 @@ void CFcEngine::parseName(const TQString &name, int faceNo, bool all)
 
     itsDescriptiveName=name;
     itsSpacing=FC_PROPORTIONAL;
-    if(-1==(pos=name.find(", ")))   // No style information...
+    if(-1==(pos=name.tqfind(", ")))   // No style information...
     {
         itsWeight=FC_WEIGHT_NORMAL;
 #ifndef KFI_FC_NO_WIDTHS
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 1e779b514..6e87c9b02 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -65,9 +65,9 @@ TQString dirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.replace("//", "/");
+        ds.tqreplace("//", "/");
 
-        int slashPos=ds.findRev('/');
+        int slashPos=ds.tqfindRev('/');
 
         if(slashPos!=(((int)ds.length())-1))
             ds.append('/');
@@ -84,9 +84,9 @@ TQString xDirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.replace("//", "/");
+        ds.tqreplace("//", "/");
 
-        int slashPos=ds.findRev('/');
+        int slashPos=ds.tqfindRev('/');
  
         if(slashPos==(((int)ds.length())-1))
             ds.remove(slashPos, 1);
@@ -100,7 +100,7 @@ TQString getDir(const TQString &f)
 {
     TQString d(f);
 
-    int slashPos=d.findRev('/');
+    int slashPos=d.tqfindRev('/');
  
     if(slashPos!=-1)
         d.remove(slashPos+1, d.length());
@@ -112,7 +112,7 @@ TQString getFile(const TQString &f)
 {
     TQString d(f);
 
-    int slashPos=d.findRev('/');
+    int slashPos=d.tqfindRev('/');
  
     if(slashPos!=-1)
         d.remove(0, slashPos+1);
@@ -152,7 +152,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ
 TQString changeExt(const TQString &f, const TQString &newExt)
 {
     TQString newStr(f);
-    int     dotPos=newStr.findRev('.');
+    int     dotPos=newStr.tqfindRev('.');
 
     if(-1==dotPos)
         newStr+=TQChar('.')+newExt;