Remove additional unneeded tq method conversions

(cherry picked from commit 716a5de8870d7c02bb4d0aed72f30291b17b763a)

13 files changed, 45 insertions, 45 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 472f7e64..e47909e2 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 9daaa620..edfe9be5 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 a57685f2..002bf018 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 eccdf921..677fc6ec 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 57811c6e..53142fad 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 c012b307..0cf9000a 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 9594edfa..27680585 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 c2493ebe..d083947e 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 e55f237d..61da793e 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 d1d2591d..c6370674 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 95789725..c2e21bb9 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 781e0513..63453a4e 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 8f2fd20d..b753899a 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*)) );