diff options
Diffstat (limited to 'certmanager/lib/backends/qgpgme')
40 files changed, 288 insertions, 270 deletions
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index 9e7461791..d179aa953 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -56,8 +56,8 @@ struct Kleo::GnuPGProcessBase::Private { }; -Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name ) - : KProcess( parent, name ) +Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * tqparent, const char * name ) + : KProcess( tqparent, name ) { d = new Private(); } @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->useStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); - connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); + connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildtqStatus(int)) ); } return KProcess::commSetupDoneP(); } @@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() { return KProcess::commSetupDoneC(); } -void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) { - if ( !childStatus(fd) ) - closeStatus(); +void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) { + if ( !childtqStatus(fd) ) + closetqStatus(); } -bool Kleo::GnuPGProcessBase::closeStatus() { +bool Kleo::GnuPGProcessBase::closetqStatus() { if ( !d->useStatusFD ) return false; d->useStatusFD = false; @@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closeStatus() { return true; } -int Kleo::GnuPGProcessBase::childStatus( int fd ) { +int Kleo::GnuPGProcessBase::childtqStatus( int fd ) { char buf[1024]; const int len = ::read( fd, buf, sizeof(buf)-1 ); if ( len > 0 ) { @@ -158,28 +158,28 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() { static const int startTokenLen = sizeof startToken / sizeof *startToken - 1; int lineStart = 0; - for ( int lineEnd = d->statusBuffer.find( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.find( '\n', lineStart = lineEnd+1 ) ) { + for ( int lineEnd = d->statusBuffer.tqfind( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.tqfind( '\n', lineStart = lineEnd+1 ) ) { // get next line: const TQCString line = d->statusBuffer.mid( lineStart, lineEnd - lineStart ).stripWhiteSpace(); if ( line.isEmpty() ) continue; // check status token if ( line.left( startTokenLen ) != startToken ) { - kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line doesn't begin with \"" + kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line doesn't begin with \"" << startToken << "\"" << endl; continue; } // remove status token: const TQCString command = line.mid( startTokenLen ).simplifyWhiteSpace() + ' '; if ( command == " " ) { - kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line without content." << endl; + kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line without content." << endl; continue; } // split into base and args TQString cmd; TQStringList args; int tagStart = 0; - for ( int tagEnd = command.find( ' ' ) ; tagEnd >= 0 ; tagEnd = command.find( ' ', tagStart = tagEnd+1 ) ) { + for ( int tagEnd = command.tqfind( ' ' ) ; tagEnd >= 0 ; tagEnd = command.tqfind( ' ', tagStart = tagEnd+1 ) ) { const TQCString tag = command.mid( tagStart, tagEnd - tagStart ); if ( cmd.isNull() ) cmd = fromHexEscapedUtf8( tag ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 9abe5b88d..46b7f2873 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,9 @@ namespace Kleo { */ class GnuPGProcessBase : public KProcess { Q_OBJECT + TQ_OBJECT public: - GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); + GnuPGProcessBase( TQObject * tqparent=0, const char * name=0 ); ~GnuPGProcessBase(); void setUseStatusFD( bool use ); @@ -56,7 +57,7 @@ namespace Kleo { /*! reimplementation */ bool start( RunMode runmode, Communication comm ); - bool closeStatus(); + bool closetqStatus(); signals: void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ); @@ -69,11 +70,11 @@ namespace Kleo { /*! reimplementation */ int commSetupDoneC(); - int childStatus( int fd ); + int childtqStatus( int fd ); private slots: - void slotChildStatus( int fd ); + void slotChildtqStatus( int fd ); private: void parseStatusOutput(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 5905bc5ee..27680585b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h index c4971e62a..a23c08d44 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h @@ -20,19 +20,19 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEBACKEND_H__ -#define __KLEO_QGPGMEBACKEND_H__ +#ifndef __KLEO_TQGPGMEBACKEND_H__ +#define __KLEO_TQGPGMEBACKEND_H__ #include "kleo/cryptobackend.h" @@ -79,4 +79,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEBACKEND_H__ +#endif // __KLEO_TQGPGMEBACKEND_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 6dc5c5e3a..3aa3b336b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -131,7 +131,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name { if ( !mParsed ) const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false ); - return mComponents.find( name ); + return mComponents.tqfind( name ); } void QGpgMECryptoConfig::sync( bool runtime ) @@ -215,7 +215,7 @@ void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc ) } else { // normal entry if ( !mCurrentGroup ) { // first toplevel entry -> create toplevel group - mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString::null, 0 ); + mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString(), 0 ); mCurrentGroupName = "<nogroup>"; } mCurrentGroup->mEntries.insert( lst[0], new QGpgMECryptoConfigEntry( lst ) ); @@ -240,7 +240,7 @@ TQStringList QGpgMECryptoConfigComponent::groupList() const Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const { - return mGroups.find( name ); + return mGroups.tqfind( name ); } void QGpgMECryptoConfigComponent::sync( bool runtime ) @@ -341,7 +341,7 @@ TQStringList QGpgMECryptoConfigGroup::entryList() const Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const { - return mEntries.find( name ); + return mEntries.tqfind( name ); } //// @@ -460,7 +460,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes TQString val = *valit; if ( isString ) { if ( val.isEmpty() ) { - lst << TQString::null; + lst << TQString(); continue; } else if ( unescape ) { @@ -476,7 +476,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes TQString val( str ); if ( isString ) { if ( val.isEmpty() ) - return TQVariant( TQString::null ); // not set [ok with lists too?] + return TQVariant( TQString() ); // not set [ok with lists too?] else if ( unescape ) { Q_ASSERT( val[0] == '"' ); // see README.gpgconf val = val.mid( 1 ); @@ -787,7 +787,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const // Basically the opposite of stringToValue if ( isStringType() ) { if ( mValue.isNull() ) - return TQString::null; + return TQString(); else if ( isList() ) { // string list TQStringList lst = mValue.toStringList(); if ( escape ) { @@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const if ( !isList() ) // non-list non-string { if ( mArgType == ArgType_None ) { - return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null; + return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString(); } else { // some int Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt ); return mValue.toString(); // int to string conversion diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h index 20a01d315..de766de30 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef KLEO_QGPGMECRYPTOCONFIG_H -#define KLEO_QGPGMECRYPTOCONFIG_H +#ifndef KLEO_TQGPGMECRYPTOCONFIG_H +#define KLEO_TQGPGMECRYPTOCONFIG_H #include <kleo/cryptoconfig.h> #include <tqdict.h> @@ -49,6 +49,7 @@ class QGpgMECryptoConfigEntry; class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig { Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -80,6 +81,7 @@ class QGpgMECryptoConfigGroup; class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent { Q_OBJECT + TQ_OBJECT public: QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description ); ~QGpgMECryptoConfigComponent(); @@ -112,7 +114,7 @@ public: ~QGpgMECryptoConfigGroup() {} TQString name() const { return mName; } - TQString iconName() const { return TQString::null; } + TQString iconName() const { return TQString(); } TQString description() const { return mDescription; } Kleo::CryptoConfigEntry::Level level() const { return mLevel; } TQStringList entryList() const; @@ -183,4 +185,4 @@ private: uint mSet : 1; }; -#endif /* KLEO_QGPGMECRYPTOCONFIG_H */ +#endif /* KLEO_TQGPGMECRYPTOCONFIG_H */ diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp index 15d3246fe..da0052986 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h index 133806694..78e17304b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEDECRYPTJOB_H__ -#define __KLEO_QGPGMEDECRYPTJOB_H__ +#ifndef __KLEO_TQGPGMEDECRYPTJOB_H__ +#define __KLEO_TQGPGMEDECRYPTJOB_H__ #include <kleo/decryptjob.h> @@ -47,7 +47,8 @@ namespace GpgME { namespace Kleo { class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptJob( GpgME::Context * context ); ~QGpgMEDecryptJob(); @@ -71,4 +72,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEDECRYPTJOB_H__ +#endif // __KLEO_TQGPGMEDECRYPTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp index a14e7e18f..f8c7db6a5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 58da84d07..31db6a6ff 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEDECRYPTVERIFYJOB_H__ -#define __KLEO_QGPGMEDECRYPTVERIFYJOB_H__ +#ifndef __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__ +#define __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__ #include <kleo/decryptverifyjob.h> @@ -48,7 +48,8 @@ namespace GpgME { namespace Kleo { class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDecryptVerifyJob( GpgME::Context * context ); ~QGpgMEDecryptVerifyJob(); @@ -72,4 +73,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEDECRYPTVERIFYJOB_H__ +#endif // __KLEO_TQGPGMEDECRYPTVERIFYJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp index 3665ee668..46edada1a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h index 9dec128f7..992404a23 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEDELETEJOB_H__ -#define __KLEO_QGPGMEDELETEJOB_H__ +#ifndef __KLEO_TQGPGMEDELETEJOB_H__ +#define __KLEO_TQGPGMEDELETEJOB_H__ #include <kleo/deletejob.h> @@ -46,7 +46,8 @@ namespace GpgME { namespace Kleo { class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDeleteJob( GpgME::Context * context ); ~QGpgMEDeleteJob(); @@ -65,4 +66,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEDELETEJOB_H__ +#endif // __KLEO_TQGPGMEDELETEJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp index 979a85490..5f44fb009 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h index 6dc7b209e..76baa88f2 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEDOWNLOADJOB_H__ -#define __KLEO_QGPGMEDOWNLOADJOB_H__ +#ifndef __KLEO_TQGPGMEDOWNLOADJOB_H__ +#define __KLEO_TQGPGMEDOWNLOADJOB_H__ #include <kleo/downloadjob.h> @@ -45,7 +45,8 @@ namespace GpgME { namespace Kleo { class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEDownloadJob( GpgME::Context * context ); ~QGpgMEDownloadJob(); @@ -64,4 +65,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEDOWNLOADJOB_H__ +#endif // __KLEO_TQGPGMEDOWNLOADJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp index a6a380b0b..8350f19bb 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -103,9 +103,9 @@ void Kleo::QGpgMEEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, ciphertext ); } -void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { +void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( parent, mResult, this, caption ); + Kleo::MessageBox::error( tqparent, mResult, this, caption ); } #include "qgpgmeencryptjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index ecc7afd87..640ff8c35 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEENCRYPTJOB_H__ -#define __KLEO_QGPGMEENCRYPTJOB_H__ +#ifndef __KLEO_TQGPGMEENCRYPTJOB_H__ +#define __KLEO_TQGPGMEENCRYPTJOB_H__ #include <kleo/encryptjob.h> @@ -50,7 +50,8 @@ namespace GpgME { namespace Kleo { class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEEncryptJob( GpgME::Context * context ); ~QGpgMEEncryptJob(); @@ -65,7 +66,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * parent, const TQString & caption ) const; + void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { @@ -83,4 +84,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEENCRYPTJOB_H__ +#endif // __KLEO_TQGPGMEENCRYPTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp index 16e5fb773..d4a4320b4 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h index 2c13f4090..11bcec18f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEEXPORTJOB_H__ -#define __KLEO_QGPGMEEXPORTJOB_H__ +#ifndef __KLEO_TQGPGMEEXPORTJOB_H__ +#define __KLEO_TQGPGMEEXPORTJOB_H__ #include <kleo/exportjob.h> @@ -47,7 +47,8 @@ namespace GpgME { namespace Kleo { class QGpgMEExportJob : public ExportJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEExportJob( GpgME::Context * context ); ~QGpgMEExportJob(); @@ -66,4 +67,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEEXPORTJOB_H__ +#endif // __KLEO_TQGPGMEEXPORTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp index 80792161f..302bf7637 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h index f9b208398..e98eab6e3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEIMPORTJOB_H__ -#define __KLEO_QGPGMEIMPORTJOB_H__ +#ifndef __KLEO_TQGPGMEIMPORTJOB_H__ +#define __KLEO_TQGPGMEIMPORTJOB_H__ #include <kleo/importjob.h> @@ -47,7 +47,8 @@ namespace GpgME { namespace Kleo { class QGpgMEImportJob : public ImportJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEImportJob( GpgME::Context * context ); ~QGpgMEImportJob(); @@ -70,4 +71,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEIMPORTJOB_H__ +#endif // __KLEO_TQGPGMEIMPORTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 6d7ae5b45..61da793ed 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -223,13 +223,13 @@ GpgME::Error Kleo::QGpgMEJob::setSigningKeys( const std::vector<GpgME::Key> & si } void Kleo::QGpgMEJob::createInData( const TQByteArray & in ) { - mInDataDataProvider = new QGpgME::QByteArrayDataProvider( in ); + mInDataDataProvider = new QGpgME::TQByteArrayDataProvider( in ); mInData = new GpgME::Data( mInDataDataProvider ); assert( !mInData->isNull() ); } void Kleo::QGpgMEJob::createOutData() { - mOutDataDataProvider = new QGpgME::QByteArrayDataProvider(); + mOutDataDataProvider = new QGpgME::TQByteArrayDataProvider(); mOutData = new GpgME::Data( mOutDataDataProvider ); assert( !mOutData->isNull() ); } @@ -238,7 +238,7 @@ static const unsigned int GetAuditLogFlags = GpgME::Context::AuditLogWithHelp|Gp static TQString audit_log_as_html( GpgME::Context * ctx, GpgME::Error & err ) { assert( ctx ); - QGpgME::QByteArrayDataProvider dp; + QGpgME::TQByteArrayDataProvider dp; GpgME::Data data( &dp ); assert( !data.isNull() ); if ( ( err = ctx->getAuditLog( data, GetAuditLogFlags ) ) ) diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 4a03d7d94..4f393cfb9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEJOB_H__ -#define __KLEO_QGPGMEJOB_H__ +#ifndef __KLEO_TQGPGMEJOB_H__ +#define __KLEO_TQGPGMEJOB_H__ #include <gpgmepp/interfaces/progressprovider.h> #include <gpgmepp/interfaces/passphraseprovider.h> @@ -54,7 +54,7 @@ namespace Kleo { } namespace QGpgME { - class QByteArrayDataProvider; + class TQByteArrayDataProvider; } class TQString; @@ -63,14 +63,14 @@ class TQStringList; namespace Kleo { /** This is a hackish helper class to avoid code duplication in this - backend's Kleo::Job subclasses. It tqcontains several workarounds + backend's Kleo::Job subclasses. It contains several workarounds for tqmoc/signal/slot shortcomings, most of which the author of - this thinks are Qt bugs (lazy implementations), first and + this thinks are TQt bugs (lazy implementations), first and foremost the inability of tqmoc to handle inheritance from - multiple QObject-derived subclasses. + multiple TQObject-derived subclasses. To use it, inherit from the Job-subclass, then from this class, - add QGPGME_JOB to just after Q OBJECT and implement + add TQGPGME_JOB to just after Q OBJECT and implement doOperationDoneEvent() by emitting your variant of the result() signal there. Pass "this" as the first argument this QGpgMEJOb's ctor. The rest is dealt with automatically. @@ -98,9 +98,9 @@ namespace Kleo { void setChunkSize( unsigned int size ); /*! @return current chunksize */ unsigned int chunkSize() const { return mChunkSize; } - /*! Creates an empty GpgME::Data/QGpgME::QByteArrayDataProvider pair */ + /*! Creates an empty GpgME::Data/QGpgME::TQByteArrayDataProvider pair */ void createOutData(); - /*! Creates a GpgME::Data/QGpgME::QByteArrayDataProvider pair, + /*! Creates a GpgME::Data/QGpgME::TQByteArrayDataProvider pair, filled with the contents of \a in */ void createInData( const TQByteArray & in ); /*! Sets the list of signing keys */ @@ -135,12 +135,12 @@ namespace Kleo { Kleo::Job * mThis; GpgME::Context * mCtx; GpgME::Data * mInData; - QGpgME::QByteArrayDataProvider * mInDataDataProvider; + QGpgME::TQByteArrayDataProvider * mInDataDataProvider; GpgME::Data * mOutData; - QGpgME::QByteArrayDataProvider * mOutDataDataProvider; + QGpgME::TQByteArrayDataProvider * mOutDataDataProvider; private: const char* * mPatterns; - // holds the entry - if any - in mPattern that was tqreplaced with + // holds the entry - if any - in mPattern that was replaced with // NULL to create a temporary end-of-array marker for gpgme: const char * mReplacedPattern; unsigned int mNumPatterns; @@ -156,6 +156,6 @@ namespace Kleo { #define make_progress_emitter private: void doEmitProgressSignal( const TQString & what, int cur, int tot ) { emit progress( what, cur, tot ); } #define make_done_emitter private: void doEmitDoneSignal() { emit done(); } #define make_auditLogAsHtml private: TQString auditLogAsHtml() const { return QGpgMEJob::auditLogAsHtml(); } GpgME::Error auditLogError() const { return QGpgMEJob::auditLogError(); } -#define QGPGME_JOB make_slot_cancel make_progress_emitter make_done_emitter make_auditLogAsHtml +#define TQGPGME_JOB make_slot_cancel make_progress_emitter make_done_emitter make_auditLogAsHtml -#endif // __KLEO_QGPGMEJOB_H__ +#endif // __KLEO_TQGPGMEJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp index 16e131348..0d79f581f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -64,7 +64,7 @@ GpgME::Error Kleo::QGpgMEKeyGenerationJob::start( const TQString & parameters ) // set up empty data object for the public key data if ( mCtx->protocol() == GpgME::Context::CMS ) { - mPubKeyDataProvider = new QGpgME::QByteArrayDataProvider(); + mPubKeyDataProvider = new QGpgME::TQByteArrayDataProvider(); mPubKey = new GpgME::Data( mPubKeyDataProvider ); assert( !mPubKey->isNull() ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index bf99007fc..93e2efb00 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEKEYGENERATIONJOB_H__ -#define __KLEO_QGPGMEKEYGENERATIONJOB_H__ +#ifndef __KLEO_TQGPGMEKEYGENERATIONJOB_H__ +#define __KLEO_TQGPGMEKEYGENERATIONJOB_H__ #include <kleo/keygenerationjob.h> @@ -46,13 +46,14 @@ namespace GpgME { } namespace QGpgME { - class QByteArrayDataProvider; + class TQByteArrayDataProvider; } namespace Kleo { class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyGenerationJob( GpgME::Context * context ); ~QGpgMEKeyGenerationJob(); @@ -69,10 +70,10 @@ namespace Kleo { void doOperationDoneEvent( const GpgME::Error & e ); private: - QGpgME::QByteArrayDataProvider * mPubKeyDataProvider; + QGpgME::TQByteArrayDataProvider * mPubKeyDataProvider; GpgME::Data * mPubKey; }; } -#endif // __KLEO_QGPGMEKEYGENERATIONJOB_H__ +#endif // __KLEO_TQGPGMEKEYGENERATIONJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index b07135f01..2634579f2 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -190,14 +190,14 @@ void Kleo::QGpgMEKeyListJob::slotOperationDoneEvent( GpgME::Context * context, c deleteLater(); } -void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { +void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { if ( !mResult.error() || mResult.error().isCanceled() ) return; const TQString msg = i18n( "<qt><p>An error occurred while fetching " "the keys from the backend:</p>" "<p><b>%1</b></p></qt>" ) .arg( TQString::fromLocal8Bit( mResult.error().asString() ) ); - KMessageBox::error( parent, msg, caption ); + KMessageBox::error( tqparent, msg, caption ); } #include "qgpgmekeylistjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index 388641076..cf0b3086b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEKEYLISTJOB_H__ -#define __KLEO_QGPGMEKEYLISTJOB_H__ +#ifndef __KLEO_TQGPGMEKEYLISTJOB_H__ +#define __KLEO_TQGPGMEKEYLISTJOB_H__ #include <kleo/keylistjob.h> @@ -48,7 +48,8 @@ namespace GpgME { namespace Kleo { class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEKeyListJob( GpgME::Context * context ); ~QGpgMEKeyListJob(); @@ -60,7 +61,7 @@ namespace Kleo { GpgME::KeyListResult exec( const TQStringList & patterns, bool secretOnly, std::vector<GpgME::Key> & keys ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * parent, const TQString & caption ) const; + void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; private slots: void slotNextKeyEvent( GpgME::Context * context, const GpgME::Key & key ); @@ -79,4 +80,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEKEYLISTJOB_H__ +#endif // __KLEO_TQGPGMEKEYLISTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index 89d9dda36..5f6296781 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -126,26 +126,26 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin TQString Kleo::QGpgMEProgressTokenMapper::map( const char * tokenUtf8, int subtoken, int cur, int tot ) const { if ( !tokenUtf8 || !*tokenUtf8 ) - return TQString::null; + return TQString(); if ( qstrcmp( tokenUtf8, "file:" ) == 0 ) - return TQString::null; // gpgme's job + return TQString(); // gpgme's job return map( TQString::fromUtf8( tokenUtf8 ), subtoken, cur, tot ); } TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subtoken, int cur, int tot ) const { if ( token.startsWith( "file:" ) ) - return TQString::null; // gpgme's job + return TQString(); // gpgme's job static const Map & tokenMap = makeMap(); - const Map::const_iterator it1 = tokenMap.find( token.lower() ); + const Map::const_iterator it1 = tokenMap.tqfind( token.lower() ); if ( it1 == tokenMap.end() ) return token; - std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken ); + std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken ); if ( it2 == it1->second.end() ) - it2 = it1->second.find( 0 ); + it2 = it1->second.tqfind( 0 ); if ( it2 == it1->second.end() ) return token; const Desc & desc = it2->second; diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h index d3731f4fd..3e8fd6221 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.h @@ -20,19 +20,19 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__ -#define __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__ +#ifndef __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__ +#define __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__ class TQString; @@ -55,4 +55,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__ +#endif // __KLEO_TQGPGMEPROGRESSTOKENMAPPER_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 7517b2a8c..234644ddb 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQStr if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index 7246f0a3a..f94957b3f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEREFRESHKEYSJOB_H__ -#define __KLEO_QGPGMEREFRESHKEYSJOB_H__ +#ifndef __KLEO_TQGPGMEREFRESHKEYSJOB_H__ +#define __KLEO_TQGPGMEREFRESHKEYSJOB_H__ #include <kleo/refreshkeysjob.h> @@ -51,6 +51,7 @@ namespace Kleo { class QGpgMERefreshKeysJob : public RefreshKeysJob { Q_OBJECT + TQ_OBJECT public: QGpgMERefreshKeysJob(); ~QGpgMERefreshKeysJob(); @@ -62,7 +63,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); @@ -77,4 +78,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEREFRESHKEYSJOB_H__ +#endif // __KLEO_TQGPGMEREFRESHKEYSJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index d73b4cb10..7111a80ac 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const T if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index cb65d549e..aae3fd222 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMESECRETKEYEXPORTJOB_H__ -#define __KLEO_QGPGMESECRETKEYEXPORTJOB_H__ +#ifndef __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__ +#define __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__ #include <kleo/exportjob.h> @@ -47,7 +47,7 @@ namespace GpgME { } namespace QGpgME { - class QByteArrayDataProvider; + class TQByteArrayDataProvider; } class KProcess; @@ -56,6 +56,7 @@ namespace Kleo { class QGpgMESecretKeyExportJob : public ExportJob { Q_OBJECT + TQ_OBJECT public: QGpgMESecretKeyExportJob( bool armour, const TQString& charset ); ~QGpgMESecretKeyExportJob(); @@ -67,7 +68,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); @@ -82,4 +83,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMESECRETKEYEXPORTJOB_H__ +#endif // __KLEO_TQGPGMESECRETKEYEXPORTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index 9a469001c..28901c303 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -114,10 +114,10 @@ void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult.first, mResult.second, cipherText ); } -void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { +void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { if ( mResult.first.error() && !mResult.first.error().isCanceled() || mResult.second.error() && !mResult.second.error().isCanceled() ) - Kleo::MessageBox::error( parent, mResult.first, mResult.second, this, caption ); + Kleo::MessageBox::error( tqparent, mResult.first, mResult.second, this, caption ); } #include "qgpgmesignencryptjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 003377cfe..e4b2a0be3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMESIGNENCRYPTJOB_H__ -#define __KLEO_QGPGMESIGNENCRYPTJOB_H__ +#ifndef __KLEO_TQGPGMESIGNENCRYPTJOB_H__ +#define __KLEO_TQGPGMESIGNENCRYPTJOB_H__ #include <kleo/signencryptjob.h> @@ -54,7 +54,8 @@ namespace GpgME { namespace Kleo { class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignEncryptJob( GpgME::Context * context ); ~QGpgMESignEncryptJob(); @@ -71,7 +72,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * parent, const TQString & caption ) const; + void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { @@ -88,4 +89,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMESIGNENCRYPTJOB_H__ +#endif // __KLEO_TQGPGMESIGNENCRYPTJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp index 01ae8a91f..4607f2c00 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -108,9 +108,9 @@ void Kleo::QGpgMESignJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, signature ); } -void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { +void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( parent, mResult, this, caption ); + Kleo::MessageBox::error( tqparent, mResult, this, caption ); } #include "qgpgmesignjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 6034b542b..5c16137e7 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMESIGNJOB_H__ -#define __KLEO_QGPGMESIGNJOB_H__ +#ifndef __KLEO_TQGPGMESIGNJOB_H__ +#define __KLEO_TQGPGMESIGNJOB_H__ #include <kleo/signjob.h> @@ -50,7 +50,8 @@ namespace GpgME { namespace Kleo { class QGpgMESignJob : public SignJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMESignJob( GpgME::Context * context ); ~QGpgMESignJob(); @@ -67,7 +68,7 @@ namespace Kleo { TQByteArray & signature ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * parent, const TQString & caption ) const; + void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { @@ -84,4 +85,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMESIGNJOB_H__ +#endif // __KLEO_TQGPGMESIGNJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp index 41fa48494..3b1946133 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,7 +62,7 @@ void Kleo::QGpgMEVerifyDetachedJob::setup( const TQByteArray & signature, const createInData( signature ); // two "in" data objects - (mis|re)use the "out" data object for the second... - mOutDataDataProvider = new QGpgME::QByteArrayDataProvider( signedData ); + mOutDataDataProvider = new QGpgME::TQByteArrayDataProvider( signedData ); mOutData = new GpgME::Data( mOutDataDataProvider ); assert( !mOutData->isNull() ); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h index 4e353fe22..76d1715ba 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEVERIFYDETACHEDJOB_H__ -#define __KLEO_QGPGMEVERIFYDETACHEDJOB_H__ +#ifndef __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__ +#define __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__ #include <kleo/verifydetachedjob.h> @@ -47,7 +47,8 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyDetachedJob( GpgME::Context * context ); ~QGpgMEVerifyDetachedJob(); @@ -72,4 +73,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEVERIFYDETACHEDJOB_H__ +#endif // __KLEO_TQGPGMEVERIFYDETACHEDJOB_H__ diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp index e4340aa39..eb79e281d 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h index 869024f2c..e24b6bc6c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h @@ -20,18 +20,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -#ifndef __KLEO_QGPGMEVERIFYOPAQUEJOB_H__ -#define __KLEO_QGPGMEVERIFYOPAQUEJOB_H__ +#ifndef __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__ +#define __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__ #include <kleo/verifyopaquejob.h> @@ -47,7 +47,8 @@ namespace GpgME { namespace Kleo { class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob { - Q_OBJECT QGPGME_JOB + Q_OBJECT + TQ_OBJECT TQGPGME_JOB public: QGpgMEVerifyOpaqueJob( GpgME::Context * context ); ~QGpgMEVerifyOpaqueJob(); @@ -70,4 +71,4 @@ namespace Kleo { } -#endif // __KLEO_QGPGMEVERIFYOPAQUEJOB_H__ +#endif // __KLEO_TQGPGMEVERIFYOPAQUEJOB_H__ |