diff options
Diffstat (limited to 'certmanager/lib/backends/qgpgme')
11 files changed, 36 insertions, 36 deletions
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 * ); |