Remove additional unneeded tq method conversions

30 files changed, 91 insertions, 91 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 472f7e642..e47909e28 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -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\"" ).tqarg( "OpenPGP" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
   return false;
 }
 
 bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "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." ).tqarg( chiasmus );
+      *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( 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\"" ).tqarg( name );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
   return 0;
 }
 
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 9daaa620d..edfe9be52 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" ) )
-    .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
+    .arg( TQString::fromLocal8Bit( mError.asString() ) );
   if ( !mStderr.isEmpty() ) {
-    const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
+    const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( 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 a57685f28..002bf0182 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" )
-                .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
+                .arg( 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" )
-                .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
+                .arg( 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 eccdf9219..677fc6ec2 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..." ).tqarg( mKeyPaths[mIndex] ),
+  emit progress( i18n( "Scanning directory %1..." ).arg( 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 57811c6e5..53142fad8 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -45,11 +45,11 @@
 #include <assert.h>
 
 struct Kleo::GnuPGProcessBase::Private {
-  Private() : useStatusFD( false ), statnot( 0 ) {
+  Private() : usetStatusFD( false ), statnot( 0 ) {
     statusFD[0] = statusFD[1] = -1;
   }
 
-  bool useStatusFD;
+  bool usetStatusFD;
   int statusFD[2];
   TQSocketNotifier * statnot;
   TQCString statusBuffer;
@@ -66,13 +66,13 @@ Kleo::GnuPGProcessBase::~GnuPGProcessBase() {
   delete d; d = 0;
 }
 
-void Kleo::GnuPGProcessBase::setUseStatusFD( bool use ) {
+void Kleo::GnuPGProcessBase::setUsetStatusFD( bool use ) {
   assert( d );
-  d->useStatusFD = use;
+  d->usetStatusFD = use;
 }
 
 bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
-  if ( d->useStatusFD ) {
+  if ( d->usetStatusFD ) {
     // set up the status-fd. This should be in setupCommunication(),
     // but then it's too late: we need the fd of the pipe to pass it
     // as argument to the --status-fd option:
@@ -100,7 +100,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
 int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
   if ( int ok = KProcess::setupCommunication( comm ) )
     return ok;
-  if ( d->useStatusFD ) {
+  if ( d->usetStatusFD ) {
     // base class impl returned error, so close our fd's, too
     ::close( d->statusFD[0] );
     ::close( d->statusFD[1] );
@@ -110,7 +110,7 @@ int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
 }
 
 int Kleo::GnuPGProcessBase::commSetupDoneP() {
-  if ( d->useStatusFD ) {
+  if ( d->usetStatusFD ) {
     ::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)) );
@@ -119,20 +119,20 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
 }
 
 int Kleo::GnuPGProcessBase::commSetupDoneC() {
-  if ( d->useStatusFD )
+  if ( d->usetStatusFD )
     ::fcntl( d->statusFD[1], F_SETFD, 0 );
   return KProcess::commSetupDoneC();
 }
 
 void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
   if ( !childStatus(fd) )
-    closeStatus();
+    closetStatus();
 }
 
-bool Kleo::GnuPGProcessBase::closeStatus() {
-  if ( !d->useStatusFD )
+bool Kleo::GnuPGProcessBase::closetStatus() {
+  if ( !d->usetStatusFD )
     return false;
-  d->useStatusFD = false;
+  d->usetStatusFD = false;
   delete d->statnot; d->statnot = 0;
   ::close( d->statusFD[0] ); d->statusFD[0] = -1;
   return true;
@@ -144,7 +144,7 @@ int Kleo::GnuPGProcessBase::childStatus( int fd ) {
   if ( len > 0 ) {
     buf[len] = 0;
     d->statusBuffer += buf;
-    parseStatusOutput();
+    parsetStatusOutput();
   }
   return len;
 }
@@ -153,7 +153,7 @@ static TQString fromHexEscapedUtf8( const TQCString & str ) {
   return KURL::decode_string( str.data(), 106 /* utf-8 */ );
 }
 
-void Kleo::GnuPGProcessBase::parseStatusOutput() {
+void Kleo::GnuPGProcessBase::parsetStatusOutput() {
   static const char startToken[] = "[GNUPG:] ";
   static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;
 
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index c012b3075..0cf9000a9 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -52,12 +52,12 @@ namespace Kleo {
     GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
     ~GnuPGProcessBase();
 
-    void setUseStatusFD( bool use );
+    void setUsetStatusFD( bool use );
 
     /*! reimplementation */
     bool start( RunMode runmode, Communication comm );
 
-    bool closeStatus();
+    bool closetStatus();
 
   signals:
     void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args );
@@ -77,7 +77,7 @@ namespace Kleo {
     void slotChildStatus( int fd );
 
   private:
-    void parseStatusOutput();
+    void parsetStatusOutput();
 
   private:
     class Private;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 9594edfa2..27680585b 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.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+    *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
   else if ( ei.fileName() && !ei.version() )
-    *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) );
+    *reason = i18n("Engine %1 is not installed properly.").arg( 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.")
-      .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
+      .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
   else
-    *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
+    *reason = i18n("Unknown problem with engine for protocol %1.").arg( 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\"" ).tqarg( name );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
   return false;
 }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index c2493ebe4..d083947e9 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -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.tqarg( i18n( "program not found" ) );
+        wmsg = wmsg.arg( i18n( "program not found" ) );
     else if ( rc == -2 )
-        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
+        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
     else
-        wmsg = wmsg.tqarg( strerror(rc) );
+        wmsg = wmsg.arg( 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" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
+    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
     kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
     KMessageBox::error(0, wmsg);
   }
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index e55f237dc..61da793ed 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.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+  msg = msg.arg( 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." )
-           .tqarg( gpgAgent );
+           .arg( gpgAgent );
   } else {
     msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
-           .tqarg( "1.9" )
-           .tqarg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
+           .arg( "1.9" )
+           .arg( "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" )
-         .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
+         .arg( "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 d1d2591da..c6370674b 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>" )
-    .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) );
+    .arg( 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 95789725d..c2e21bb9b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -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.tqarg( cur );
+    result = result.arg( cur );
   if ( desc.useTot )
-    result = result.tqarg( tot );
+    result = result.arg( tot );
   return result;
 }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 781e0513f..63453a4e5 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -105,7 +105,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
     commandLineLength -= patLength + 1;
   }
 
-  mProcess->setUseStatusFD( true );
+  mProcess->setUsetStatusFD( true );
 
   connect( mProcess, TQT_SIGNAL(processExited(KProcess*)),
 	   TQT_SLOT(slotProcessExited(KProcess*)) );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index 8f2fd20d2..b753899a0 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -86,7 +86,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
     *mProcess << "--p12-charset" << mCharset;
   *mProcess << patterns.front().utf8();
 
-  mProcess->setUseStatusFD( true );
+  mProcess->setUsetStatusFD( true );
 
   connect( mProcess, TQT_SIGNAL(processExited(KProcess*)),
 	   TQT_SLOT(slotProcessExited(KProcess*)) );
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 3bce3d136..6f07c954b 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -522,7 +522,7 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 	if( !_cp->initialize() ) {
 	  _iniStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
-	  _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
+	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
 	  if ( errorMsg )
 	    *errorMsg = _lastError;
 	  delete _cp; _cp = 0;
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index b79e1772b..0d3cb1e96 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:")
-                              .tqarg( protocol, (*it)->displayName() ) );
+                              .arg( protocol, (*it)->displayName() ) );
           reasons->push_back( "  " + reason );
         }
       }
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index a5944315a..ffd3c6db9 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").tqarg( current ).tqarg( total ), current, total );
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
 #endif
 }
 
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index e83f923ee..7d1a27302 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").tqarg( current ).tqarg( total ), current, total );
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
 }
 
 GpgME::Error Kleo::MultiDeleteJob::startAJob() {
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 6e6bf7c80..ec88fd813 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -109,7 +109,7 @@ 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->exitStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
@@ -127,7 +127,7 @@ int main( int argc, char** argv ) {
   for ( int i = 1 ; i < argc ; ++i )
     gpg << argv[i];
 
-  gpg.setUseStatusFD( true );
+  gpg.setUsetStatusFD( true );
 
   GnuPGViewer * gv = new GnuPGViewer();
   gv->setProcess( &gpg );
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 8acef90f0..7e3fa8876 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -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").tqarg( keyData.size() ),
+    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
 			      "Key Generation Finished" );
 }
   
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index ca31b39ab..363ec26a9 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").tqarg( result.error().asString() ) );
+			   TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
   else if ( result.isTruncated() )
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
   else
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 1207ed0f0..33582e290 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -150,7 +150,7 @@ private:
     // 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)" ).tqarg( protoName, impName );
+                 "%1 (%2)" ).arg( protoName, impName );
   }
 
   const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index c7604e84e..d1f6f0aca 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "properly. It did not return any components. "
                                "Try running \"%1\" on the command line for more "
                                "information.")
-          .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+          .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
       label->setAlignment( 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>" ).tqarg( mName );
+    descr = TQString( "<%1>" ).arg( mName );
   return descr;
 }
 
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 07dc7ef89..c901a2fd1 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -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 tqalignment
+    if ( mAlign & AlignHCenter )		// center alignment
       x = frameRect().width()/2 - tw/2;
-    else if ( mAlign & AlignRight )	// right tqalignment
+    else if ( mAlign & AlignRight )	// right alignment
       x = frameRect().width() - tw;
-    else if ( mAlign & AlignLeft )       // left tqalignment
+    else if ( mAlign & AlignLeft )       // left alignment
       x = 0;
     else { // auto align
       if( TQApplication::reverseLayout() )
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index c62a18ddf..530b89081 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -55,7 +55,7 @@ public:
 
   TQString title() const { return mTitle; }
 
-  /*! \reimp to hard-code the frame tqshape */
+  /*! \reimp to hard-code the frame shape */
   void setFrameStyle( int style );
 
   TQSize sizeHint() const;
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 075833b21..100334f20 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -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 tqchildren won't have
+  // need to clear here, since in ~TQListView, our children 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 tqchildren first... When tqchildren are deleted in the
+  // delete the children first... When children 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 );
   }
-  tqrepaint();
+  repaint();
 }
 
 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 tqalignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     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, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 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 tqalignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     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, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
@@ -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 tqalignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     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, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
@@ -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 tqalignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     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, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 38ad0f5ab..ada8354e2 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 tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
     /*! \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 tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   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 tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   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 tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   private:
     GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 3c1e264cd..c3bcf0244 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -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>" )
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+    .arg( 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 b05d9ea28..d88d80b3f 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -248,7 +248,7 @@ namespace {
 		   "Created: %2\n"
 		   "Expiry: %3\n"
 		   "Fingerprint: %4" )
-	.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
     else
@@ -257,10 +257,10 @@ namespace {
 		   "Expiry: %3\n"
 		   "Fingerprint: %4\n"
 		   "Issuer: %5" )
-	.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
-	.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+	.arg( 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->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->alignment() | 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>" )
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+    .arg( 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 2dfe083d5..5917fdee8 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -127,7 +127,7 @@ private:
 
         if ( const int err = file.status() )
             KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
-                                .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+                                .arg( 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")
-                                  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+                                  .arg( 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").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Signing failed: %1").arg( 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").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Encryption successful") ;
 }
 
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index e0149b8f3..d6552922c 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" ).tqarg( mBaseText, what ) );
+    setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
   setProgress( current, total );
 }