Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


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

20 files changed, 268 insertions, 268 deletions

diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp
index b547f7e6b..e9bc75dc1 100644
--- a/kio/misc/kdesasl/kdesasl.cpp
+++ b/kio/misc/kdesasl/kdesasl.cpp
@@ -49,10 +49,10 @@ KDESasl::~KDESasl() {
 
 TQCString KDESasl::chooseMethod(const TQStrIList aMethods)
 {
-  if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
-  else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5";
-  else if (aMethods.contains("PLAIN")) mMethod = "PLAIN";
-  else if (aMethods.contains("LOGIN")) mMethod = "LOGIN";
+  if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5";
+  else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5";
+  else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN";
+  else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN";
   else mMethod = TQCString();
   return mMethod;
 }
diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp
index 096fc1f03..0dacc662f 100644
--- a/kio/misc/kfile/fileprops.cpp
+++ b/kio/misc/kfile/fileprops.cpp
@@ -267,16 +267,16 @@ static void printSupportedMimeTypes()
     if ( allMimeTypes.isEmpty() )
     {
         cout <<
-            i18n("No support for metadata extraction found.").local8Bit()
+            i18n("No support for metadata extraction found.").local8Bit().data()
              << endl;
         return;
     }
 
-    cout << i18n("Supported MimeTypes:").local8Bit() << endl;
+    cout << i18n("Supported MimeTypes:").local8Bit().data() << endl;
 
     TQStringList::ConstIterator it = allMimeTypes.begin();
     for ( ; it != allMimeTypes.end(); it++ )
-        cout << (*it).local8Bit() << endl;
+        cout << (*it).local8Bit().data() << endl;
 }
 
 // caller needs to delete the returned list!
@@ -304,8 +304,8 @@ static void printMimeTypes( const KCmdLineArgs *args )
     {
         KURL url = args->url( i );
         KMimeType::Ptr mt = KMimeType::findByURL( url );
-        cout << args->arg(i) << ": " << mt->comment().local8Bit() << " ("
-             << mt->name().local8Bit() << ")" << endl;
+        cout << args->arg(i) << ": " << mt->comment().local8Bit().data() << " ("
+             << mt->name().local8Bit().data() << ")" << endl;
     }
 }
 
@@ -313,7 +313,7 @@ static void printList( const TQStringList& list )
 {
     TQStringList::ConstIterator it = list.begin();
     for ( ; it != list.end(); ++it )
-        cout << (*it).local8Bit() << endl;
+        cout << (*it).local8Bit().data() << endl;
     cout << endl;
 }
 
@@ -330,7 +330,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
     {
         TQString file = props->fileName() + " ";
         TQString fileString = line.replace( 3, file.length(), file );
-        cout << TQFile::encodeName( fileString ) << endl;
+        cout << TQFile::encodeName( fileString ).data() << endl;
             
         if ( args->isSet( "listsupported" ) )
         {
@@ -349,7 +349,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
             TQStringList::ConstIterator git = groups.begin();
             for ( ; git != groups.end(); ++git )
             {
-                cout << "Group: " << (*git).local8Bit() << endl;
+                cout << "Group: " << (*git).local8Bit().data() << endl;
                 printList( props->availableKeys( *git ) );
             }
         }
@@ -363,7 +363,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList,
             TQString key = TQString::fromLocal8Bit( args->getOption("getValue"));
             TQStringList::ConstIterator git = props->groupsToUse().begin();
             for ( ; git != props->groupsToUse().end(); ++git )
-                cout << props->getValue( *git, key ).local8Bit() << endl;
+                cout << props->getValue( *git, key ).local8Bit().data() << endl;
         }
 
         if ( args->isSet( "setValue" ) )
@@ -464,7 +464,7 @@ int main( int argc, char **argv )
             if ( !quiet )
             {
                 cerr << args->arg(i) << ": " <<
-                i18n("Cannot determine metadata").local8Bit() << endl;
+                i18n("Cannot determine metadata").local8Bit().data() << endl;
             }
             delete props;
         }
diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp
index b6683ac34..bb4fab88b 100644
--- a/kio/misc/kntlm/des.cpp
+++ b/kio/misc/kntlm/des.cpp
@@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou
 static void perminit_ip (DES_KEY * key);
 static void spinit (DES_KEY * key);
 static void perminit_fp (DES_KEY * key);
-static Q_UINT32 f (DES_KEY * key,  Q_UINT32 r,  char *subkey);
+static TQ_UINT32 f (DES_KEY * key,  TQ_UINT32 r,  char *subkey);
 
 
 /* Tables defined in the Data Encryption Standard documents */
@@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/)
 static void
 ntlm_des_encrypt (DES_KEY * key, unsigned char *block)
 {
-  Q_UINT32 left, right;
+  TQ_UINT32 left, right;
   char *knp;
-  Q_UINT32 work[2];		/* Working data storage */
+  TQ_UINT32 work[2];		/* Working data storage */
 
   permute_ip (block, key, (unsigned char *) work);	/* Initial Permutation */
   left = KFromToBigEndian(work[0]);
@@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock)
 }
 
 /* The nonlinear function f(r,k), the heart of DES */
-static Q_UINT32
-f (DES_KEY * key,  Q_UINT32 r,  char *subkey)
+static TQ_UINT32
+f (DES_KEY * key,  TQ_UINT32 r,  char *subkey)
 {
-   Q_UINT32 *spp;
-   Q_UINT32 rval, rt;
+   TQ_UINT32 *spp;
+   TQ_UINT32 rval, rt;
    int er;
 
 #ifdef	TRACE
@@ -377,7 +377,7 @@ f (DES_KEY * key,  Q_UINT32 r,  char *subkey)
   spp = &key->sp[7][0];
   rval = spp[(er ^ *subkey--) & 0x3f];
   spp -= 64;
-  rt = (Q_UINT32) r >> 3;
+  rt = (TQ_UINT32) r >> 3;
   rval |= spp[((int) rt ^ *subkey--) & 0x3f];
   spp -= 64;
   rt >>= 4;
@@ -457,7 +457,7 @@ spinit (DES_KEY * key)
 {
   char pbox[32];
   int p, i, s, j, rowcol;
-  Q_UINT32 val;
+  TQ_UINT32 val;
 
   /* Compute pbox, the inverse of p32i.
    * This is easier to work with
diff --git a/kio/misc/kntlm/des.h b/kio/misc/kntlm/des.h
index 1cb2f27e5..0f6f59dc9 100644
--- a/kio/misc/kntlm/des.h
+++ b/kio/misc/kntlm/des.h
@@ -6,7 +6,7 @@
 typedef struct des_key
 {
   char kn[16][8];
-  Q_UINT32 sp[8][64];
+  TQ_UINT32 sp[8][64];
   char iperm[16][16][8];
   char fperm[16][16][8];
 } DES_KEY;
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index a3eca3bdd..db2b45b6c 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -32,12 +32,12 @@
 #include "des.h"
 #include "kntlm.h"
 
-TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode )
+TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode )
 {
   //watch for buffer overflows
-  Q_UINT32 offset;
-  Q_UINT16 len;
-  offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
+  TQ_UINT32 offset;
+  TQ_UINT16 len;
+  offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
   len = KFromToLittleEndian(secbuf.len);
   if ( offset > buf.size() ||
        offset + len > buf.size() ) return TQString::null;
@@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un
   TQString str;
   const char *c = buf.data() + offset;
   
-  if ( unicode ) {
+  if ( tqunicode ) {
     str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
   } else {
-    str = TQString::fromLatin1( c, len );
+    str = TQString::tqfromLatin1( c, len );
   }
   return str;
 }
@@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un
 TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
 {
   TQByteArray ret;
-  Q_UINT32 offset;
-  Q_UINT16 len;
-  offset = KFromToLittleEndian((Q_UINT32)secbuf.offset);
+  TQ_UINT32 offset;
+  TQ_UINT16 len;
+  offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset);
   len = KFromToLittleEndian(secbuf.len);
   //watch for buffer overflows
   if ( offset > buf.size() ||
@@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf )
   return ret;
 }
 
-void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode )
+void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode )
 {
   TQByteArray tmp;
 
-  if ( unicode ) {
+  if ( tqunicode ) {
     tmp = QString2UnicodeLE( str );
     addBuf( buf, secbuf, tmp );
   } else {
@@ -85,26 +85,26 @@ void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bo
 
 void KNTLM::addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data )
 {
-  Q_UINT32 offset;
-  Q_UINT16 len, maxlen;
+  TQ_UINT32 offset;
+  TQ_UINT16 len, maxlen;
   offset = (buf.size() + 1) & 0xfffffffe;
   len = data.size();
   maxlen = data.size();
   
-  secbuf.offset = KFromToLittleEndian((Q_UINT32)offset);
+  secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset);
   secbuf.len = KFromToLittleEndian(len);
   secbuf.maxlen = KFromToLittleEndian(maxlen);
   buf.resize( offset + len );
   memcpy( buf.data() + offset, data.data(), data.size() );
 }
 
-bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags )
+bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, TQ_UINT32 flags )
 {
   TQByteArray rbuf( sizeof(Negotiate) );
   
   rbuf.fill( 0 );
   memcpy( rbuf.data(), "NTLMSSP", 8 );
-  ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)1 );
+  ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 );
   if ( !domain.isEmpty() ) {
     flags |= Negotiate_Domain_Supplied;
     addString( rbuf, ((Negotiate*) rbuf.data())->domain, domain );
@@ -126,21 +126,21 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
   Challenge *ch = (Challenge *) challenge.data();
   TQByteArray response;
   uint chsize = challenge.size();
-  bool unicode = false;
+  bool tqunicode = false;
   TQString dom;
 
   //challenge structure too small
   if ( chsize < 32 ) return false;
 
-  unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
+  tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode;
   if ( domain.isEmpty() )
-    dom = getString( challenge, ch->targetName, unicode );
+    dom = getString( challenge, ch->targetName, tqunicode );
   else
     dom = domain;
     
   rbuf.fill( 0 );
   memcpy( rbuf.data(), "NTLMSSP", 8 );
-  ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)3 );
+  ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 );
   ((Auth*) rbuf.data())->flags = ch->flags;
   TQByteArray targetInfo = getBuf( challenge, ch->targetInfo );
 
@@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt
     addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response );
 //  }
   if ( !dom.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode );
-  addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode );
+    addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode );
+  addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode );
   if ( !workstation.isEmpty() )
-    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode );
+    addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode );
 
   auth = rbuf;
 
@@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha
 TQByteArray KNTLM::ntlmHash( const TQString &password )
 {
   KMD4::Digest digest;
-  TQByteArray ret, unicode;
-  unicode = QString2UnicodeLE( password );
+  TQByteArray ret, tqunicode;
+  tqunicode = QString2UnicodeLE( password );
 
-  KMD4 md4( unicode );
+  KMD4 md4( tqunicode );
   md4.rawDigest( digest );
   ret.duplicate( (const char*) digest, sizeof( digest ) );
   return ret;
@@ -298,10 +298,10 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
   blob.fill( 0 );
   
   Blob *bl = (Blob *) blob.data();
-  bl->signature = KFromToBigEndian( (Q_UINT32) 0x01010000 );
-  Q_UINT64 now = TQDateTime::currentDateTime().toTime_t();
-  now += (Q_UINT64)3600*(Q_UINT64)24*(Q_UINT64)134774;
-  now *= (Q_UINT64)10000000;
+  bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 );
+  TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t();
+  now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774;
+  now *= (TQ_UINT64)10000000;
   bl->timestamp = KFromToLittleEndian( now );
   for ( uint i = 0; i<8; i++ ) {
     bl->challenge[i] = KApplication::random() % 0xff;
@@ -312,7 +312,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
 
 TQByteArray KNTLM::hmacMD5( const TQByteArray &data, const TQByteArray &key )
 {
-  Q_UINT8 ipad[64], opad[64];
+  TQ_UINT8 ipad[64], opad[64];
   KMD5::Digest digest;
   TQByteArray ret;
   
@@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks )
 
 TQByteArray KNTLM::QString2UnicodeLE( const TQString &target )
 {
-  TQByteArray unicode( target.length() * 2 );
+  TQByteArray tqunicode( target.length() * 2 );
   for ( uint i = 0; i < target.length(); i++ ) {
-    ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() );
+    ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() );
   }
-  return unicode;
+  return tqunicode;
 }
 
 TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len )
 {
   TQString ret;
   for ( uint i = 0; i < len; i++ ) {
-    ret += KFromToLittleEndian( data[ i ].unicode() );
+    ret += KFromToLittleEndian( data[ i ].tqunicode() );
   }
   return ret;
 }
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 9be4ea357..8a89001ab 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -70,9 +70,9 @@ public:
 
   typedef struct
   {
-    Q_UINT16 len;
-    Q_UINT16 maxlen;
-    Q_UINT32 offset;
+    TQ_UINT16 len;
+    TQ_UINT16 maxlen;
+    TQ_UINT32 offset;
   } SecBuf;
 
   /**
@@ -81,8 +81,8 @@ public:
   typedef struct
   {
     char signature[8]; /* "NTLMSSP\0" */
-    Q_UINT32 msgType; /* 1 */
-    Q_UINT32 flags;
+    TQ_UINT32 msgType; /* 1 */
+    TQ_UINT32 flags;
     SecBuf domain;
     SecBuf workstation;
   } Negotiate;
@@ -93,11 +93,11 @@ public:
   typedef struct
   {
     char signature[8];
-    Q_UINT32 msgType; /* 2 */
+    TQ_UINT32 msgType; /* 2 */
     SecBuf targetName;
-    Q_UINT32 flags;
-    Q_UINT8 challengeData[8];
-    Q_UINT32 context[2];
+    TQ_UINT32 flags;
+    TQ_UINT8 challengeData[8];
+    TQ_UINT32 context[2];
     SecBuf targetInfo;
   } Challenge;
 
@@ -107,23 +107,23 @@ public:
   typedef struct
   {
     char signature[8];
-    Q_UINT32 msgType; /* 3 */
+    TQ_UINT32 msgType; /* 3 */
     SecBuf lmResponse;
     SecBuf ntResponse;
     SecBuf domain;
     SecBuf user;
     SecBuf workstation;
     SecBuf sessionKey;
-    Q_UINT32 flags;
+    TQ_UINT32 flags;
   } Auth;
   
   typedef struct
   {
-    Q_UINT32 signature;
-    Q_UINT32 reserved;
-    Q_UINT64 timestamp;
-    Q_UINT8  challenge[8];
-    Q_UINT8  unknown[4];
+    TQ_UINT32 signature;
+    TQ_UINT32 reserved;
+    TQ_UINT64 timestamp;
+    TQ_UINT8  challenge[8];
+    TQ_UINT8  unknown[4];
     //Target info block - variable length
   } Blob;
 
@@ -139,7 +139,7 @@ public:
    */
   static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null, 
     const TQString &workstation = TQString::null,
-    Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
+    TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );
   /**
    * Creates the type 3 message which should be sent to the server after 
    * the challenge (type 2) received.
@@ -212,7 +212,7 @@ public:
   /**
    * Extracts a string field from an NTLM structure.
    */
-  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode );
+  static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode );
   /**
    * Extracts a byte array from an NTLM structure.
    */
@@ -226,7 +226,7 @@ private:
   static TQString UnicodeLE2TQString( const TQChar* data, uint len );
 
   static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data );
-  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false );
+  static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false );
   static void convertKey( unsigned char *key_56, void* ks );
 };
 
diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/kntlm/kswap.h
index 336321fd4..9eca243de 100644
--- a/kio/misc/kntlm/kswap.h
+++ b/kio/misc/kntlm/kswap.h
@@ -47,52 +47,52 @@
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 
-  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return bswap_16( b ); }
-  inline Q_INT16 KSWAP_16( Q_INT16 b ) { return bswap_16( (Q_UINT16)b ); }
-  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return bswap_32( b ); }
-  inline Q_INT32 KSWAP_32( Q_INT32 b ) { return bswap_32( (Q_UINT32)b ); }
-  inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { return bswap_64( b ); }
-  inline Q_INT64 KSWAP_64( Q_INT64 b ) { return bswap_64( (Q_UINT64)b ); }
+  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return bswap_16( b ); }
+  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return bswap_16( (TQ_UINT16)b ); }
+  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return bswap_32( b ); }
+  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return bswap_32( (TQ_UINT32)b ); }
+  inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { return bswap_64( b ); }
+  inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { return bswap_64( (TQ_UINT64)b ); }
 
 #else /* HAVE_BYTESWAP_H */
 #ifdef WORDS_BIGENDIAN
-  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) 
+  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) 
   { 
     return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8); 
   }
 
-  inline Q_INT16 KSWAP_16( Q_INT16 b ) 
+  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) 
   { 
-    return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8); 
+    return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8); 
   }
 
-  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) 
+  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) 
   {
     return
       ((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >>  8) | \
        (((b) & 0x0000ff00) <<  8) | (((b) & 0x000000ff) << 24)); 
   }
 
-  inline Q_INT32 KSWAP_32( Q_INT32 b ) 
+  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) 
   {
     return 
-      (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >>  8) | \
-       ((((Q_UINT32)b) & 0x0000ff00) <<  8) | ((((Q_UINT32)b) & 0x000000ff) << 24)); 
+      (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >>  8) | \
+       ((((TQ_UINT32)b) & 0x0000ff00) <<  8) | ((((TQ_UINT32)b) & 0x000000ff) << 24)); 
   }
 #else /* WORDS_BIGENDIAN */
 #include <sys/types.h>
 #include <netinet/in.h>
 
-  inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return htons(b); }
-  inline Q_INT16 KSWAP_16( Q_INT16 b ) { return htons((Q_UINT16)b); }
-  inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return htonl(b); }
-  inline Q_INT32 KSWAP_32( Q_INT32 b ) { return htonl((Q_UINT32)b); }
+  inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return htons(b); }
+  inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return htons((TQ_UINT16)b); }
+  inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return htonl(b); }
+  inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return htonl((TQ_UINT32)b); }
 #endif
-  inline Q_UINT64 KSWAP_64( Q_UINT64 b ) 
+  inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) 
   {
     union { 
-        Q_UINT64 ll;
-        Q_UINT32 l[2]; 
+        TQ_UINT64 ll;
+        TQ_UINT32 l[2]; 
     } w, r;
     w.ll = b;
     r.l[0] = KSWAP_32( w.l[1] );
@@ -100,13 +100,13 @@
     return r.ll;
   }
 
-  inline Q_INT64 KSWAP_64( Q_INT64 b ) 
+  inline TQ_INT64 KSWAP_64( TQ_INT64 b ) 
   {
     union { 
-        Q_UINT64 ll;
-        Q_UINT32 l[2]; 
+        TQ_UINT64 ll;
+        TQ_UINT32 l[2]; 
     } w, r;
-    w.ll = (Q_UINT64) b;
+    w.ll = (TQ_UINT64) b;
     r.l[0] = KSWAP_32( w.l[1] );
     r.l[1] = KSWAP_32( w.l[0] );
     return r.ll;
@@ -117,7 +117,7 @@
  * \ingroup KSWAP
  * Converts a 16 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline Q_UINT16 KFromToBigEndian( Q_UINT16 b )
+inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -130,7 +130,7 @@ inline Q_UINT16 KFromToBigEndian( Q_UINT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
+inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -143,7 +143,7 @@ inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline Q_UINT32 KFromToBigEndian( Q_UINT32 b )
+inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -156,7 +156,7 @@ inline Q_UINT32 KFromToBigEndian( Q_UINT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
+inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -169,7 +169,7 @@ inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order.
  */
-inline Q_UINT64 KFromToBigEndian( Q_UINT64 b )
+inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -182,7 +182,7 @@ inline Q_UINT64 KFromToBigEndian( Q_UINT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
+inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -195,7 +195,7 @@ inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline Q_INT16 KFromToBigEndian( Q_INT16 b )
+inline TQ_INT16 KFromToBigEndian( TQ_INT16 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -208,7 +208,7 @@ inline Q_INT16 KFromToBigEndian( Q_INT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len )
+inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -221,7 +221,7 @@ inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline Q_INT32 KFromToBigEndian( Q_INT32 b )
+inline TQ_INT32 KFromToBigEndian( TQ_INT32 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -234,7 +234,7 @@ inline Q_INT32 KFromToBigEndian( Q_INT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len )
+inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -247,7 +247,7 @@ inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit signed value from/to big-endian byte order to/from the machine order.
  */
-inline Q_INT64 KFromToBigEndian( Q_INT64 b )
+inline TQ_INT64 KFromToBigEndian( TQ_INT64 b )
 {
 #ifdef WORDS_BIGENDIAN
   return b;
@@ -260,7 +260,7 @@ inline Q_INT64 KFromToBigEndian( Q_INT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit signed array from/to big-endian byte order to/from the machine order.
  */
-inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len )
+inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
 {
 #ifdef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -273,7 +273,7 @@ inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b )
+inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -286,7 +286,7 @@ inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
+inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -299,7 +299,7 @@ inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b )
+inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -312,7 +312,7 @@ inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
+inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -325,7 +325,7 @@ inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order.
  */
-inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b )
+inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -338,7 +338,7 @@ inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
+inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
@@ -351,7 +351,7 @@ inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len )
  * \ingroup KSWAP
  * Converts a 16 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline Q_INT16 KFromToLittleEndian( Q_INT16 b )
+inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -364,7 +364,7 @@ inline Q_INT16 KFromToLittleEndian( Q_INT16 b )
  * \ingroup KSWAP
  * Converts a 16 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len )
+inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<1 ) ;
@@ -377,7 +377,7 @@ inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len )
  * \ingroup KSWAP
  * Converts a 32 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline Q_INT32 KFromToLittleEndian( Q_INT32 b )
+inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -390,7 +390,7 @@ inline Q_INT32 KFromToLittleEndian( Q_INT32 b )
  * \ingroup KSWAP
  * Converts a 32 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len )
+inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<2 ) ;
@@ -403,7 +403,7 @@ inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len )
  * \ingroup KSWAP
  * Converts a 64 bit signed value from/to little-endian byte order to/from the machine order.
  */
-inline Q_INT64 KFromToLittleEndian( Q_INT64 b )
+inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b )
 {
 #ifndef WORDS_BIGENDIAN
   return b;
@@ -416,7 +416,7 @@ inline Q_INT64 KFromToLittleEndian( Q_INT64 b )
  * \ingroup KSWAP
  * Converts a 64 bit signed array from/to little-endian byte order to/from the machine order.
  */
-inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len )
+inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len )
 {
 #ifndef WORDS_BIGENDIAN
   if ( out != in ) memcpy( out, in, len<<3 ) ;
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 7a84958f7..671c2a941 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -126,7 +126,7 @@ namespace KPAC
             return;
         }
 
-        int dot = m_hostname.find( '.' );
+        int dot = m_hostname.tqfind( '.' );
         if ( dot >= 0 )
         {
             m_hostname.remove( 0, dot + 1 ); // remove one domain level
diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h
index 05d8569cc..82418882f 100644
--- a/kio/misc/kpac/downloader.h
+++ b/kio/misc/kpac/downloader.h
@@ -29,7 +29,7 @@ namespace KIO { class Job; }
 
 namespace KPAC
 {
-    class Downloader : public QObject
+    class Downloader : public TQObject
     {
         Q_OBJECT
     public:
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index 6cba79db6..f843dc045 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -162,9 +162,9 @@ namespace KPAC
                     // this particular case, simply calling setProtocol() on
                     // it trashes the whole URL.
                     int len = proxyURL.protocol().length();
-                    if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len )
+                    if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len )
                         proxy.prepend("http://");
-                    BlackList::Iterator it = m_blackList.find( proxy );
+                    BlackList::Iterator it = m_blackList.tqfind( proxy );
                     if ( it == m_blackList.end() ) return proxy;
                     else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes
                     {
diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp
index 55faef8a1..243f5f9c2 100644
--- a/kio/misc/kpac/script.cpp
+++ b/kio/misc/kpac/script.cpp
@@ -49,7 +49,7 @@ TQString UString::qstring() const
 UString::UString( const TQString &s )
 {
     UChar* data = new UChar[ s.length() ];
-    std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) );
+    std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) );
     rep = Rep::create( data, s.length() );
 }
 
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index d84e4c297..b80a23d1b 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -101,11 +101,11 @@ int main(int argc, char **argv) {
     if (!fromaddr.isEmpty()) {
         TQString name = emailConfig.getSetting(KEMailSettings::RealName);
         if (!name.isEmpty())
-            fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
+            fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
     } else {
         struct passwd *p;
         p = getpwuid(getuid());
-        fromaddr = TQString::fromLatin1(p->pw_name);
+        fromaddr = TQString::tqfromLatin1(p->pw_name);
         fromaddr += "@";
         char buffer[256];
 	buffer[0] = '\0';
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
 
     TQString  server = emailConfig.getSetting(KEMailSettings::OutServer);
     if (server.isEmpty())
-        server=TQString::fromLatin1("bugs.kde.org");
+        server=TQString::tqfromLatin1("bugs.kde.org");
 
     SMTP *sm = new SMTP;
     BugMailer bm(sm);
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
     sm->setSenderAddress(fromaddr);
     sm->setRecipientAddress(recipient);
     sm->setMessageSubject(subject);
-    sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient));
+    sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data()));
     sm->setMessageBody(text);
     sm->sendMessage();
 
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 36a417b88..ac3e7b74f 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout)
 void SMTP::setSenderAddress(const TQString& sender)
 {
     senderAddress = sender;
-    int index = senderAddress.find('<');
+    int index = senderAddress.tqfind('<');
     if (index == -1)
         return;
     senderAddress = senderAddress.mid(index + 1);
-    index =  senderAddress.find('>');
+    index =  senderAddress.tqfind('>');
     if (index != -1)
         senderAddress = senderAddress.left(index);
     senderAddress = senderAddress.simplifyWhiteSpace();
     while (1) {
-        index =  senderAddress.find(' ');
+        index =  senderAddress.tqfind(' ');
         if (index != -1)
             senderAddress = senderAddress.mid(index + 1); // take one side
         else
             break;
     }
-    index = senderAddress.find('@');
+    index = senderAddress.tqfind('@');
     if (index == -1)
         senderAddress.append("@localhost"); // won't go through without a local mail system
 
@@ -134,7 +134,7 @@ void SMTP::sendMessage(void)
         kdDebug() << "state was == FINISHED\n" << endl;
         finished = false;
         state = IN;
-        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
         write(sock->socket(), writeString.ascii(), writeString.length());
     }
     if(connected){
@@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket)
 
     readBuffer[n] = '\0';
     lineBuffer += readBuffer;
-    nl = lineBuffer.find('\n');
+    nl = lineBuffer.tqfind('\n');
     if(nl == -1)
         return;
     lastLine = lineBuffer.left(nl);
@@ -249,7 +249,7 @@ void SMTP::processLine(TQString *line)
     int i, stat;
     TQString tmpstr;
 
-    i = line->find(' ');
+    i = line->tqfind(' ');
     tmpstr = line->left(i);
     if(i > 3)
         kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl;
@@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line)
     switch(stat){
     case GREET:     //220
         state = IN;
-        writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
+        writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
         kdDebug() << "out: " << writeString << endl;
 	write(sock->socket(), writeString.ascii(), writeString.length());
         break;
@@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line)
         switch(state){
         case IN:
             state = READY;
-            writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress);
+            writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress);
             kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case READY:
             state = SENTFROM;
-            writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
+            writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
         case SENTFROM:
             state = SENTTO;
-            writeString = TQString::fromLatin1("data\r\n");
+            writeString = TQString::tqfromLatin1("data\r\n");
              kdDebug() << "out: " << writeString << endl;
             write(sock->socket(), writeString.ascii(), writeString.length());
             break;
@@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line)
         break;
     case READYDATA: //354
         state = DATA;
-        writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject);
+        writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject);
         writeString += messageHeader;
         writeString += "\r\n";
         writeString += messageBody;
-        writeString += TQString::fromLatin1(".\r\n");
+        writeString += TQString::tqfromLatin1(".\r\n");
         kdDebug() << "out: " << writeString;
         write(sock->socket(), writeString.ascii(), writeString.length());
         break;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 9e8b85574..1a7cc1edf 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) {
 		cfg->setGroup(*i);
 
 		// remove it if it has expired
-		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) {
+		if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -164,7 +164,7 @@ KSSLCNode *node;
 
 	for (node = certList.first(); node; node = certList.next()) {
 		if (node->permanent ||
-			node->expires > TQDateTime::currentDateTime()) {
+			node->expires > TQDateTime::tqcurrentDateTime()) {
 			// First convert to a binary format and then write the
 			// kconfig entry write the (CN, policy, cert) to
 			// KSimpleConfig
@@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList();
 		// remove it if it has expired
 		if (!cfg->readBoolEntry("Permanent") &&
 			cfg->readDateTimeEntry("Expires") <
-				TQDateTime::currentDateTime()) {
+				TQDateTime::tqcurrentDateTime()) {
 			cfg->deleteGroup(*i);
 			continue;
 		}
@@ -278,9 +278,9 @@ KSSLCNode *node;
 			node->permanent = permanent;
 
 			if (!permanent) {
-				node->expires = TQDateTime::currentDateTime();
+				node->expires = TQDateTime::tqcurrentDateTime();
 				// FIXME: make this configurable
-				node->expires = node->expires.addSecs(3600);
+				node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(3600));
 			}
 
 			cacheSaveToDisk();
@@ -297,8 +297,8 @@ KSSLCNode *node;
 	certList.prepend(n); 
 
 	if (!permanent) {
-		n->expires = TQDateTime::currentDateTime();
-		n->expires = n->expires.addSecs(3600);
+		n->expires = TQDateTime::tqcurrentDateTime();
+		n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(3600));
 	}
 
 	searchAddCert(n->cert);
@@ -312,7 +312,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::currentDateTime()) {
+				node->expires < TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -338,7 +338,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {  
 			if (!node->permanent &&
-				node->expires < TQDateTime::currentDateTime()) {
+				node->expires < TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -362,7 +362,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::currentDateTime()) {
+				node->expires < TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -386,7 +386,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent &&
-				node->expires < TQDateTime::currentDateTime()) {
+				node->expires < TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -410,7 +410,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-					TQDateTime::currentDateTime()) {
+					TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				delete node;
@@ -535,7 +535,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       TQDateTime::currentDateTime()) {
+				       TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -563,7 +563,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::currentDateTime()) {
+				       	TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -572,7 +572,7 @@ KSSLCNode *node;
 				return false;
 			}
 
-			if (!node->hosts.contains(host)) {
+			if (!node->hosts.tqcontains(host)) {
 				node->hosts << host;
 			}
 
@@ -593,7 +593,7 @@ KSSLCNode *node;
 	for (node = certList.first(); node; node = certList.next()) {
 		if (cert == *(node->cert)) {
 			if (!node->permanent && node->expires <
-				       	TQDateTime::currentDateTime()) {
+				       	TQDateTime::tqcurrentDateTime()) {
 				certList.remove(node);
 				cfg->deleteGroup(node->cert->getMD5Digest());
 				searchRemoveCert(node->cert);
@@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() {
 		return;
 	
 	cfg->setGroup(TQString::null);
-	Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
-	Q_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
+	TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true);
+	TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp");
 	if (oldStamp != newStamp)
 	{
 		caRegenerate();
@@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) {
 	cert->getEmails(mails);
 	for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
 		TQString email = static_cast<const TQString &>(*iter).lower();
-		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email);
+		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email);
 
 		if (it == skEmail.end())
 			it = skEmail.insert(email, TQPtrVector<KSSLCertificate>());
 
 		TQPtrVector<KSSLCertificate> &elem = *it;
 		
-		if (elem.findRef(cert) == -1) {
+		if (elem.tqfindRef(cert) == -1) {
 			unsigned int n = 0;
 			for(; n < elem.size(); n++) {
 				if (!elem.at(n)) {
@@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
 	TQStringList mails;
 	cert->getEmails(mails);
 	for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) {
-		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower());
+		TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower());
 
 		if (it == skEmail.end())
 		       break;
 
 		TQPtrVector<KSSLCertificate> &elem = *it;
 
-		int n = elem.findRef(cert);
+		int n = elem.tqfindRef(cert);
 		if (n != -1)
 			elem.remove(n);
 	}
@@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) {
 
 TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
 	TQStringList rc;
-	TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower());
+	TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower());
 
 	kdDebug() << "GETKDEKey " << email.latin1() << endl;
 
@@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) {
 
 
 KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) {
-	TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key);
+	TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key);
 	
 	kdDebug() << "Searching cert for " << key.latin1() << endl;
 
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui
index ecf2d236f..60b75da28 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KBetterThanKDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KBetterThanKDialogBase</cstring>
     </property>
@@ -37,14 +37,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_allowOnce</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_allowAlways</cstring>
                     </property>
@@ -71,7 +71,7 @@
                         <string>Allow &amp;Always</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_deny</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <string>&amp;Deny</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>_denyForever</cstring>
                     </property>
@@ -99,7 +99,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>21</height>
@@ -140,13 +140,13 @@
     <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="private">clicked()</slot>
-    <slot>setLabel( const QString &amp; label )</slot>
+    <slot>setLabel( const TQString &amp; label )</slot>
     <slot access="private">init()</slot>
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp
index c431ecf69..d4c87bd28 100644
--- a/kio/misc/kwalletd/ktimeout.cpp
+++ b/kio/misc/kwalletd/ktimeout.cpp
@@ -39,7 +39,7 @@ void KTimeout::clear() {
 
 
 void KTimeout::removeTimer(int id) {
-	TQTimer *t = _timers.find(id);
+	TQTimer *t = _timers.tqfind(id);
 	if (t != 0L) {
 		_timers.remove(id); // autodeletes
 	}
@@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) {
 
 
 void KTimeout::addTimer(int id, int timeout) {
-	if (_timers.find(id) != 0L) {
+	if (_timers.tqfind(id) != 0L) {
 		return;
 	}
 
@@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) {
 
 
 void KTimeout::resetTimer(int id, int timeout) {
-	TQTimer *t = _timers.find(id);
+	TQTimer *t = _timers.tqfind(id);
 	if (t) {
 		t->changeInterval(timeout);
 	}
diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp
index 069575710..2cd8cd406 100644
--- a/kio/misc/kwalletd/kwalletd.cpp
+++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -121,7 +121,7 @@ int KWalletD::generateHandle() {
 	// ASSUMPTION: RAND_MAX is fairly large.
 	do {
 		rc = rand();
-	} while (_wallets.find(rc) || rc == 0);
+	} while (_wallets.tqfind(rc) || rc == 0);
 
 	return rc;
 }
@@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() {
 }
 
 int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) {
-	if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) {
+	if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) {
 		// First use wizard
 		KWalletWizard *wiz = new KWalletWizard(0);
 		setupDialog( wiz, wId, appid, modal );
@@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool
 			KApplication::startServiceByDesktopName("kwalletmanager-kwalletd");
 		}
 	} else {
-		if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
+		if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) {
 			return -1;
 		}
 		_handles[appid].append(rc);
-		_wallets.find(rc)->ref();
+		_wallets.tqfind(rc)->ref();
 	}
 
 	return rc;
@@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 			KConfig cfg("kwalletrc");
 			cfg.setGroup("Auto Allow");
 			TQStringList apps = cfg.readListEntry(wallet);
-			if (!apps.contains(thisApp)) {
+			if (!apps.tqcontains(thisApp)) {
 				apps += thisApp;
 				_implicitAllowMap[wallet] += thisApp;
 				cfg.writeEntry(wallet, apps);
@@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W
 		KConfig cfg("kwalletrc");
 		cfg.setGroup("Auto Deny");
 		TQStringList apps = cfg.readListEntry(wallet);
-		if (!apps.contains(thisApp)) {
+		if (!apps.tqcontains(thisApp)) {
 			apps += thisApp;
 			_implicitDenyMap[wallet] += thisApp;
 			cfg.writeEntry(wallet, apps);
@@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin
 			return;
 		}
 
-		w = _wallets.find(handle);
+		w = _wallets.tqfind(handle);
 		reclose = true;
 	} else {
 		handle = it.currentKey();
@@ -712,12 +712,12 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
 		const TQString& wallet = w->walletName();
 		assert(_passwords.contains(wallet));
 		if (w->refCount() == 0 || force) {
-			invalidateHandle(handle);
+			tqinvalidateHandle(handle);
 			if (_closeIdle && _timeouts) {
 				_timeouts->removeTimer(handle);
 			}
 			_wallets.remove(handle);
-			if (_passwords.contains(wallet)) {
+			if (_passwords.tqcontains(wallet)) {
 				w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length()));
 				_passwords[wallet].fill(0);
 				_passwords.remove(wallet);
@@ -735,14 +735,14 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) {
 
 int KWalletD::close(int handle, bool force) {
 	TQCString appid = friendlyDCOPPeerName();
-	KWallet::Backend *w = _wallets.find(handle);
+	KWallet::Backend *w = _wallets.tqfind(handle);
 	bool contains = false;
 
 	if (w) { // the handle is valid
-		if (_handles.contains(appid)) { // we know this app
-			if (_handles[appid].contains(handle)) {
+		if (_handles.tqcontains(appid)) { // we know this app
+			if (_handles[appid].tqcontains(handle)) {
 				// the app owns this handle
-				_handles[appid].remove(_handles[appid].find(handle));
+				_handles[appid].remove(_handles[appid].tqfind(handle));
 				contains = true;
 				if (_handles[appid].isEmpty()) {
 					_handles.remove(appid);
@@ -757,9 +757,9 @@ int KWalletD::close(int handle, bool force) {
 			}
 			_wallets.remove(handle);
 			if (force) {
-				invalidateHandle(handle);
+				tqinvalidateHandle(handle);
 			}
-			if (_passwords.contains(w->walletName())) {
+			if (_passwords.tqcontains(w->walletName())) {
 				w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length()));
 				_passwords[w->walletName()].fill(0);
 				_passwords.remove(w->walletName());
@@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) {
 		return false;
 	}
 
-	KWallet::Backend *rc = _wallets.find(handle);
+	KWallet::Backend *rc = _wallets.tqfind(handle);
 
 	if (rc == 0 && ++_failed > 5) {
 		_failed = 0;
@@ -812,8 +812,8 @@ TQStringList KWalletD::wallets() const {
 
 	dir.setFilter(TQDir::Files | TQDir::NoSymLinks);
 
-	const QFileInfoList *list = dir.entryInfoList();
-	QFileInfoListIterator it(*list);
+	const TQFileInfoList *list = dir.entryInfoList();
+	TQFileInfoListIterator it(*list);
 	TQFileInfo *fi;
 	while ((fi = it.current()) != 0L) {
 		TQString fn = fi->fileName();
@@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke
 
 
 void KWalletD::slotAppUnregistered(const TQCString& app) {
-	if (_handles.contains(app)) {
+	if (_handles.tqcontains(app)) {
 		TQValueList<int> l = _handles[app];
 		for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) {
 			_handles[app].remove(*i);
-			KWallet::Backend *w = _wallets.find(*i);
+			KWallet::Backend *w = _wallets.tqfind(*i);
 			if (w && !_leaveOpen && 0 == w->deref()) {
 				close(w->walletName(), true);
 			}
@@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) {
 }
 
 
-void KWalletD::invalidateHandle(int handle) {
+void KWalletD::tqinvalidateHandle(int handle) {
 	for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin();
 							i != _handles.end();
 									++i) {
@@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) {
 		return 0L;
 	}
 
-	KWallet::Backend *w = _wallets.find(handle);
+	KWallet::Backend *w = _wallets.tqfind(handle);
 
 	if (w) { // the handle is valid
-		if (_handles.contains(appid)) { // we know this app
-			if (_handles[appid].contains(handle)) {
+		if (_handles.tqcontains(appid)) { // we know this app
+			if (_handles[appid].tqcontains(handle)) {
 				// the app owns this handle
 				_failed = 0;
 				if (_closeIdle && _timeouts) {
@@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const {
 							++it) {
 		if (it.current()->walletName() == wallet) {
 			for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) {
-				if (hit.data().contains(it.currentKey())) {
+				if (hit.data().tqcontains(it.currentKey())) {
 					rc += hit.key();
 				}
 			}
@@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap
 						it.current();
 							++it) {
 		if (it.current()->walletName() == wallet) {
-			if (_handles[application].contains(it.currentKey())) {
+			if (_handles[application].tqcontains(it.currentKey())) {
 				_handles[application].remove(it.currentKey());
 
 				if (_handles[application].isEmpty()) {
@@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const {
 
 
 bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) {
-	if (!wallets().contains(wallet)) {
+	if (!wallets().tqcontains(wallet)) {
 		return true;
 	}
 
@@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder
 
 
 bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) {
-	if (!wallets().contains(wallet)) {
+	if (!wallets().tqcontains(wallet)) {
 		return true;
 	}
 
@@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c
 
 
 bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) {
-	return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app));
+	return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
 }
 
 
 bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) {
-	return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app));
+	return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app));
 }
 
 
@@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() {
 	if (!dc) {
 		return "";
 	}
-	return dc->senderId().replace(TQRegExp("-[0-9]+$"), "");
+	return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), "");
 }
 
 
 void KWalletD::timedOut(int id) {
-	KWallet::Backend *w = _wallets.find(id);
+	KWallet::Backend *w = _wallets.tqfind(id);
 	if (w) {
 		closeWallet(w, id, true);
 	}
diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h
index 2aea371ba..ba83b4efc 100644
--- a/kio/misc/kwalletd/kwalletd.h
+++ b/kio/misc/kwalletd/kwalletd.h
@@ -161,7 +161,7 @@ class KWalletD : public KDEDModule {
 		// Generate a new unique handle.
 		int generateHandle();
 		// Invalidate a handle (remove it from the TQMap)
-		void invalidateHandle(int handle);
+		void tqinvalidateHandle(int handle);
 		// Emit signals about closing wallets
 		void doCloseSignals(int,const TQString&);
 		void emitFolderUpdated(const TQString&, const TQString&);
diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui
index 609508e11..809993077 100644
--- a/kio/misc/kwalletd/kwalletwizard.ui
+++ b/kio/misc/kwalletd/kwalletwizard.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KWalletWizard</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>KWalletWizard</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>KDE Wallet Wizard</string>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>page1</cstring>
         </property>
@@ -36,14 +36,14 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>21</height>
                     </size>
                 </property>
             </spacer>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>textLabel1</cstring>
                 </property>
@@ -58,11 +58,11 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignCenter</set>
                 </property>
             </widget>
-            <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>textLabel2</cstring>
                 </property>
@@ -83,11 +83,11 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
-            <widget class="QButtonGroup" row="2" column="1">
+            <widget class="TQButtonGroup" row="2" column="1">
                 <property name="name">
                     <cstring>buttonGroup1</cstring>
                 </property>
@@ -104,7 +104,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="QRadioButton" row="0" column="0">
+                    <widget class="TQRadioButton" row="0" column="0">
                         <property name="name">
                             <cstring>_basic</cstring>
                         </property>
@@ -115,7 +115,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="1" column="0">
+                    <widget class="TQRadioButton" row="1" column="0">
                         <property name="name">
                             <cstring>_advanced</cstring>
                         </property>
@@ -135,7 +135,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>140</width>
                         <height>21</height>
@@ -152,7 +152,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>140</width>
                         <height>31</height>
@@ -161,7 +161,7 @@
             </spacer>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>page4</cstring>
         </property>
@@ -172,7 +172,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0">
+            <widget class="TQLabel" row="0" column="0">
                 <property name="name">
                     <cstring>textLabel2_3</cstring>
                 </property>
@@ -185,7 +185,7 @@
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>page2</cstring>
         </property>
@@ -196,7 +196,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>textLabel3</cstring>
                 </property>
@@ -207,7 +207,7 @@
                     <enum>RichText</enum>
                 </property>
             </widget>
-            <widget class="QLayoutWidget" row="3" column="1">
+            <widget class="TQLayoutWidget" row="3" column="1">
                 <property name="name">
                     <cstring>layout7</cstring>
                 </property>
@@ -215,7 +215,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>layout5</cstring>
                         </property>
@@ -223,7 +223,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel1_2</cstring>
                                 </property>
@@ -233,14 +233,14 @@
                                 <property name="text">
                                     <string>Enter a new password:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
                                     <cstring>_pass1</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>textLabel2_2</cstring>
                                 </property>
@@ -250,7 +250,7 @@
                                 <property name="text">
                                     <string>Verify password:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -259,7 +259,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>layout4</cstring>
                         </property>
@@ -267,7 +267,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>_pass1</cstring>
                                 </property>
@@ -278,7 +278,7 @@
                                     <enum>Password</enum>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>_pass2</cstring>
                                 </property>
@@ -293,7 +293,7 @@
                     </widget>
                 </hbox>
             </widget>
-            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>_useWallet</cstring>
                 </property>
@@ -311,7 +311,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>51</height>
@@ -328,7 +328,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>101</width>
                         <height>21</height>
@@ -345,7 +345,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>111</width>
                         <height>31</height>
@@ -362,27 +362,27 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>70</height>
                     </size>
                 </property>
             </spacer>
-            <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3">
+            <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3">
                 <property name="name">
                     <cstring>_matchLabel</cstring>
                 </property>
                 <property name="text">
                     <string></string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter|AlignRight</set>
                 </property>
             </widget>
         </grid>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>page3</cstring>
         </property>
@@ -393,7 +393,7 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>textLabel1_3</cstring>
                 </property>
@@ -403,7 +403,7 @@
                 <property name="textFormat">
                     <enum>RichText</enum>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -417,14 +417,14 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>121</height>
                     </size>
                 </property>
             </spacer>
-            <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+            <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
                 <property name="name">
                     <cstring>_networkWallet</cstring>
                 </property>
@@ -432,7 +432,7 @@
                     <string>Store network passwords and local passwords in separate wallet files</string>
                 </property>
             </widget>
-            <widget class="QCheckBox" row="2" column="0">
+            <widget class="TQCheckBox" row="2" column="0">
                 <property name="name">
                     <cstring>_closeIdle</cstring>
                 </property>
@@ -450,7 +450,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>21</width>
                         <height>51</height>
@@ -530,16 +530,16 @@
     <tabstop>_pass2</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">qcheckbox.h</include>
+    <include location="global" impldecl="in declaration">tqcheckbox.h</include>
     <include location="global" impldecl="in implementation">klocale.h</include>
     <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="private">passwordPageUpdate()</slot>
     <slot access="private">init()</slot>
     <slot>setAdvanced()</slot>
     <slot>setBasic()</slot>
     <slot access="private">destroy()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index b1d060f21..0524d60b3 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -99,7 +99,7 @@ class UIServerSystemTray:public KSystemTray
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("filesave"));
          //actionCollection()->action("file_quit")->setEnabled(true);
-         KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection());
+         KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
       }
 };
 
@@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) {
 
 void ProgressItem::setInfoMessage( const TQString & msg ) {
   TQString plainTextMsg(msg);
-  plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null );
-  plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null );
+  plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString() );
+  plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString() );
   setText( ListProgress::TB_PROGRESS, plainTextMsg );
 
   defaultProgress->slotInfoMessage( 0, msg );
@@ -596,10 +596,10 @@ UIServer::UIServer()
 
   // setup toolbar
   toolBar()->insertButton("editdelete", TOOL_CANCEL,
-                          TQT_SIGNAL(clicked()), this,
+                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
-                          TQT_SIGNAL(clicked()), this,
+                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
 
   toolBar()->setBarPos( KToolBar::Left );
@@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta,
 
       kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl;
       kid->setCertState(meta["ssl_cert_errors"]);
-      TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
+      TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"];
       kid->setup( x,
                   ip,
                   url, // the URL
@@ -1291,7 +1291,7 @@ TQByteArray UIServer::open_RenameDlg64( int id,
   kdDebug(7024) << "KIO::open_RenameDlg done" << endl;
   TQByteArray data;
   TQDataStream stream( data, IO_WriteOnly );
-  stream << Q_UINT8(result) << newDest;
+  stream << TQ_UINT8(result) << newDest;
   if ( item && result != KIO::R_CANCEL )
     setItemVisible( item, true );
   return data;