diff options
Diffstat (limited to 'certmanager/lib')
118 files changed, 390 insertions, 394 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index e89070f3..d5083b96 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -442,7 +442,7 @@ bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const { bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const { // kills the protocol instance when we return false: - std::auto_ptr<Protocol> tmp( mProtocol ); + std::unique_ptr<Protocol> tmp( mProtocol ); mProtocol = 0; const CryptoConfigEntry * path = config()->entry( "Chiasmus", "General", "path" ); diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h index 1619f9ea..17f7572c 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusbackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 265d759b..5c49478e 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() { : SymCryptRunProcessBase::Decrypt, this, "symcryptrun" ); TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, - TQT_SLOT( slotTimeout() ) ); + TQ_SLOT( slotTimeout() ) ); return 0; } @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) return mError = gpg_error( GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h index 1ca6ba19..d46d530d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -50,7 +50,7 @@ namespace Kleo { @short SpecialJob for Chiasmus operations */ class ChiasmusJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode ) diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h index fa1adc73..3a3536af 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmuslibrary.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index d7ae22c1..90f51243 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob() Kleo::ObtainKeysJob::~ObtainKeysJob() {} GpgME::Error Kleo::ObtainKeysJob::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); return mError = 0; } @@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { ++mIndex; if ( async ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); else slotPerform( false ); } diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index da19257b..29557c14 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* obtainkeysjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -63,7 +63,7 @@ namespace Kleo { absolute filenames of the keys found in the configured key files. */ class ObtainKeysJob : public Kleo::SpecialJob { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList result READ result ) public: diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 9391f023..34ac1d66 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {} bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) { - connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) ); return true; } } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 36866e13..b5b60fe5 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ #define __KLEO_BACKEND_CHIASMUS__SYMCRYPTRUNPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcstring.h> @@ -42,7 +42,7 @@ class TQString; namespace Kleo { class SymCryptRunProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: enum Operation { diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h index a1ff723c..96729f33 100644 --- a/certmanager/lib/backends/kpgp/gpg1backend.h +++ b/certmanager/lib/backends/kpgp/gpg1backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* gpg1backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index b5b006b5..dfa88af6 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h index 6fdf29bf..d9dbf579 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 3d28ac4b..5ab83715 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index d126ea67..3ab04cf3 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* kpgpkeylistjob.h This file is part of libkleopatra, the KDE keymanagement library @@ -50,7 +50,7 @@ namespace Kpgp { namespace Kleo { class KpgpKeyListJob : public KeyListJob { - Q_OBJECT + TQ_OBJECT public: KpgpKeyListJob( Kpgp::Base * pgpBase ); diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp index 71c08293..6778f45d 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h index 8dc7dbc2..7776e98c 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.h +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h index b486bfd6..622566e1 100644 --- a/certmanager/lib/backends/kpgp/pgp2backend.h +++ b/certmanager/lib/backends/kpgp/pgp2backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp2backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h index 2db55932..b02183de 100644 --- a/certmanager/lib/backends/kpgp/pgp5backend.h +++ b/certmanager/lib/backends/kpgp/pgp5backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp5backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h index c5f9eeff..46494244 100644 --- a/certmanager/lib/backends/kpgp/pgp6backend.h +++ b/certmanager/lib/backends/kpgp/pgp6backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp6backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index bfd00ac9..e0da7eca 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { 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)) ); + connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) ); } return TDEProcess::commSetupDoneP(); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 528179a2..d894884e 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -33,7 +33,7 @@ #ifndef __KLEO_GNUPGPROCESSBASE_H__ #define __KLEO_GNUPGPROCESSBASE_H__ -#include <kprocess.h> +#include <tdeprocess.h> namespace Kleo { @@ -46,7 +46,7 @@ namespace Kleo { * @author Marc Mutz <mutz@kde.org> */ class GnuPGProcessBase : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index c38097ed..86439bb9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -43,7 +43,7 @@ #include <gpgmepp/engineinfo.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h index a23c08d4..9d6aca81 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index e73b4363..c77dcb20 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -32,7 +32,7 @@ #include "qgpgmecryptoconfig.h" #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <errno.h> #include <tdemessagebox.h> #include <tdelocale.h> @@ -71,12 +71,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) { // Run gpgconf --list-components to make the list of components - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-components"; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); // run the process: int rc = 0; @@ -100,7 +100,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) mParsed = true; } -void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfig::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -166,15 +166,15 @@ void QGpgMECryptoConfigComponent::runGpgConf() { // Run gpgconf --list-options <component>, and create all groups and entries for that component - KProcIO proc( TQTextCodec::codecForName( "utf8" ) ); + TDEProcIO proc( TQTextCodec::codecForName( "utf8" ) ); proc << "gpgconf"; // must be in the PATH proc << "--list-options"; proc << mName; //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(TDEProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(TDEProcIO*) ) ); mCurrentGroup = 0; // run the process: @@ -192,7 +192,7 @@ void QGpgMECryptoConfigComponent::runGpgConf() } } -void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc ) +void QGpgMECryptoConfigComponent::slotCollectStdOut( TDEProcIO* proc ) { TQString line; int result; @@ -265,7 +265,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime ) line += ":16:"; } line += '\n'; - TQCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading. + TQCString line8bit = line.utf8(); // encode with utf8, and TDEProcIO uses utf8 when reading. tmpFile.file()->writeBlock( line8bit.data(), line8bit.size()-1 /*no 0*/ ); dirtyEntries.append( it.current() ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h index 712ce24e..5fbc9f63 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h @@ -38,7 +38,7 @@ #include <tqstringlist.h> #include <tqobject.h> #include <tqvariant.h> -class KProcIO; +class TDEProcIO; class QGpgMECryptoConfigComponent; class QGpgMECryptoConfigEntry; @@ -48,7 +48,7 @@ class QGpgMECryptoConfigEntry; */ class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig { - Q_OBJECT + TQ_OBJECT public: /** @@ -65,7 +65,7 @@ public: virtual void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found void runGpgConf( bool showErrors ); @@ -80,7 +80,7 @@ class QGpgMECryptoConfigGroup; /// For docu, see kleo/cryptoconfig.h class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent { - Q_OBJECT + TQ_OBJECT public: QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description ); @@ -95,7 +95,7 @@ public: void sync( bool runtime ); private slots: - void slotCollectStdOut( KProcIO* proc ); + void slotCollectStdOut( TDEProcIO* proc ); private: void runGpgConf(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h index e58ea326..ea3454fe 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 79ff268b..255e3fdd 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -47,8 +47,8 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptVerifyJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h index 20dca974..c867b855 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h @@ -46,7 +46,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDeleteJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h index 5317afd4..1facc509 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h @@ -45,7 +45,7 @@ namespace GpgME { namespace Kleo { class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDownloadJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index 80b5e467..13b7546c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h index aa2e0c0a..7e427d6c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEExportJob : public ExportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEExportJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h index 2324da6d..0a5ab681 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEImportJob : public ImportJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEImportJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 947a5258..8c378536 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -47,7 +47,7 @@ #include <gpgmepp/data.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqstringlist.h> @@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ) { InvarianceChecker check( this ); assert( context ); - TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()), - _this, TQT_SLOT(slotCancel()) ); + TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()), + _this, TQ_SLOT(slotCancel()) ); context->setProgressProvider( this ); // (mmutz) work around a gpgme bug in versions at least <= 0.9.0. // These versions will return GPG_ERR_NOT_IMPLEMENTED from @@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() { void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() { mCtx->setManagedByEventLoopInteractor( true ); TQObject::connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), - mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); + TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), + mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); } void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 844ca974..aabfb701 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class Data; @@ -75,7 +75,7 @@ namespace Kleo { signal there. Pass "this" as the first argument this QGpgMEJOb's ctor. The rest is dealt with automatically. */ - class KDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { + class TDE_EXPORT QGpgMEJob : public GpgME::ProgressProvider, public GpgME::PassphraseProvider { public: QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ); ~QGpgMEJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index c9e16474..f5f46669 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class Error; @@ -51,8 +51,8 @@ namespace QGpgME { namespace Kleo { - class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyGenerationJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 5561625c..25edaf84 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr hookupContextToEventLoopInteractor(); connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), - TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); + TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), + TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); // The communication channel between gpgme and gpgsm is limited in // the number of patterns that can be transported, but they won't @@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr } } else if ( err.code() == GPG_ERR_EOF ) { kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl; - TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) ); return GpgME::Error(); } deleteLater(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index 8e26d791..a62a7379 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -48,7 +48,7 @@ namespace GpgME { namespace Kleo { class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyListJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index bc0d232e..54d13358 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmeprogresstokenmapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 6d05e1ec..8088d28a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index ac160036..78c26ef3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -50,7 +50,7 @@ class TDEProcess; namespace Kleo { class QGpgMERefreshKeysJob : public RefreshKeysJob { - Q_OBJECT + TQ_OBJECT public: QGpgMERefreshKeysJob(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f553c703..af72a539 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 335fd770..1dad417c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -55,7 +55,7 @@ class TDEProcess; namespace Kleo { class QGpgMESecretKeyExportJob : public ExportJob { - Q_OBJECT + TQ_OBJECT public: QGpgMESecretKeyExportJob( bool armour, const TQString& charset ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 24672d83..216faeb5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class Error; class Context; @@ -53,8 +53,8 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { - Q_OBJECT + class TDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { + TQ_OBJECT TQGPGME_JOB public: QGpgMESignEncryptJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 2b51eada..388b2756 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -50,7 +50,7 @@ namespace GpgME { namespace Kleo { class QGpgMESignJob : public SignJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h index a62699d3..5e9728d3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyDetachedJob( GpgME::Context * context ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h index 87a19619..ea596e13 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h @@ -47,7 +47,7 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob { - Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyOpaqueJob( GpgME::Context * context ); diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a91451..24ded795 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: GPGMEPLUG - an GPGME based cryptography plug-in following the common CRYPTPLUG specification. @@ -697,8 +696,8 @@ GpgME::ImportResult CryptPlug::importCertificateFromMem( const char* data, size_ { using namespace GpgME; - std::auto_ptr<Context> context( Context::createForProtocol( mProtocol ) ); - if ( !context.get() ) + std::unique_ptr<Context> context( Context::createForProtocol( mProtocol ) ); + if ( !context ) return ImportResult(); Data keydata( data, length, false ); diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index d633e639..9b281101 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: CRYPTPLUG - an independent cryptography plug-in API @@ -26,7 +25,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class ImportResult; @@ -296,7 +295,7 @@ typedef unsigned long SigStatusFlags; class CryptPlugWrapper; -class KDE_EXPORT CryptPlug { +class TDE_EXPORT CryptPlug { friend class CryptPlugWrapper; protected: CryptPlug(); @@ -419,12 +418,12 @@ bool hasFeature( ::Feature ); and/or encrypted content (or to build a text frame around your flat non-MIME message body, resp.) - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Allways <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -452,16 +451,16 @@ bool hasFeature( ::Feature ); you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -487,16 +486,16 @@ bool hasFeature( ::Feature ); unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfo data in your program:</b> @@ -625,48 +624,48 @@ struct StructuringInfo { MIME object (or - for non-MIME messages - as flat text to be set before the ciphertext, resp.), typically this - is TRUE when signing mails but FALSE + is true when signing mails but false when encrypting<br> (this parameter is relevant no matter - whether \c makeMimeObject is TRUE or - FALSE) */ + whether \c makeMimeObject is true or + false) */ bool makeMimeObject; /*!< specifies whether we should create a MIME object or a flat text message body */ /* the following are used for MIME messages only */ bool makeMultiMime; /*!< specifies whether we should create a 'Multipart' MIME object or a single part - object, if FALSE only \c contentTypeMain, + object, if false only \c contentTypeMain, \c contentDispMain and \c contentTEncMain may be used and all other parameters have to be ignored<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeMain; /*!< value of the main 'Content-Type' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentDispMain; /*!< value of the main 'Content-Disposition' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTEncMain; /*!< value of the main 'Content-TransferEncoding' header<br> (ignore this parameter if \c makeMimeObject - is FALSE) */ + is false) */ char* contentTypeVersion; /*!< 'Content-Type' of the additional version part that might preceed the code part - if NULL or zero length no version part must be created<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispVersion; /*!< 'Content-Disposition' of the additional preceeding the code part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTEncVersion; /*!< 'Content-Transfer-Encoding' of the additional version part (only valid if @@ -674,47 +673,47 @@ struct StructuringInfo { non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* bodyTextVersion; /*!< body text of the additional version part (only valid if \c contentTypeVersion holds a non-zero-length string)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeVersion does + is false or if \c contentTypeVersion does not return a non-zero-length string) */ char* contentTypeCode; /*!< 'Content-Type' of the code part holding the signature code (or the encrypted data, resp.)<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE) */ + is false) */ char* contentDispCode; /*!< 'Content-Disposition' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ char* contentTEncCode; /*!< 'Content-Type' of the code part<br> (ignore this parameter if either \c makeMimeObject or \c makeMultiMime - is FALSE or if \c contentTypeCode does + is false or if \c contentTypeCode does not return a non-zero-length string) */ /* the following are used for flat non-MIME messages only */ char* flatTextPrefix; /*!< text to preceed the main text (or the code bloc containing the encrypted main text, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ char* flatTextSeparator; /*!< text to be put between the main text and the signature code bloc (not used when encrypting)<br> (ignore this parameter if - \c makeMimeObject is TRUE or if - \c includeCleartext is FALSE) */ + \c makeMimeObject is true or if + \c includeCleartext is false) */ char* flatTextPostfix; /*!< text to follow the signature code bloc (or the encrypted data bloc, resp.)<br> (ignore this parameter if - \c makeMimeObject is TRUE) */ + \c makeMimeObject is true) */ }; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 3eb5f7e6..a45c82fc 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,11 +35,11 @@ #include "kleo/cryptobackendfactory.h" -#include <tdepimmacros.h> +#include <tdemacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { - //typedef CryptoBackendFactory CryptPlugFactory KDE_DEPRECATED; + //typedef CryptoBackendFactory CryptPlugFactory TDE_DEPRECATED; } class CryptPlugWrapper; @@ -47,8 +47,8 @@ class CryptPlugWrapperList; namespace KMail { - class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { - Q_OBJECT + class TDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory { + TQ_OBJECT protected: CryptPlugFactory(); diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 5bd5675b..f1246f39 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -569,7 +569,7 @@ bool CryptPlugWrapper::checkMessageSignature( char** cleartext, int signatureLen, CryptPlug::SignatureMetaData* sigmeta ) { - DNBeautifier dnBeautifier( kapp->config(), + DNBeautifier dnBeautifier( tdeApp->config(), "DN", "AttributeOrder", "UnknownAttributes" ); @@ -607,7 +607,7 @@ bool CryptPlugWrapper::decryptAndCheckMessage( int* errId, char** errTxt ) { - DNBeautifier dnBeautifier( kapp->config(), + DNBeautifier dnBeautifier( tdeApp->config(), "DN", "AttributeOrder", "UnknownAttributes" ); diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index a8ea1112..41a9fc2b 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TDEConfigBase; @@ -240,12 +240,12 @@ class CryptPlugWrapper; any of it's members - just ignore the advise given in the cryptplug.h documentation! - <b>If</b> value returned in \c makeMimeObject is <b>TRUE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>true</b> the text strings returned in \c contentTypeMain and \c contentDispMain and \c contentTEncMain (and, if required, \c content[..]Version and \c bodyTextVersion and \c content[..]Sig) should be used to compose a respective MIME object.<br> - If <b>FALSE</b> the texts returned in \c flatTextPrefix and + If <b>false</b> the texts returned in \c flatTextPrefix and \c flatTextSeparator and \c flatTextPostfix are to be used instead.<br> Always <b>either</b> the \c content[..] and \c bodyTextVersion parameters <b>or</b> the \c flatText[..] parameters are holding @@ -273,16 +273,16 @@ class CryptPlugWrapper; you could report the missing MIME header information to the address returned by the \c bugURL() function. - If \c makeMultiMime returns FALSE the \c contentTypeMain returned must + If \c makeMultiMime returns false the \c contentTypeMain returned must not be altered but used to specify a single part mime object holding the code bloc, e.g. this is used for 'enveloped-data' single part MIME objects. In this case you should ignore both the \c content[..]Version and \c content[..]Code parameters. - If \c makeMultiMime returns TRUE also the following rules apply: - \li If \c includeCleartext is TRUE you should include the cleartext - as first part of our multipart MIME object, typically this is TRUE - when signing mails but FALSE when encrypting. + If \c makeMultiMime returns true also the following rules apply: + \li If \c includeCleartext is true you should include the cleartext + as first part of our multipart MIME object, typically this is true + when signing mails but false when encrypting. \li The \c contentTypeMain returned typically starts with "multipart/" while providing a "protocol" and a "micalg" parameter: just add an appropriate \c "; boundary=[your \c boundary \c string]" to get @@ -308,16 +308,16 @@ class CryptPlugWrapper; unaltered value to specify the Content-Transfer-Encoding header of the respective MIME part. - <b>If</b> value returned in \c makeMimeObject is <b>FALSE</b> the + <b>If</b> value returned in \c makeMimeObject is <b>false</b> the text strings returned in \c flatTextPrefix and \c flatTextPostfix should be used to build a frame around the cleartext and the code bloc holding the signature (or - in case of encrypting - the encoded data bloc, resp.).<br> - If \c includeCleartext is TRUE this frame should also include the + If \c includeCleartext is true this frame should also include the cleartext as first bloc, this bloc should be divided from the code bloc by the contents of \c flatTextSeparator - typically this is used for signing but not when encrypting.<br> - If \c includeCleartext is FALSE you should ignore both the cleartext + If \c includeCleartext is false you should ignore both the cleartext and the \c flatTextSeparator parameter. <b>How to use StructuringInfoWrapper data in your program:</b> @@ -450,7 +450,7 @@ private: /*! \brief This class provides C++ access to the CRYPTPLUG API. */ -class KDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { +class TDE_EXPORT CryptPlugWrapper : public Kleo::CryptoBackend::Protocol { public: static TQString errorIdToText( int errId, bool & isPassphraseError ); diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp index 43f88670..94d8a48c 100644 --- a/certmanager/lib/cryptplugwrapperlist.cpp +++ b/certmanager/lib/cryptplugwrapperlist.cpp @@ -1,5 +1,4 @@ -/* -*- c++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/cryptplugwrapperlist.h b/certmanager/lib/cryptplugwrapperlist.h index 30d4fcd9..01691338 100644 --- a/certmanager/lib/cryptplugwrapperlist.h +++ b/certmanager/lib/cryptplugwrapperlist.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 09012da3..d8b1dd6c 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <tdepimmacros.h> +#include <tdemacros.h> #include <vector> #include <map> @@ -56,8 +56,8 @@ namespace Kleo { } }; - class KDE_EXPORT CryptoBackendFactory : public TQObject { - Q_OBJECT + class TDE_EXPORT CryptoBackendFactory : public TQObject { + TQ_OBJECT protected: CryptoBackendFactory(); diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h index bce60b81..98ff47c8 100644 --- a/certmanager/lib/kleo/decryptjob.h +++ b/certmanager/lib/kleo/decryptjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DecryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DecryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h index 94b016a0..f804590e 100644 --- a/certmanager/lib/kleo/decryptverifyjob.h +++ b/certmanager/lib/kleo/decryptverifyjob.h @@ -63,7 +63,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DecryptVerifyJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DecryptVerifyJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h index 15bd5a51..46c361c3 100644 --- a/certmanager/lib/kleo/deletejob.h +++ b/certmanager/lib/kleo/deletejob.h @@ -56,7 +56,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DeleteJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DeleteJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index d4ed1301..d6db7d18 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -484,7 +484,7 @@ Kleo::DNAttributeMapper::Private::Private() Kleo::DNAttributeMapper::DNAttributeMapper() { d = new Private(); - const TDEConfigGroup config( kapp->config(), "DN" ); + const TDEConfigGroup config( tdeApp->config(), "DN" ); d->attributeOrder = config.readListEntry( "AttributeOrder" ); if ( d->attributeOrder.empty() ) std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder, @@ -529,7 +529,7 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) { if ( order.empty() ) std::copy( defaultOrder, defaultOrder + sizeof defaultOrder / sizeof *defaultOrder, std::back_inserter( d->attributeOrder ) ); - TDEConfigGroup config( kapp->config(), "DN" ); + TDEConfigGroup config( tdeApp->config(), "DN" ); config.writeEntry( "AttributeOrder", order ); } diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index c9bdbffd..493a61a0 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TQStringList; class TQWidget; @@ -49,7 +49,7 @@ namespace Kleo { /** @short DN Attribute mapper */ - class KDE_EXPORT DNAttributeMapper { + class TDE_EXPORT DNAttributeMapper { DNAttributeMapper(); ~DNAttributeMapper(); public: @@ -73,7 +73,7 @@ namespace Kleo { /** @short DN parser and reorderer */ - class KDE_EXPORT DN { + class TDE_EXPORT DN { public: class Attribute; typedef TQValueVector<Attribute> AttributeList; @@ -110,7 +110,7 @@ namespace Kleo { Private * d; }; - class KDE_EXPORT DN::Attribute { + class TDE_EXPORT DN::Attribute { public: typedef DN::AttributeList List; diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h index e1f52cd7..ee2546b4 100644 --- a/certmanager/lib/kleo/downloadjob.h +++ b/certmanager/lib/kleo/downloadjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class DownloadJob : public Job { - Q_OBJECT + TQ_OBJECT protected: DownloadJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h index f55ab76d..8fa20d23 100644 --- a/certmanager/lib/kleo/encryptjob.h +++ b/certmanager/lib/kleo/encryptjob.h @@ -62,7 +62,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class EncryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: EncryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 07e93c49..a10bc592 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <tdepimmacros.h> +#include <tdemacros.h> class TQString; class TQStringList; @@ -50,12 +50,12 @@ namespace Kleo { AutoFormat = AnyOpenPGP|AnySMIME }; - KDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f ); + TDE_EXPORT TQString cryptoMessageFormatToLabel( CryptoMessageFormat f ); - KDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f ); - KDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f ); - KDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s ); - KDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl ); + TDE_EXPORT const char * cryptoMessageFormatToString( CryptoMessageFormat f ); + TDE_EXPORT TQStringList cryptoMessageFormatsToStringList( unsigned int f ); + TDE_EXPORT CryptoMessageFormat stringToCryptoMessageFormat( const TQString & s ); + TDE_EXPORT unsigned int stringListToCryptoMessageFormats( const TQStringList & sl ); enum Action { Conflict, DoIt, DontDoIt, Ask, AskOpportunistic, Impossible @@ -71,9 +71,9 @@ namespace Kleo { MaxEncryptionPreference = AskWheneverPossible }; - KDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref ); - KDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref ); - KDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str ); + TDE_EXPORT TQString encryptionPreferenceToLabel( EncryptionPreference pref ); + TDE_EXPORT const char* encryptionPreferenceToString( EncryptionPreference pref ); + TDE_EXPORT EncryptionPreference stringToEncryptionPreference( const TQString& str ); enum SigningPreference { UnknownSigningPreference = 0, @@ -85,9 +85,9 @@ namespace Kleo { MaxSigningPreference = AskSigningWheneverPossible }; - KDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref ) KDE_EXPORT; - KDE_EXPORT const char* signingPreferenceToString( SigningPreference pref ) KDE_EXPORT; - KDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str ); + TDE_EXPORT TQString signingPreferenceToLabel( SigningPreference pref ); + TDE_EXPORT const char* signingPreferenceToString( SigningPreference pref ); + TDE_EXPORT SigningPreference stringToSigningPreference( const TQString& str ); } #endif // __KLEO_CRYPTOBACKEND_H__ diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h index 69ad8e5c..4d9259f8 100644 --- a/certmanager/lib/kleo/exportjob.h +++ b/certmanager/lib/kleo/exportjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class ExportJob : public Job { - Q_OBJECT + TQ_OBJECT protected: ExportJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index 65b59725..03bb267f 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); TQStringList patterns; for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it ) diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index 0b74d2f9..6920bec9 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include <gpgmepp/keylistresult.h> @@ -68,8 +68,8 @@ namespace Kleo { After result() is emitted, the HierarchicalKeyListJob will schedule its own destruction by calling TQObject::deleteLater(). */ - class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob { - Q_OBJECT + class TDE_EXPORT HierarchicalKeyListJob : public KeyListJob { + TQ_OBJECT public: HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol, diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h index bd0a6f04..6468e670 100644 --- a/certmanager/lib/kleo/importjob.h +++ b/certmanager/lib/kleo/importjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class ImportJob : public Job { - Q_OBJECT + TQ_OBJECT protected: ImportJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 907a7448..eb638592 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name ) : TQObject( parent, name ) { if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) ); } Kleo::Job::~Job() { diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h index 00087566..52630c30 100644 --- a/certmanager/lib/kleo/job.h +++ b/certmanager/lib/kleo/job.h @@ -62,7 +62,7 @@ namespace Kleo { carry the information that the operation was canceled. */ class Job : public TQObject { - Q_OBJECT + TQ_OBJECT protected: Job( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 1aa2b170..2c5b5a35 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) d = new Private(); // ### DF: doesn't a KStaticDeleter work more reliably? if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); reload(); } diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index a573934d..40f3687d 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace GpgME { class Key; } @@ -45,8 +45,8 @@ namespace Kleo { namespace Kleo { - class KDE_EXPORT KeyFilterManager : public TQObject { - Q_OBJECT + class TDE_EXPORT KeyFilterManager : public TQObject { + TQ_OBJECT protected: KeyFilterManager( TQObject * parent=0, const char * name=0 ); diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h index b0d94993..d2f5c50d 100644 --- a/certmanager/lib/kleo/keygenerationjob.h +++ b/certmanager/lib/kleo/keygenerationjob.h @@ -59,7 +59,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class KeyGenerationJob : public Job { - Q_OBJECT + TQ_OBJECT protected: KeyGenerationJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h index 3560f7b8..807c7954 100644 --- a/certmanager/lib/kleo/keylistjob.h +++ b/certmanager/lib/kleo/keylistjob.h @@ -63,7 +63,7 @@ namespace Kleo { TQObject::deleteLater(). */ class KeyListJob : public Job { - Q_OBJECT + TQ_OBJECT protected: KeyListJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7c83c24b..9aafdd79 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) ); return mJob->start( *mIt, mAllowSecretKeyDeletion ); } diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index d927c927..0bc8d329 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include <tqguardedptr.h> #include <vector> @@ -64,8 +64,8 @@ namespace Kleo { After result() is emitted, the MultiDeleteJob will schedule it's own destruction by calling TQObject::deleteLater(). */ - class KDE_EXPORT MultiDeleteJob : public Job { - Q_OBJECT + class TDE_EXPORT MultiDeleteJob : public Job { + TQ_OBJECT public: MultiDeleteJob( const CryptoBackend::Protocol * protocol ); diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h index 7a55f106..aa283fd4 100644 --- a/certmanager/lib/kleo/refreshkeysjob.h +++ b/certmanager/lib/kleo/refreshkeysjob.h @@ -60,7 +60,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class RefreshKeysJob : public Job { - Q_OBJECT + TQ_OBJECT protected: RefreshKeysJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h index 0f31897e..160eb32e 100644 --- a/certmanager/lib/kleo/signencryptjob.h +++ b/certmanager/lib/kleo/signencryptjob.h @@ -65,7 +65,7 @@ namespace Kleo { own destruction by calling TQObject::deleteLater(). */ class SignEncryptJob : public Job { - Q_OBJECT + TQ_OBJECT protected: SignEncryptJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h index fdeb9a84..54c64a7f 100644 --- a/certmanager/lib/kleo/signjob.h +++ b/certmanager/lib/kleo/signjob.h @@ -63,7 +63,7 @@ namespace Kleo { destruction by calling TQObject::deleteLater(). */ class SignJob : public Job { - Q_OBJECT + TQ_OBJECT protected: SignJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h index c5bc1896..8656b8ac 100644 --- a/certmanager/lib/kleo/specialjob.h +++ b/certmanager/lib/kleo/specialjob.h @@ -63,7 +63,7 @@ namespace Kleo { to be defined in each SpecialJob subclass. */ class SpecialJob : public Job { - Q_OBJECT + TQ_OBJECT protected: SpecialJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h index 01cc6377..25f00756 100644 --- a/certmanager/lib/kleo/verifydetachedjob.h +++ b/certmanager/lib/kleo/verifydetachedjob.h @@ -60,7 +60,7 @@ namespace Kleo { it's own destruction by calling TQObject::deleteLater(). */ class VerifyDetachedJob : public Job { - Q_OBJECT + TQ_OBJECT protected: VerifyDetachedJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h index 387782df..8e0bdd31 100644 --- a/certmanager/lib/kleo/verifyopaquejob.h +++ b/certmanager/lib/kleo/verifyopaquejob.h @@ -60,7 +60,7 @@ namespace Kleo { it's own destruction by calling TQObject::deleteLater(). */ class VerifyOpaqueJob : public Job { - Q_OBJECT + TQ_OBJECT protected: VerifyOpaqueJob( TQObject * parent, const char * name ); diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 9a310d49..f9a0e962 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -43,7 +43,7 @@ class TDEProcess; class TQStringList; class GnuPGViewer : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: GnuPGViewer( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data index a4109fbd..5a63ff09 100644 --- a/certmanager/lib/tests/test.data +++ b/certmanager/lib/tests/test.data @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* tests/test_uiserver.cpp This file is part of Kleopatra, the KDE keymanager diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 01e5d109..3fdc9938 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { if ( !process ) return; mProcess = process; - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp index ba26bfb5..661e07da 100644 --- a/certmanager/lib/tests/test_jobs.cpp +++ b/certmanager/lib/tests/test_jobs.cpp @@ -61,8 +61,8 @@ static void testSign() std::vector<GpgME::Key> signingKeys; - std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting - if ( listJob.get() ) { + std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting + if ( listJob ) { // ##### Adjust this to your own identity listJob->exec( "faure@kde.org", true /*secret*/, signingKeys ); assert( !signingKeys.empty() ); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b678e29d..ef8f8878 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) glay->setRowStretch( row, 1 ); glay->setColStretch( 1, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) ); } KeyGenerator::~KeyGenerator() {} @@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() { Kleo::KeyGenerationJob * job = proto->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); const GpgME::Error err = job->start( params ); if ( err ) diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h index 4bf2acaa..952b4d53 100644 --- a/certmanager/lib/tests/test_keygen.h +++ b/certmanager/lib/tests/test_keygen.h @@ -44,7 +44,7 @@ namespace GpgME { class TQLineEdit; class KeyGenerator : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 ); diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 0e357b59..38b9085b 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -115,10 +115,10 @@ void CertListView::slotStart() { kdDebug() << "CertListView::slotStart()" << endl; Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); #if 0 TQStringList l; l << "Marc"; @@ -138,7 +138,7 @@ int main( int argc, char** argv ) { app.setMainWidget( clv ); clv->show(); - TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) ); + TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) ); return app.exec(); } diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h index 58eeac4a..1d6b1611 100644 --- a/certmanager/lib/tests/test_keylister.h +++ b/certmanager/lib/tests/test_keylister.h @@ -40,7 +40,7 @@ namespace GpgME { } class CertListView : public Kleo::KeyListView { - Q_OBJECT + TQ_OBJECT public: CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 ); diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 1c548c5b..ed1a3317 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -44,12 +44,12 @@ * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* parent, const char* name, bool modal, WFlags fl ) : AddDirectoryServiceDialog( parent, name, modal, fl ) { - portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) ); + portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); } /* diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index f8924dac..bc6af010 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -36,11 +36,11 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog { - Q_OBJECT + TQ_OBJECT public: - AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~AddDirectoryServiceDialogImpl(); }; diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index a97b0020..43b1c13f 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing @@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureButtonClicked()) ); d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -304,9 +304,9 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { int result = dlg.exec(); if ( result == TQDialog::Accepted ) { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed - kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index f0131547..7f965773 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace Kleo { class CryptoBackendFactory; @@ -45,8 +45,8 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT BackendConfigWidget : public TQWidget { - Q_OBJECT + class TDE_EXPORT BackendConfigWidget : public TQWidget { + TQ_OBJECT public: BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 ); diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 4ec32cbb..40608ee1 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); + connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); if ( mMainWidget->hasError() ) { showButton( Default, false ); diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 3f6ba328..f16ff948 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace Kleo { @@ -43,9 +43,9 @@ namespace Kleo { /** * Simple KDialogBase wrapper around CryptoConfigModule */ - class KDE_EXPORT CryptoConfigDialog : public KDialogBase + class TDE_EXPORT CryptoConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 ); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index cfe15442..c6e5594f 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( const char* name ) : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) ); } TQString Kleo::CryptoConfigEntryGUI::description() const @@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); + connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) ); } } @@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); } } @@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) ); } } @@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); + connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 2902423c..dd0d3421 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -46,7 +46,7 @@ namespace Kleo { * It's a simple TQWidget so that it can be embedded into a dialog or into a TDECModule. */ class CryptoConfigModule : public KJanusWidget { - Q_OBJECT + TQ_OBJECT public: CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index c841a092..652d2071 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -57,7 +57,7 @@ namespace Kleo { * A widget corresponding to a component in the crypto config */ class CryptoConfigComponentGUI : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ namespace Kleo { * A class managing widgets corresponding to a group in the crypto config */ class CryptoConfigGroupGUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ namespace Kleo { * Base class for the widget managers tied to an entry in the crypto config */ class CryptoConfigEntryGUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: CryptoConfigEntryGUI( CryptoConfigModule* module, @@ -147,7 +147,7 @@ namespace Kleo { * A widget manager for a string entry in the crypto config */ class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -167,7 +167,7 @@ namespace Kleo { * A widget manager for a path entry in the crypto config */ class CryptoConfigEntryPath : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -187,7 +187,7 @@ namespace Kleo { * A widget manager for a directory path entry in the crypto config */ class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -207,7 +207,7 @@ namespace Kleo { * A widget manager for an URL entry in the crypto config */ class CryptoConfigEntryURL : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -227,7 +227,7 @@ namespace Kleo { * A widget manager for an int/uint entry in the crypto config */ class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -247,7 +247,7 @@ namespace Kleo { * A widget manager for a bool entry in the crypto config */ class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: @@ -266,7 +266,7 @@ namespace Kleo { * A widget manager for a bool entry in the crypto config */ class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index a98bc5fe..9a97c680 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,16 +34,16 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class CryptPlugWrapper; namespace Kleo { class CryptoConfigEntry; -class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase +class TDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index fcc7d493..c34b16f1 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service <slot>slotMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotAddService()</slot> <slot access="protected">slotDeleteService()</slot> <slot access="protected">slotServiceChanged( TQListViewItem* )</slot> <slot access="protected">slotServiceSelected( TQListViewItem* )</slot> <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index b2f1343a..38c4df9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); - connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); + connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); @@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { @@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap tb->setEnabled( false ); TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b7ba1330..a8fcf934 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace Kleo { class DNAttributeMapper; } @@ -43,8 +43,8 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { - Q_OBJECT + class TDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { + TQ_OBJECT public: /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 118b6b10..2892a05e 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 71c1c928..e9b9646f 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ @@ -45,7 +45,7 @@ #include <tqstring.h> class KDHorizontalLine : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) public: diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 0ee6d865..fd796b8d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyapprovaldialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients d->selfRequester->setKeys( sender ); glay->addWidget( d->selfRequester, row, 1 ); ++row; - glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 ); + glay->addMultiCellWidget( new KSeparator( TQt::Horizontal, view ), row, row, 0, 1 ); } const TQStringList prefs = preferencesStrings(); @@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index bd953fa3..25c82fcf 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> @@ -55,8 +55,8 @@ class TQStringList; namespace Kleo { - class KDE_EXPORT KeyApprovalDialog : public KDialogBase { - Q_OBJECT + class TDE_EXPORT KeyApprovalDialog : public KDialogBase { + TQ_OBJECT public: struct Item { diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 00f69500..af067b1e 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -123,14 +123,14 @@ static const struct { const char * source; const char * target; } signalReplacements[] = { - { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, - { TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, - { TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, + { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; @@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); d->updateTimer = new TQTimer( this ); - connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 4149cb41..0db1b1e3 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TQPainter; class TQColorGroup; @@ -62,7 +62,7 @@ namespace Kleo { class KeyListView; - class KDE_EXPORT KeyListViewItem : public TQListViewItem { + class TDE_EXPORT KeyListViewItem : public TQListViewItem { public: KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); @@ -101,7 +101,7 @@ namespace Kleo { GpgME::Key mKey; }; - class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); @@ -133,7 +133,7 @@ namespace Kleo { GpgME::Subkey mSubkey; }; - class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); @@ -165,7 +165,7 @@ namespace Kleo { GpgME::UserID mUserID; }; - class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); @@ -198,13 +198,13 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public TDEListView { - Q_OBJECT + class TDE_EXPORT KeyListView : public TDEListView { + TQ_OBJECT friend class KeyListViewItem; public: - class KDE_EXPORT ColumnStrategy { + class TDE_EXPORT ColumnStrategy { public: virtual ~ColumnStrategy(); virtual TQString title( int column ) const = 0; @@ -232,7 +232,7 @@ namespace Kleo { virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const; }; - class KDE_EXPORT DisplayStrategy { + class TDE_EXPORT DisplayStrategy { public: virtual ~DisplayStrategy(); //font diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c9516a2b..6dd1b05e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -130,8 +130,8 @@ void Kleo::KeyRequester::init() hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 899d3cde..ba383335 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.h This file is part of libkleopatra, the KDE keymanagement library @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace Kleo { class KeyListView; @@ -73,8 +73,8 @@ class TQLabel; namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester - class KDE_EXPORT KeyRequester : public TQWidget { - Q_OBJECT + class TDE_EXPORT KeyRequester : public TQWidget { + TQ_OBJECT public: KeyRequester( unsigned int allowedKeys, bool multipleKeys=false, @@ -159,8 +159,8 @@ namespace Kleo { }; - class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { - Q_OBJECT + class TDE_EXPORT EncryptionKeyRequester : public KeyRequester { + TQ_OBJECT public: enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME }; @@ -187,8 +187,8 @@ namespace Kleo { }; - class KDE_EXPORT SigningKeyRequester : public KeyRequester { - Q_OBJECT + class TDE_EXPORT SigningKeyRequester : public KeyRequester { + TQ_OBJECT public: enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME }; diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index c46228a4..78bb441d 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -60,7 +60,7 @@ #include <twin.h> #include <tdeconfig.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kactivelabel.h> #include <kurl.h> @@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection if ( !text.isEmpty() ) { if ( text.startsWith( "<qt>" ) ) { 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&)) ); + disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) ); + connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) ); textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { @@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQPushButton * const searchExternalPB = new TQPushButton( i18n("Search for &External Certificates"), page ); mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft ); - connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) ); + connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) ); if ( initialQuery.isEmpty() ) searchExternalPB->hide(); @@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); mKeyListView->setResizeMode( TQListView::LastColumn ); @@ -430,27 +430,27 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection "</p></qt>") ); } - connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotTryOk()) ); + TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotTryOk()) ); connect( mKeyListView, - TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), - TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); + TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); - connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); + connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) ); + connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); - if ( kapp ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + if ( tdeApp ) { + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); TQSize dialogSize( 500, 400 ); TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); @@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P return; } - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : - TQT_SLOT(slotAddKey(const GpgME::Key&)) ); + TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQ_SLOT(slotAddKey(const GpgME::Key&)) ); TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); @@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo mCurrentContextMenuItem = item; TQPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) ); menu.exec( p ); } diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index 630255c1..60442558 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include <vector> class TQVBoxLayout; @@ -63,8 +63,8 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT KeySelectionDialog : public KDialogBase { - Q_OBJECT + class TDE_EXPORT KeySelectionDialog : public KDialogBase { + TQ_OBJECT public: diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index fa14bfbe..689c094e 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -74,7 +74,7 @@ static KGuiItem KGuiItem_showAuditLog() { } class AuditLogViewer : public KDialogBase { - // Q_OBJECT + // TQ_OBJECT public: explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 ) diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 990f93cd..68837d38 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.cpp This file is part of libkleopatra, the KDE keymanagement library @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & vlay->addWidget( d->lineedit ); - connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 6515fa4c..15d0a157 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -54,7 +54,7 @@ namespace Kleo { class PassphraseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PassphraseDialog( const TQString & description, diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 6fe2f531..8c530a56 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); + connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) ); fixup( true ); } diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 51f86dad..4119a1d7 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <tdepimmacros.h> +#include <tdemacros.h> class TQTimer; namespace Kleo { @@ -42,8 +42,8 @@ namespace Kleo { /** @short A TQProgressBar with self-powered busy indicator */ - class KDE_EXPORT ProgressBar : public TQProgressBar { - Q_OBJECT + class TDE_EXPORT ProgressBar : public TQProgressBar { + TQ_OBJECT public: ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 692ee4cb..b99db7cb 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, setLabelText( baseText ); setProgress( 0, 0 ); // activate busy indicator - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); - connect( this, TQT_SIGNAL(canceled()), - job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) ); + connect( this, TQ_SIGNAL(canceled()), + job, TQ_SLOT(slotCancel()) ); - TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) ); } Kleo::ProgressDialog::~ProgressDialog() { @@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() { void Kleo::ProgressDialog::setMinimumDuration( int ms ) { if ( 0 < ms && ms < minimumDuration() ) - TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) ); TQProgressDialog::setMinimumDuration( ms ); } diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index dadfd769..7414cb08 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <tdemacros.h> namespace Kleo { class Job; @@ -43,8 +43,8 @@ namespace Kleo { /** @short A progress dialog for Kleo::Jobs */ - class KDE_EXPORT ProgressDialog : public TQProgressDialog { - Q_OBJECT + class TDE_EXPORT ProgressDialog : public TQProgressDialog { + TQ_OBJECT public: ProgressDialog( Job * job, const TQString & baseText, |