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

1 files changed, 15 insertions, 15 deletions

diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index 00a87567e..2fe6d27f1 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -27,7 +27,7 @@
 #include "fakeuaprovider.h"
 
 #define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL(x) TQString::fromLatin1(x)
+#define QFL(x) TQString::tqfromLatin1(x)
 
 FakeUASProvider::FakeUASProvider()
 {
@@ -37,11 +37,11 @@ FakeUASProvider::FakeUASProvider()
 FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
 {
   TQStringList split;
-  int pos = (uaStr).find("::");
+  int pos = (uaStr).tqfind("::");
 
   if ( pos == -1 )
   {
-    pos = (uaStr).find(':');
+    pos = (uaStr).tqfind(':');
     if ( pos != -1 )
     {
       split.append(uaStr.left(pos));
@@ -53,7 +53,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString
     split = TQStringList::split("::", uaStr);
   }
 
-  if ( m_lstIdentity.contains(split[1]) )
+  if ( m_lstIdentity.tqcontains(split[1]) )
     return DUPLICATE_ENTRY;
   else
   {
@@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription()
       struct utsname utsn;
       uname( &utsn );
 
-      tmp.replace( QFL("appSysName"), TQString(utsn.sysname) );
-      tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
-      tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
+      tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) );
+      tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) );
+      tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) );
 
       TQStringList languageList = KGlobal::locale()->languageList();
       if ( languageList.count() )
       {
-        TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
+        TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") );
         if( it != languageList.end() )
         {
-          if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
+          if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 )
             languageList.remove( it );
           else
-            (*it) = TQString::fromLatin1("en");
+            (*it) = TQString::tqfromLatin1("en");
         }
       }
 
-      tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
-      tmp.replace( QFL("appPlatform"), QFL("X11") );
+      tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
+      tmp.tqreplace( QFL("appPlatform"), QFL("X11") );
     }
 
     // Ignore dups...
-    if ( m_lstIdentity.contains(tmp) )
+    if ( m_lstIdentity.tqcontains(tmp) )
       continue;
 
     m_lstIdentity << tmp;
@@ -133,7 +133,7 @@ void FakeUASProvider::parseDescription()
 
 TQString FakeUASProvider::aliasStr( const TQString& name )
 {
-  int id = userAgentStringList().findIndex(name);
+  int id = userAgentStringList().tqfindIndex(name);
   if ( id == -1 )
     return TQString::null;
   else
@@ -142,7 +142,7 @@ TQString FakeUASProvider::aliasStr( const TQString& name )
 
 TQString FakeUASProvider::agentStr( const TQString& name )
 {
-  int id = userAgentAliasList().findIndex(name);
+  int id = userAgentAliasList().tqfindIndex(name);
   if ( id == -1 )
     return TQString::null;
   else