Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

43 files changed, 195 insertions, 195 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index e47909e28..f27dad3b6 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
         return TQVariant( data.defaults.boolean.value, int() );
     case ArgType_String:
       if ( isList() )
-        return TQStringList( TQString::fromLatin1( data.defaults.string ) );
+        return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
       else
-        return TQString::fromLatin1( data.defaults.string );
+        return TQString::tqfromLatin1( data.defaults.string );
     case ArgType_Int:
       if ( isList() )
         return TQValueList<TQVariant>() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
     case ArgType_Path:
     case ArgType_DirPath:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path );
       else
-        return TQString::fromLatin1( data.defaults.path );
+        return TQString::tqfromLatin1( data.defaults.path );
     case ArgType_URL:
     case ArgType_LDAPURL:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url );
       else
-        return TQString::fromLatin1( data.defaults.url );
+        return TQString::tqfromLatin1( data.defaults.url );
     }
   }
 
@@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na
 
 bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const {
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" );
   return false;
 }
 
 bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
   return false;
 }
 
@@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
   const TQFileInfo fi( KShell::tildeExpand( chiasmus ) );
   if ( !fi.isExecutable() ) {
     if ( reason )
-      *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus );
+      *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus );
     return false;
   }
 
@@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas
   if ( qstricmp( name, "Chiasmus" ) == 0 )
     return checkForChiasmus( reason );
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
   return 0;
 }
 
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index edfe9be52..9daaa620d 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap
   const TQString msg = ( mMode == Encrypt
                         ? i18n( "Encryption failed: %1" )
                         : i18n( "Decryption failed: %1" ) )
-    .arg( TQString::fromLocal8Bit( mError.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
   if ( !mStderr.isEmpty() ) {
-    const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
+    const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
     KMessageBox::detailedError( parent, msg, details, caption );
   } else {
     KMessageBox::error( parent, msg, caption );
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index 002bf0182..a57685f28 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
   if ( !mXiaLibrary ) {
     if ( reason )
       *reason = i18n( "Failed to load %1: %2" )
-                .arg( libfile,KLibLoader::self()->lastErrorMessage() );
+                .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
     kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
                   << "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl;
     return 0;
@@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
   if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) {
     if ( reason )
       *reason = i18n( "Failed to load %1: %2" )
-                .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
+                .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
     kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
                   << "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl;
     return 0;
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index 677fc6ec2..eccdf9219 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
     return;
   }
 
-  emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ),
+  emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ),
                  mIndex, mKeyPaths.size() );
 
   const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index ea3506b8a..ab413080c 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -36,7 +36,7 @@
 #include <kurl.h>
 
 #include <tqsocketnotifier.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqstringlist.h>
 
 #include <unistd.h>
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
   if ( d->useStatusFD ) {
     ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
     d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
-    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
+    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildtqStatus(int)) );
   }
   return KProcess::commSetupDoneP();
 }
@@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() {
   return KProcess::commSetupDoneC();
 }
 
-void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
-  if ( !childStatus(fd) )
-    closeStatus();
+void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) {
+  if ( !childtqStatus(fd) )
+    closetqStatus();
 }
 
-bool Kleo::GnuPGProcessBase::closeStatus() {
+bool Kleo::GnuPGProcessBase::closetqStatus() {
   if ( !d->useStatusFD )
     return false;
   d->useStatusFD = false;
@@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closeStatus() {
   return true;
 }
 
-int Kleo::GnuPGProcessBase::childStatus( int fd ) {
+int Kleo::GnuPGProcessBase::childtqStatus( int fd ) {
   char buf[1024];
   const int len = ::read( fd, buf, sizeof(buf)-1 );
   if ( len > 0 ) {
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index c012b3075..b6643144a 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -57,7 +57,7 @@ namespace Kleo {
     /*! reimplementation */
     bool start( RunMode runmode, Communication comm );
 
-    bool closeStatus();
+    bool closetqStatus();
 
   signals:
     void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args );
@@ -70,11 +70,11 @@ namespace Kleo {
     /*! reimplementation */
     int commSetupDoneC();
 
-    int childStatus( int fd );
+    int childtqStatus( int fd );
 
 
   private slots:
-    void slotChildStatus( int fd );
+    void slotChildtqStatus( int fd );
 
   private:
     void parseStatusOutput();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 27680585b..9594edfa2 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) {
   // error, check why:
   const GpgME::EngineInfo ei = GpgME::engineInfo( proto );
   if ( ei.isNull() )
-    *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+    *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
   else if ( ei.fileName() && !ei.version() )
-    *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) );
+    *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) );
   else if ( ei.fileName() && ei.version() && ei.requiredVersion() )
     *reason = i18n("Engine %1 version %2 installed, "
 		   "but at least version %3 is required.")
-      .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
+      .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
   else
-    *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+    *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
   return false;
 }
 
@@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason
   if ( qstricmp( name, SMIME ) == 0 )
     return check( GpgME::Context::CMS, reason );
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
   return false;
 }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 65ed93811..51f8f68c8 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -41,7 +41,7 @@
 #include <ktempfile.h>
 #include <tqfile.h>
 #include <stdlib.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // Just for the Q_ASSERT in the dtor. Not thread-safe, but who would
 // have 2 threads talking to gpgconf anyway? :)
@@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
   if ( showErrors && rc != 0 ) {
     TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
     if ( rc == -1 )
-        wmsg = wmsg.arg( i18n( "program not found" ) );
+        wmsg = wmsg.tqarg( i18n( "program not found" ) );
     else if ( rc == -2 )
-        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
+        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
     else
-        wmsg = wmsg.arg( strerror(rc) );
+        wmsg = wmsg.tqarg( strerror(rc) );
     kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp
     KMessageBox::error(0, wmsg);
   }
@@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
   }
   else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
   {
-    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
+    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
     kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
     KMessageBox::error(0, wmsg);
   }
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString();
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString();
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 61da793ed..e55f237dc 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
   TQString msg = previousWasBad ?
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) :
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" );
-  msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+  msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
   msg.prepend( "<qt>" );
   msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>";
   const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
   if ( !gpgAgent.isEmpty() ) {
     msg += i18n( "gpg-agent was found in %1, but does not appear to be running." )
-           .arg( gpgAgent );
+           .tqarg( gpgAgent );
   } else {
     msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
-           .arg( "1.9" )
-           .arg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
+           .tqarg( "1.9" )
+           .tqarg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
   }
   msg += "<br/>";
   msg += i18n( "For information on how to set up gpg-agent, see %1" )
-         .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
+         .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
   msg += "<br/><br/>";
   msg += i18n( "Enter passphrase:" );
   Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index c6370674b..d1d2591da 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( mResult.error().asString() ) );
+    .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) );
   KMessageBox::error( parent, msg, caption );
 }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index c2e21bb9b..de673faf1 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
   static Map map;
   for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
     assert( tokens[i].token );
-    const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
+    const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
     for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
       const Desc & desc = tokens[i].desc[j];
       assert( desc.display );
@@ -151,9 +151,9 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto
   const Desc & desc = it2->second;
   TQString result = i18n( desc.display );
   if ( desc.useCur )
-    result = result.arg( cur );
+    result = result.tqarg( cur );
   if ( desc.useTot )
-    result = result.arg( tot );
+    result = result.tqarg( tot );
   return result;
 }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 781e0513f..fdcdadbae 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index be4c9f796..f94957b3f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index 8f2fd20d2..e4875824c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 0c775a015..aae3fd222 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 77a914514..53865edf4 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status )
 // gpgme 0.3 version below, too!
 static
 void obtain_signature_information( gpgme_ctx_t ctx,
-                                   gpgme_sig_stat_t & overallStatus,
+                                   gpgme_sig_stat_t & overalltqStatus,
                                    struct CryptPlug::SignatureMetaData* sigmeta,
                                    char** attrOrder,
                                    const char* unknownAttrsHandling,
@@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx,
     storeNewCharPtr( &this_info.status_text, sig_status );
   }
   sigmeta->extended_info_count = sig_idx;
-  overallStatus = intersect_stati( result->signatures );
-  sigmeta->status_code = overallStatus;
-  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) );
+  overalltqStatus = intersect_stati( result->signatures );
+  sigmeta->status_code = overalltqStatus;
+  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) );
   if ( signatureFound )
-    *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE );
+    *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE );
 }
 
 bool CryptPlug::checkMessageSignature( char** cleartext,
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 6f07c954b..4ffc59c91 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
     _libName( libName ),
     _updateURL( update ),
     _active(  active  ),
-    _iniStatus( IniStatus_undef ),
+    _initqStatus( IniStatus_undef ),
     _cp( 0 ),
     _config( 0 ),
     _cryptoConfig( 0 )
@@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const
     return i18n("(Unknown Protocol)");
 }
 
-bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg )
 {
     if ( _cp )
       return true;
 
-    _iniStatus = IniStatus_undef;
+    _initqStatus = IniStatus_undef;
     /* make sure we have a lib name */
     if ( _libName.isEmpty() ) {
-      _iniStatus = IniStatus_NoLibName;
+      _initqStatus = IniStatus_NoLibName;
       kdDebug(5150) << "No library name was given.\n" << endl;
     } else {
       if ( _libName.contains( "smime" ) ) {
@@ -515,26 +515,26 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
       }
 
       if ( !_cp ) {
-	_iniStatus = IniStatus_LoadError;
+	_initqStatus = IniStatus_LoadError;
 	kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
       } else {
 	/* now call the init function */
 	if( !_cp->initialize() ) {
-	  _iniStatus = IniStatus_InitError;
+	  _initqStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
-	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
+	  _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
 	  if ( errorMsg )
 	    *errorMsg = _lastError;
 	  delete _cp; _cp = 0;
 	  delete _config; _config = 0;
 	} else {
-	  _iniStatus  = IniStatus_Ok;
+	  _initqStatus  = IniStatus_Ok;
 	}
       }
     }
-    if( iniStatus )
-        *iniStatus = _iniStatus;
-    return _iniStatus == IniStatus_Ok;
+    if( initqStatus )
+        *initqStatus = _initqStatus;
+    return _initqStatus == IniStatus_Ok;
 }
 
 
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
 }
 
 
-CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
+CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const
 {
     if( errorMsg )
         *errorMsg = _lastError;
-    return _iniStatus;
+    return _initqStatus;
 }
 
 
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index bf1976700..2275f3756 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -462,7 +462,7 @@ public:
         If initialize was not called before return value will be
         \c CryptPlugInit_undef.
 
-        \sa iniStatus, initialize
+        \sa initqStatus, initialize
     */
     typedef enum {
         IniStatus_undef         = 0,
@@ -471,7 +471,7 @@ public:
         IniStatus_NoLibName     = 2,
         IniStatus_LoadError     = 0x1000,
         IniStatus_InitError     = 0x2000
-    } IniStatus;
+    } InitqStatus;
 
     /*! \ingroup groupSignAct
         \brief Flags used to compose the SigStatusFlags value.
@@ -543,7 +543,7 @@ public:
                        or not.
 
         \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
-        \sa iniStatus
+        \sa initqStatus
     */
     CryptPlugWrapper( const TQString& name=TQString(),
                       const TQString& libName=TQString(),
@@ -582,7 +582,7 @@ public:
               structures - if just prevents the normal functions from
               being called erroneously. When deactivated only the following
               functions are operational: constructor , destructor ,
-              setActive , active, setLibName , libName , iniStatus;
+              setActive , active, setLibName , libName , initqStatus;
               calling other functions will be ignored and their return
               values will be undefined.
 
@@ -590,7 +590,7 @@ public:
                        or not.
 
         \sa active, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, iniStatus
+        \sa deinitialize, initialize, initqStatus
     */
     void setActive( bool active );
 
@@ -613,7 +613,7 @@ public:
         This name may be set in the constructor or by calling setLibName().
 
         \note Setting/changing the library name may only be done when
-              the iniStatus() is <b>not</b> \c IniStatus_Ok.
+              the initqStatus() is <b>not</b> \c IniStatus_Ok.
               If you want to change the name of the library after
               successfully having called initialize() please make
               sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
                 above 'note'.
 
         \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, iniStatus
+        \sa deinitialize, initialize, initqStatus
     */
     bool setLibName( const TQString& libName );
 
@@ -666,13 +666,13 @@ private:
         undefined in this case, this rule does not apply to the functions
         \c setActive() and \c setLibName().
 
-        \param iniStatus will receive the resulting IniStatus if not NULL
+        \param initqStatus will receive the resulting InitqStatus if not NULL
         \param errorMsg will receive the system error message if not NULL
 
-        \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+        \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    bool initialize( IniStatus* iniStatus, TQString* errorMsg );
+    bool initialize( InitqStatus* initqStatus, TQString* errorMsg );
 
 public:
     /*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
         After this function has been called, no other plugin functions
         should be called; the behavior is undefined in this case.
 
-        \note Deinitializing sets the internal iniStatus value back
+        \note Deinitializing sets the internal initqStatus value back
               to \c IniStatus_undef.
 
-        \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+        \sa initqStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
         \sa setActive, active
     */
     void deinitialize();
@@ -693,7 +693,7 @@ public:
         \brief Returns this CRYPTPLUG wrapper's initialization state.
 
         \param errorMsg receives the last system error message, this value
-        should be ignored if IniStatus value equals \c IniStatus_Ok.
+        should be ignored if InitqStatus value equals \c IniStatus_Ok.
 
         \return  whether the relative library was loaded and initialized
                  correctly
@@ -701,7 +701,7 @@ public:
         \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    IniStatus iniStatus( TQString* errorMsg ) const;
+    InitqStatus initqStatus( TQString* errorMsg ) const;
 
 
     /*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
         however.
 
         \note In case this function cannot be executed the system's error
-        message may be retrieved by calling iniStatus( TQString* ).
+        message may be retrieved by calling initqStatus( TQString* ).
 
         \return  whether the relative feature is implemented or not
     */
@@ -824,7 +824,7 @@ private:
     TQString    _libName;
     TQString    _updateURL;
     bool       _active;
-    IniStatus _iniStatus;
+    InitqStatus _initqStatus;
     TQString    _lastError;
     CryptPlug* _cp;
     // local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 0d3cb1e96..b79e1772b 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) {
       if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) {
         if ( reasons ) {
           reasons->push_back( i18n("While scanning for %1 support in backend %2:")
-                              .arg( protocol, (*it)->displayName() ) );
+                              .tqarg( protocol, (*it)->displayName() ) );
           reasons->push_back( "  " + reason );
         }
       }
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 774302ba7..685d241bc 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
     TQString result;
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
         const TQChar ch = s[i];
-        switch ( ch.unicode() ) {
+        switch ( ch.tqunicode() ) {
         case ',':
         case '+':
         case '"':
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index ffd3c6db9..a5944315a 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res
 #if 0 // FIXME
   const int current = mIt - mKeys.begin();
   const int total = mKeys.size();
-  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
 #endif
 }
 
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7d1a27302..e83f923ee 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) {
 
   const int current = mIt - mKeys.begin();
   const int total = mKeys.size();
-  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
 }
 
 GpgME::Error Kleo::MultiDeleteJob::startAJob() {
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index a8bbb074f..bc589ec48 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_TESTS_GNUPGVIEWER_H__
 #define __KLEO_TESTS_GNUPGVIEWER_H__
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqstring.h>
 
 namespace Kleo {
@@ -54,12 +54,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLasStatus;
+  TQString mLastStdout, mLastStderr, mLastqStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 6e6bf7c80..de3a4ff06 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "<b>stderr: " + escape( *it ) + "</b>" );
 }
-void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::slotqStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
 }
 void GnuPGViewer::slotProcessExited( KProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
-    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) );
+    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index a707b000d..8acef90f0 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -52,7 +52,7 @@
 #include <tqmessagebox.h>
 #include <tqstringlist.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 
@@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB
   if ( res.error() )
     showError( res.error() );
   else
-    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
+    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ),
 			      "Key Generation Finished" );
 }
   
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 363ec26a9..ca31b39ab 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) {
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" );
   else if ( result.error() )
     TQMessageBox::critical( this, "Key Listing Result",
-			   TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
+			   TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) );
   else if ( result.isTruncated() )
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
   else
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index 30b89d2d8..fc6f07a2e 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>260</width>
                     <height>21</height>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 255cb981a..1052cff52 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -50,7 +50,7 @@
 #include <dcopclient.h>
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqtimer.h>
 
@@ -144,13 +144,13 @@ private:
     // First one is the generic name (find a nice one for OpenPGP, SMIME)
     const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0
                               ? qstricmp( protocolName, "smime" ) != 0
-                              ? TQString::fromLatin1( protocolName )
+                              ? TQString::tqfromLatin1( protocolName )
                               : i18n( "S/MIME" )
                               : i18n( "OpenPGP" );
     // second one is implementation name (gpg, gpgsm...)
     const TQString impName = protocol ? protocol->displayName() : i18n( "failed" );
     return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)",
-                 "%1 (%2)" ).arg( protoName, impName );
+                 "%1 (%2)" ).tqarg( protoName, impName );
   }
 
   const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index b97884a5c..a16dcd22e 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -47,7 +47,7 @@
 
 #include <tqgrid.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqpushbutton.h>
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 500;
     else // small (800x600, 640x480) desktop
       dialogHeight = 400;
-    TQSize sz = scrollView->sizeHint();
+    TQSize sz = scrollView->tqsizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
-                                TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
+                                + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+                                TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
       Q_ASSERT( face() == Plain );
@@ -134,9 +134,9 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "properly. It did not return any components. "
                                "Try running \"%1\" on the command line for more "
                                "information.")
-          .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+          .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
-      label->setAlignment( TQt::WordBreak );
+      label->tqsetAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
   }
 }
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
 {
   TQString descr = mEntry->description();
   if ( descr.isEmpty() ) // shouldn't happen
-    descr = TQString( "<%1>" ).arg( mName );
+    descr = TQString( "<%1>" ).tqarg( mName );
   return descr;
 }
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 0c5f0087b..65cae2499 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -82,7 +82,7 @@ namespace Kleo {
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
-                          TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
+                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
 
     bool save();
     void load();
@@ -102,7 +102,7 @@ namespace Kleo {
     static CryptoConfigEntryGUI* createEntryGUI(
       CryptoConfigModule* module,
       Kleo::CryptoConfigEntry* entry, const TQString& entryName,
-      TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
+      TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
   };
 
   /**
@@ -154,7 +154,7 @@ namespace Kleo {
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -174,7 +174,7 @@ namespace Kleo {
     CryptoConfigEntryPath( CryptoConfigModule* module,
                            Kleo::CryptoConfigEntry* entry,
                            const TQString& entryName,
-                           TQGridLayout * layout,
+                           TQGridLayout * tqlayout,
                            TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -194,7 +194,7 @@ namespace Kleo {
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -214,7 +214,7 @@ namespace Kleo {
     CryptoConfigEntryURL( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
                           const TQString& entryName,
-                          TQGridLayout * layout,
+                          TQGridLayout * tqlayout,
                           TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -234,7 +234,7 @@ namespace Kleo {
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -254,7 +254,7 @@ namespace Kleo {
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * layout,
+                               TQGridLayout * tqlayout,
                                TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -273,7 +273,7 @@ namespace Kleo {
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * layout,
+                              TQGridLayout * tqlayout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 7c576aa86..4975e3818 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -63,7 +63,7 @@ public:
 
   void setPassword( const TQString& pass ) {
     mPassword = pass;
-    setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) );
+    setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) );
   }
 
   const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index fcc7d493c..59a014618 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -44,7 +44,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>51</height>
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index e86bd1d9d..a4fc7d9a1 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -46,7 +46,7 @@
 #include <kapplication.h>
 
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqheader.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
   // the up/down/left/right arrow cross:
 
   TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
-  xlay->setAlignment( AlignCenter );
+  xlay->tqsetAlignment( AlignCenter );
 
   static const struct {
     const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index c901a2fd1..d736399f8 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -115,11 +115,11 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const {
   return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
 
-TQSize KDHorizontalLine::sizeHint() const {
-  return minimumSizeHint();
+TQSize KDHorizontalLine::tqsizeHint() const {
+  return tqminimumSizeHint();
 }
 
-TQSize KDHorizontalLine::minimumSizeHint() const {
+TQSize KDHorizontalLine::tqminimumSizeHint() const {
   const int w = fontMetrics().width( mTitle, mLenVisible ) +
                 fontMetrics().width( TQChar( ' ' ) );
   const int h = fontMetrics().height();
@@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
     const int h = fm.height();
     const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' '));
     int x;
-    if ( mAlign & AlignHCenter )		// center alignment
+    if ( mAlign & AlignHCenter )		// center tqalignment
       x = frameRect().width()/2 - tw/2;
-    else if ( mAlign & AlignRight )	// right alignment
+    else if ( mAlign & AlignRight )	// right tqalignment
       x = frameRect().width() - tw;
-    else if ( mAlign & AlignLeft )       // left alignment
+    else if ( mAlign & AlignLeft )       // left tqalignment
       x = 0;
     else { // auto align
       if( TQApplication::reverseLayout() )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
-    if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
-    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
+    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 530b89081..466b54bca 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -55,11 +55,11 @@ public:
 
   TQString title() const { return mTitle; }
 
-  /*! \reimp to hard-code the frame shape */
+  /*! \reimp to hard-code the frame tqshape */
   void setFrameStyle( int style );
 
-  TQSize sizeHint() const;
-  TQSize minimumSizeHint() const;
+  TQSize tqsizeHint() const;
+  TQSize tqminimumSizeHint() const;
   TQSizePolicy sizePolicy() const;
 
   static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 706c4d9cb..afad1fb8e 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -51,7 +51,7 @@
 
 #include <tqstringlist.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqscrollview.h>
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
   // calculate the optimal width for the dialog
   const int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + view->sizeHint().width()
-                  + sv->verticalScrollBar()->sizeHint().width()
+                  + view->tqsizeHint().width()
+                  + sv->verticalScrollBar()->tqsizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
                    + fontMetrics().height()
                    + spacingHint()
                    + sv->frameWidth()
-                   + view->sizeHint().height()
-                   + sv->horizontalScrollBar()->sizeHint().height()
+                   + view->tqsizeHint().height()
+                   + sv->horizontalScrollBar()->tqsizeHint().height()
                    + sv->frameWidth()
                    + spacingHint()
-                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
                    + marginHint()
                    + 2;
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 100334f20..32d5be217 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
     if ( !item )
       return;
 
-    const TQRect itemRect = mKeyListView->itemRect( item );
-    if ( !itemRect.isValid() )
+    const TQRect tqitemRect = mKeyListView->tqitemRect( item );
+    if ( !tqitemRect.isValid() )
       return;
 
     const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
     if ( !headerRect.isValid() )
       return;
 
-    const TQRect cellRect( headerRect.left(), itemRect.top(),
-			  headerRect.width(), itemRect.height() );
+    const TQRect cellRect( headerRect.left(), tqitemRect.top(),
+			  headerRect.width(), tqitemRect.height() );
 
     TQString tipStr;
     if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) )
@@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
 
 Kleo::KeyListView::~KeyListView() {
   d->updateTimer->stop();
-  // need to clear here, since in ~TQListView, our children won't have
+  // need to clear here, since in ~TQListView, our tqchildren won't have
   // a valid listView() pointing to us anymore, and their dtors try to
   // unregister from us.
   clear();
@@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte
 }
 
 Kleo::KeyListViewItem::~KeyListViewItem() {
-  // delete the children first... When children are deleted in the
+  // delete the tqchildren first... When tqchildren are deleted in the
   // TQLVI dtor, they don't have listView() anymore, thus they don't
   // call deregister( this ), leading to stale entries in the
   // itemMap...
@@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
     if ( const TQPixmap * pix = cs->pixmap( key, i ) )
       setPixmap( i, *pix );
   }
-  repaint();
+  tqrepaint();
 }
 
 TQString Kleo::KeyListViewItem::toolTip( int col ) const {
@@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi
   return listView()->columnStrategy()->compare( this->key(), that->key(), col );
 }
 
-void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->keyForeground( key(), cg.text() );
@@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) {
@@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a
   return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col );
 }
 
-void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->subkeyForeground( subkey(), cg.text() );
@@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a
 }
 
 
-void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->useridForeground( userID(), cg.text() );
@@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
@@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo
   return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col );
 }
 
-void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, alignment );
+    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
     return;
   }
   const TQColor fg = ds->signatureForeground( signature(), cg.text() );
@@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, alignment );
+  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index ada8354e2..38ad0f5ab 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -91,7 +91,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
     /*! \reimp */
     void insertItem( TQListViewItem * item );
     /*! \reimp */
@@ -127,7 +127,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::Subkey mSubkey;
@@ -159,7 +159,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID mUserID;
@@ -191,7 +191,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
 
   private:
     GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index f793c0fa9..ebde2c163 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -72,7 +72,7 @@
 
 // TQt
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
   // the button to unset any key:
   mEraseButton = new KPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -133,7 +133,7 @@ void Kleo::KeyRequester::init()
   connect( mEraseButton,  TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 
   setAllowedKeys( mKeyUsage );
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 998ff1122..f017f2024 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -70,7 +70,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
@@ -248,19 +248,19 @@ namespace {
 		   "Created: %2\n"
 		   "Expiry: %3\n"
 		   "Fingerprint: %4" )
-	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+	.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
     else
       return i18n( "S/MIME key for %1\n"
 		   "Created: %2\n"
 		   "Expiry: %3\n"
 		   "Fingerprint: %4\n"
 		   "Issuer: %5" )
-	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+	.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
-	.arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
+	.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
   const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const {
@@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
       KActiveLabel *textLabel = new KActiveLabel( text, page );
       disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
       connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
+      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     }
   }
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 429f7d010..2dfe083d5 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -48,11 +48,11 @@
 #include <kguiitem.h>
 #include <kdebug.h>
 
-#include <textedit.h>
-#include <textstream.h>
+#include <tqtextedit.h>
+#include <tqtextstream.h>
 #include <tqvbox.h>
 #include <tqapplication.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 #include <gpg-error.h>
 
@@ -127,7 +127,7 @@ private:
 
         if ( const int err = file.status() )
             KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
-                                .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+                                .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
                                 i18n("File Save Error") );
     }
     void slotUser2() {
@@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString &
 
     if ( err.code() != GPG_ERR_NO_DATA ) {
         KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
-                                  .arg( TQString::fromLocal8Bit( err.asString() ) ),
+                                  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
                                   i18n("GnuPG Audit Log Error") );
         return;
     }
@@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) {
 
 static TQString to_information_string( const SigningResult & result ) {
     return result.error()
-        ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Signing successful") ;
 }
 
@@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) {
 
 static TQString to_information_string( const EncryptionResult & result ) {
     return result.error()
-        ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Encryption successful") ;
 }
 
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index 9ef0bad21..c97493d31 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -57,7 +57,7 @@
 #include <klocale.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfontmetrics.h>
 
 struct Kleo::PassphraseDialog::Private {
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index d6552922c..e0149b8f3 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int
   else if ( what.isEmpty() )
     setLabelText( mBaseText );
   else
-    setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
+    setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) );
   setProgress( current, total );
 }