From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- certmanager/lib/backends/kpgp/gpg1backend.h | 4 ++-- certmanager/lib/backends/kpgp/kpgpbackendbase.cpp | 24 +++++++++++------------ certmanager/lib/backends/kpgp/kpgpbackendbase.h | 4 ++-- certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp | 14 ++++++------- certmanager/lib/backends/kpgp/kpgpkeylistjob.h | 8 ++++---- certmanager/lib/backends/kpgp/kpgpwrapper.cpp | 6 +++--- certmanager/lib/backends/kpgp/kpgpwrapper.h | 10 +++++----- certmanager/lib/backends/kpgp/pgp2backend.h | 4 ++-- certmanager/lib/backends/kpgp/pgp5backend.h | 4 ++-- certmanager/lib/backends/kpgp/pgp6backend.h | 4 ++-- 10 files changed, 41 insertions(+), 41 deletions(-) (limited to 'certmanager/lib/backends/kpgp') diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h index f9413accf..c95df1a51 100644 --- a/certmanager/lib/backends/kpgp/gpg1backend.h +++ b/certmanager/lib/backends/kpgp/gpg1backend.h @@ -42,8 +42,8 @@ namespace Kleo { class GPG1Backend : public KpgpBackendBase { public: - QString name() const; - QString displayName() const; + TQString name() const; + TQString displayName() const; }; } diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index 2d4d17ab2..2dbc3868f 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -43,7 +43,7 @@ #include -#include +#include #include "kpgpwrapper.h" @@ -58,47 +58,47 @@ Kleo::KpgpBackendBase::~KpgpBackendBase() delete mOpenPGPProtocol; mOpenPGPProtocol = 0; } -QString Kleo::GPG1Backend::name() const { +TQString Kleo::GPG1Backend::name() const { return GPG1_BACKEND_NAME; } -QString Kleo::GPG1Backend::displayName() const { +TQString Kleo::GPG1Backend::displayName() const { return i18n("Kpgp/gpg"); } -QString Kleo::PGP2Backend::name() const { +TQString Kleo::PGP2Backend::name() const { return PGP2_BACKEND_NAME; } -QString Kleo::PGP2Backend::displayName() const { +TQString Kleo::PGP2Backend::displayName() const { return i18n("Kpgp/pgp v2"); } -QString Kleo::PGP5Backend::name() const { +TQString Kleo::PGP5Backend::name() const { return PGP5_BACKEND_NAME; } -QString Kleo::PGP5Backend::displayName() const { +TQString Kleo::PGP5Backend::displayName() const { return i18n("Kpgp/pgp v5"); } -QString Kleo::PGP6Backend::name() const { +TQString Kleo::PGP6Backend::name() const { return PGP6_BACKEND_NAME; } -QString Kleo::PGP6Backend::displayName() const { +TQString Kleo::PGP6Backend::displayName() const { return i18n("Kpgp/pgp v6"); } -static const QString notSupported() { +static const TQString notSupported() { return i18n("This backend does not support S/MIME"); } -bool Kleo::KpgpBackendBase::checkForOpenPGP( QString * /*reason*/ ) const { +bool Kleo::KpgpBackendBase::checkForOpenPGP( TQString * /*reason*/ ) const { return true; } -bool Kleo::KpgpBackendBase::checkForSMIME( QString * reason ) const { +bool Kleo::KpgpBackendBase::checkForSMIME( TQString * reason ) const { if ( reason ) *reason = notSupported(); return false; } diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h index 854e800c3..9c21c12bd 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h @@ -61,8 +61,8 @@ namespace Kleo { bool supportsOpenPGP() const { return true; } bool supportsSMIME() const { return false; } - bool checkForOpenPGP( QString * reason=0 ) const; - bool checkForSMIME( QString * reason=0 ) const; + bool checkForOpenPGP( TQString * reason=0 ) const; + bool checkForSMIME( TQString * reason=0 ) const; private: mutable KpgpWrapper * mOpenPGPProtocol; }; diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 4c328adee..2e69f9392 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -44,7 +44,7 @@ #include -#include +#include #include #include @@ -169,7 +169,7 @@ gpgme_user_id_t KpgpUserID2GPGMEUserID( const Kpgp::UserID * kUserId ) { // inspired by _gpgme_key_append_name - const QCString text = kUserId->text().utf8(); + const TQCString text = kUserId->text().utf8(); const int src_len = text.length(); gpgme_user_id_t uid; @@ -196,9 +196,9 @@ gpgme_subkey_t KpgpSubkey2GPGMESubKey( const Kpgp::Subkey * kSubkey ) { gpgme_subkey_t subkey; - const QCString fpr = kSubkey->fingerprint(); + const TQCString fpr = kSubkey->fingerprint(); const unsigned int fpr_len = fpr.length(); - const QCString keyId = kSubkey->longKeyID(); + const TQCString keyId = kSubkey->longKeyID(); subkey = (gpgme_subkey_t) calloc( 1, sizeof( *subkey ) + fpr_len + 1 ); subkey->revoked = kSubkey->revoked(); @@ -260,11 +260,11 @@ gpgme_key_t KpgpKey2gpgme_key( const Kpgp::Key * kKey ) return key; } -GpgME::Error Kleo::KpgpKeyListJob::start( const QStringList & patterns, +GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - QTimer::singleShot( 0, this, SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } @@ -279,7 +279,7 @@ void Kleo::KpgpKeyListJob::slotDoIt() { deleteLater(); } -GpgME::KeyListResult Kleo::KpgpKeyListJob::exec( const QStringList & patterns, +GpgME::KeyListResult Kleo::KpgpKeyListJob::exec( const TQStringList & patterns, bool secretOnly, std::vector & keys ) { Kpgp::KeyList kKeys; diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index 779680c2d..4cfb3d047 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -35,7 +35,7 @@ #include -#include +#include namespace GpgME { class Error; @@ -56,10 +56,10 @@ namespace Kleo { ~KpgpKeyListJob(); /*! \reimp from KeyListJob */ - GpgME::Error start( const QStringList & patterns, bool secretOnly ); + GpgME::Error start( const TQStringList & patterns, bool secretOnly ); /*! \reimp from KeyListJob */ - GpgME::KeyListResult exec( const QStringList & patterns, bool secretOnly, + GpgME::KeyListResult exec( const TQStringList & patterns, bool secretOnly, std::vector & keys ); /*! \reimp from Job */ @@ -70,7 +70,7 @@ namespace Kleo { private: Kpgp::Base * mPgpBase; - QStringList mPatterns; + TQStringList mPatterns; bool mSecretOnly; }; diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp index 20d885dd5..a2ff064f1 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp @@ -56,7 +56,7 @@ //#include //#include -KpgpWrapper::KpgpWrapper( const QString & name ) +KpgpWrapper::KpgpWrapper( const TQString & name ) : mName( name ), mPgpBase( 0 ) { @@ -68,12 +68,12 @@ KpgpWrapper::~KpgpWrapper() } -QString KpgpWrapper::name() const +TQString KpgpWrapper::name() const { return mName; } -QString KpgpWrapper::displayName() const +TQString KpgpWrapper::displayName() const { return mName; } diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h index 182661ec4..40c6e9250 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.h +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h @@ -35,7 +35,7 @@ #include -#include +#include namespace Kleo { class KeyListJob; @@ -61,12 +61,12 @@ namespace Kpgp { class KpgpWrapper : public Kleo::CryptoBackend::Protocol { public: - KpgpWrapper( const QString & name ); + KpgpWrapper( const TQString & name ); ~KpgpWrapper(); - QString name() const; + TQString name() const; - QString displayName() const; + TQString displayName() const; Kleo::KeyListJob * keyListJob( bool remote=false, bool includeSigs=false, bool validate=false ) const; @@ -90,7 +90,7 @@ private: Kpgp::Base * pgpBase() const; private: - QString mName; + TQString mName; mutable Kpgp::Base * mPgpBase; }; diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h index fc053a20c..afb8a87c2 100644 --- a/certmanager/lib/backends/kpgp/pgp2backend.h +++ b/certmanager/lib/backends/kpgp/pgp2backend.h @@ -42,8 +42,8 @@ namespace Kleo { class PGP2Backend : public KpgpBackendBase { public: - QString name() const; - QString displayName() const; + TQString name() const; + TQString displayName() const; }; } diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h index bf323b6fb..2cf995741 100644 --- a/certmanager/lib/backends/kpgp/pgp5backend.h +++ b/certmanager/lib/backends/kpgp/pgp5backend.h @@ -42,8 +42,8 @@ namespace Kleo { class PGP5Backend : public KpgpBackendBase { public: - QString name() const; - QString displayName() const; + TQString name() const; + TQString displayName() const; }; } diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h index 827cf239b..d0babccd1 100644 --- a/certmanager/lib/backends/kpgp/pgp6backend.h +++ b/certmanager/lib/backends/kpgp/pgp6backend.h @@ -42,8 +42,8 @@ namespace Kleo { class PGP6Backend : public KpgpBackendBase { public: - QString name() const; - QString displayName() const; + TQString name() const; + TQString displayName() const; }; } -- cgit v1.2.1