From 36a36a5c1015aa0d03f4515c401e907ddb9d6291 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- certmanager/lib/backends/chiasmus/chiasmusjob.cpp | 8 +- .../lib/backends/chiasmus/obtainkeysjob.cpp | 4 +- .../backends/chiasmus/symcryptrunprocessbase.cpp | 4 +- .../lib/backends/chiasmus/symcryptrunprocessbase.h | 2 +- .../lib/backends/qgpgme/gnupgprocessbase.cpp | 4 +- certmanager/lib/backends/qgpgme/gnupgprocessbase.h | 2 +- .../lib/backends/qgpgme/qgpgmeencryptjob.cpp | 4 +- certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h | 2 +- .../lib/backends/qgpgme/qgpgmekeylistjob.cpp | 4 +- certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h | 2 +- .../lib/backends/qgpgme/qgpgmesignencryptjob.cpp | 4 +- .../lib/backends/qgpgme/qgpgmesignencryptjob.h | 2 +- certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp | 4 +- certmanager/lib/backends/qgpgme/qgpgmesignjob.h | 2 +- certmanager/lib/kleo/cryptobackendfactory.cpp | 4 +- certmanager/lib/kleo/cryptobackendfactory.h | 2 +- certmanager/lib/kleo/decryptjob.h | 2 +- certmanager/lib/kleo/decryptverifyjob.h | 2 +- certmanager/lib/kleo/deletejob.h | 2 +- certmanager/lib/kleo/dn.cpp | 4 +- certmanager/lib/kleo/dn.h | 2 +- certmanager/lib/kleo/downloadjob.h | 2 +- certmanager/lib/kleo/encryptjob.h | 2 +- certmanager/lib/kleo/exportjob.h | 2 +- certmanager/lib/kleo/importjob.h | 2 +- certmanager/lib/kleo/job.cpp | 6 +- certmanager/lib/kleo/job.h | 4 +- certmanager/lib/kleo/keyfiltermanager.cpp | 4 +- certmanager/lib/kleo/keyfiltermanager.h | 2 +- certmanager/lib/kleo/keygenerationjob.h | 2 +- certmanager/lib/kleo/keylistjob.h | 2 +- certmanager/lib/kleo/refreshkeysjob.h | 2 +- certmanager/lib/kleo/signencryptjob.h | 2 +- certmanager/lib/kleo/signjob.h | 2 +- certmanager/lib/kleo/specialjob.h | 2 +- certmanager/lib/kleo/verifydetachedjob.h | 2 +- certmanager/lib/kleo/verifyopaquejob.h | 2 +- certmanager/lib/tests/gnupgviewer.h | 2 +- certmanager/lib/tests/test_gnupgprocessbase.cpp | 4 +- certmanager/lib/tests/test_keygen.cpp | 4 +- certmanager/lib/tests/test_keygen.h | 2 +- certmanager/lib/tests/test_keylister.cpp | 4 +- certmanager/lib/tests/test_keylister.h | 2 +- .../lib/ui/adddirectoryservicedialogimpl.cpp | 6 +- certmanager/lib/ui/adddirectoryservicedialogimpl.h | 2 +- certmanager/lib/ui/backendconfigwidget.cpp | 14 +-- certmanager/lib/ui/backendconfigwidget.h | 2 +- certmanager/lib/ui/cryptoconfigdialog.cpp | 4 +- certmanager/lib/ui/cryptoconfigdialog.h | 2 +- certmanager/lib/ui/cryptoconfigmodule.cpp | 8 +- certmanager/lib/ui/cryptoconfigmodule.h | 2 +- certmanager/lib/ui/cryptoconfigmodule_p.h | 18 ++-- certmanager/lib/ui/directoryserviceswidget.cpp | 4 +- certmanager/lib/ui/directoryserviceswidget.h | 2 +- .../lib/ui/dnattributeorderconfigwidget.cpp | 4 +- certmanager/lib/ui/dnattributeorderconfigwidget.h | 4 +- certmanager/lib/ui/kdhorizontalline.cpp | 8 +- certmanager/lib/ui/kdhorizontalline.h | 4 +- certmanager/lib/ui/keyapprovaldialog.cpp | 4 +- certmanager/lib/ui/keyapprovaldialog.h | 2 +- certmanager/lib/ui/keylistview.cpp | 100 ++++++++++----------- certmanager/lib/ui/keylistview.h | 34 +++---- certmanager/lib/ui/keyrequester.cpp | 28 +++--- certmanager/lib/ui/keyrequester.h | 12 +-- certmanager/lib/ui/keyselectiondialog.cpp | 16 ++-- certmanager/lib/ui/keyselectiondialog.h | 6 +- certmanager/lib/ui/messagebox.cpp | 80 ++++++++--------- certmanager/lib/ui/messagebox.h | 40 ++++----- certmanager/lib/ui/passphrasedialog.cpp | 4 +- certmanager/lib/ui/passphrasedialog.h | 2 +- certmanager/lib/ui/progressbar.cpp | 4 +- certmanager/lib/ui/progressbar.h | 2 +- 72 files changed, 271 insertions(+), 271 deletions(-) (limited to 'certmanager/lib') diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index eb5a5ea38..9daaa620d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -163,7 +163,7 @@ void Kleo::ChiasmusJob::showChiasmusOutput() { kdDebug() << k_funcinfo << endl; if ( mStderr.isEmpty() ) return; - KMessageBox::information( 0 /*how to get a tqparent widget?*/, + KMessageBox::information( 0 /*how to get a parent widget?*/, mStderr, i18n( "Output from chiasmus" ) ); } @@ -200,7 +200,7 @@ void Kleo::ChiasmusJob::slotTimeout() { } -void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mError ) return; if ( mError.isCanceled() ) @@ -211,9 +211,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & c .tqarg( TQString::fromLocal8Bit( mError.asString() ) ); if ( !mStderr.isEmpty() ) { const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr ); - KMessageBox::detailedError( tqparent, msg, details, caption ); + KMessageBox::detailedError( parent, msg, details, caption ); } else { - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } } diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index 497a5a54d..eccdf9219 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -114,13 +114,13 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { slotPerform( false ); } -void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::ObtainKeysJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mError ) return; if ( mError.isCanceled() ) return; const TQString msg = TQString::fromUtf8( mError.asString() ); - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } #include "obtainkeysjob.moc" diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index a2408a734..231cf6ad3 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -44,8 +44,8 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, const TQString & program, const TQString & keyFile, const TQString & options, Operation mode, - TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ), + TQObject * parent, const char * name ) + : KProcess( parent, name ), mOperation( mode ), mOptions( options ) { *this << "symcryptrun" diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h index 2fb136fb1..b3a025fdf 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h @@ -51,7 +51,7 @@ public: SymCryptRunProcessBase( const TQString & class_, const TQString & program, const TQString & keyFile, const TQString& options, Operation op, - TQObject * tqparent=0, const char * name=0 ); + TQObject * parent=0, const char * name=0 ); ~SymCryptRunProcessBase(); bool launch( const TQByteArray & input, RunMode rm=NotifyOnExit ); diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index b1d55ac98..5ec4f4111 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -56,8 +56,8 @@ struct Kleo::GnuPGProcessBase::Private { }; -Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * tqparent, const char * name ) - : KProcess( tqparent, name ) +Kleo::GnuPGProcessBase::GnuPGProcessBase( TQObject * parent, const char * name ) + : KProcess( parent, name ) { d = new Private(); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h index 46b7f2873..b6643144a 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - GnuPGProcessBase( TQObject * tqparent=0, const char * name=0 ); + GnuPGProcessBase( TQObject * parent=0, const char * name=0 ); ~GnuPGProcessBase(); void setUseStatusFD( bool use ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp index 8350f19bb..480e6c8a5 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp @@ -103,9 +103,9 @@ void Kleo::QGpgMEEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, ciphertext ); } -void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult, this, caption ); + Kleo::MessageBox::error( parent, mResult, this, caption ); } #include "qgpgmeencryptjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h index 640ff8c35..c367c3525 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h @@ -66,7 +66,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 57afed412..d1d2591da 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -190,14 +190,14 @@ void Kleo::QGpgMEKeyListJob::slotOperationDoneEvent( GpgME::Context * context, c deleteLater(); } -void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( !mResult.error() || mResult.error().isCanceled() ) return; const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) ); - KMessageBox::error( tqparent, msg, caption ); + KMessageBox::error( parent, msg, caption ); } #include "qgpgmekeylistjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h index cf0b3086b..c695967e8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h @@ -61,7 +61,7 @@ namespace Kleo { GpgME::KeyListResult exec( const TQStringList & patterns, bool secretOnly, std::vector & keys ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotNextKeyEvent( GpgME::Context * context, const GpgME::Key & key ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index 28901c303..d5fa009db 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -114,10 +114,10 @@ void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult.first, mResult.second, cipherText ); } -void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.first.error() && !mResult.first.error().isCanceled() || mResult.second.error() && !mResult.second.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult.first, mResult.second, this, caption ); + Kleo::MessageBox::error( parent, 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 e4b2a0be3..a48f32534 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -72,7 +72,7 @@ namespace Kleo { TQByteArray & cipherText ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp index 4607f2c00..db5c225e8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp @@ -108,9 +108,9 @@ void Kleo::QGpgMESignJob::doOperationDoneEvent( const GpgME::Error & ) { emit result( mResult, signature ); } -void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * tqparent, const TQString & caption ) const { +void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const { if ( mResult.error() && !mResult.error().isCanceled() ) - Kleo::MessageBox::error( tqparent, mResult, this, caption ); + Kleo::MessageBox::error( parent, mResult, this, caption ); } #include "qgpgmesignjob.moc" diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h index 5c16137e7..2dd3230ac 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h @@ -68,7 +68,7 @@ namespace Kleo { TQByteArray & signature ); /*! \reimp from Job */ - void showErrorDialog( TQWidget * tqparent, const TQString & caption ) const; + void showErrorDialog( TQWidget * parent, const TQString & caption ) const; private slots: void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) { diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index f4db77ea3..b79e1772b 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -174,8 +174,8 @@ const Kleo::CryptoBackend * Kleo::CryptoBackendFactory::backendByName( const TQS return 0; } -Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * tqparent, const char * name ) const { - return new Kleo::BackendConfigWidget( mSelf, tqparent, name ); +Kleo::BackendConfigWidget * Kleo::CryptoBackendFactory::configWidget( TQWidget * parent, const char * name ) const { + return new Kleo::BackendConfigWidget( mSelf, parent, name ); } KConfig* Kleo::CryptoBackendFactory::configObject() const { diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 8f2990269..c6dd53f7d 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -74,7 +74,7 @@ namespace Kleo { bool hasBackends() const; - Kleo::BackendConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const; + Kleo::BackendConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const; KConfig* configObject() const; diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h index ee5802f88..72bf1b82e 100644 --- a/certmanager/lib/kleo/decryptjob.h +++ b/certmanager/lib/kleo/decryptjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DecryptJob( TQObject * tqparent, const char * name ); + DecryptJob( TQObject * parent, const char * name ); public: ~DecryptJob(); diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h index 0431279ae..e1cdce04b 100644 --- a/certmanager/lib/kleo/decryptverifyjob.h +++ b/certmanager/lib/kleo/decryptverifyjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DecryptVerifyJob( TQObject * tqparent, const char * name ); + DecryptVerifyJob( TQObject * parent, const char * name ); public: ~DecryptVerifyJob(); diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h index e6a3e2232..c48852f9d 100644 --- a/certmanager/lib/kleo/deletejob.h +++ b/certmanager/lib/kleo/deletejob.h @@ -59,7 +59,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DeleteJob( TQObject * tqparent, const char * name ); + DeleteJob( TQObject * parent, const char * name ); public: ~DeleteJob(); diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 7e39185c8..685d241bc 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -533,6 +533,6 @@ void Kleo::DNAttributeMapper::setAttributeOrder( const TQStringList & order ) { config.writeEntry( "AttributeOrder", order ); } -Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * tqparent, const char * name ) const { - return new DNAttributeOrderConfigWidget( mSelf, tqparent, name ); +Kleo::DNAttributeOrderConfigWidget * Kleo::DNAttributeMapper::configWidget( TQWidget * parent, const char * name ) const { + return new DNAttributeOrderConfigWidget( mSelf, parent, name ); } diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index 0baf83ad6..3375e8f48 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -62,7 +62,7 @@ namespace Kleo { void setAttributeOrder( const TQStringList & order ); - DNAttributeOrderConfigWidget * configWidget( TQWidget * tqparent=0, const char * name=0 ) const; + DNAttributeOrderConfigWidget * configWidget( TQWidget * parent=0, const char * name=0 ) const; private: class Private; diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h index 1583c4866..f3d568ae0 100644 --- a/certmanager/lib/kleo/downloadjob.h +++ b/certmanager/lib/kleo/downloadjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - DownloadJob( TQObject * tqparent, const char * name ); + DownloadJob( TQObject * parent, const char * name ); public: ~DownloadJob(); diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h index 640419346..c9e4d6764 100644 --- a/certmanager/lib/kleo/encryptjob.h +++ b/certmanager/lib/kleo/encryptjob.h @@ -65,7 +65,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - EncryptJob( TQObject * tqparent, const char * name ); + EncryptJob( TQObject * parent, const char * name ); public: ~EncryptJob(); diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h index 19472593e..0d693a6a9 100644 --- a/certmanager/lib/kleo/exportjob.h +++ b/certmanager/lib/kleo/exportjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - ExportJob( TQObject * tqparent, const char * name ); + ExportJob( TQObject * parent, const char * name ); public: ~ExportJob(); diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h index 4bd25b34b..c363276fd 100644 --- a/certmanager/lib/kleo/importjob.h +++ b/certmanager/lib/kleo/importjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - ImportJob( TQObject * tqparent, const char * name ); + ImportJob( TQObject * parent, const char * name ); public: ~ImportJob(); diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 709b68de1..907a74488 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -59,8 +59,8 @@ #include -Kleo::Job::Job( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ) +Kleo::Job::Job( TQObject * parent, const char * name ) + : TQObject( parent, name ) { if ( tqApp ) connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); @@ -90,7 +90,7 @@ bool Kleo::Job::isAuditLogSupported() const { } #define make_job_subclass(x) \ - Kleo::x::x( TQObject * tqparent, const char * name ) : Job( tqparent, name ) {} \ + Kleo::x::x( TQObject * parent, const char * name ) : Job( parent, name ) {} \ Kleo::x::~x() {} make_job_subclass(KeyListJob) diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h index 9dfaf822a..d4fe79b84 100644 --- a/certmanager/lib/kleo/job.h +++ b/certmanager/lib/kleo/job.h @@ -65,11 +65,11 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - Job( TQObject * tqparent, const char * name ); + Job( TQObject * parent, const char * name ); public: ~Job(); - virtual void showErrorDialog( TQWidget * tqparent=0, const TQString & caption=TQString() ) const; + virtual void showErrorDialog( TQWidget * parent=0, const TQString & caption=TQString() ) const; virtual TQString auditLogAsHtml() const; virtual GpgME::Error auditLogError() const; diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 049e3e6f2..6edc7c571 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -66,8 +66,8 @@ struct Kleo::KeyFilterManager::Private { Kleo::KeyFilterManager * Kleo::KeyFilterManager::mSelf = 0; -Kleo::KeyFilterManager::KeyFilterManager( TQObject * tqparent, const char * name ) - : TQObject( tqparent, name ), d( 0 ) +Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) + : TQObject( parent, name ), d( 0 ) { mSelf = this; d = new Private(); diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index b37a6e37b..6a6960d35 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyFilterManager( TQObject * tqparent=0, const char * name=0 ); + KeyFilterManager( TQObject * parent=0, const char * name=0 ); ~KeyFilterManager(); public: diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h index d6478d094..058f4127a 100644 --- a/certmanager/lib/kleo/keygenerationjob.h +++ b/certmanager/lib/kleo/keygenerationjob.h @@ -62,7 +62,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyGenerationJob( TQObject * tqparent, const char * name ); + KeyGenerationJob( TQObject * parent, const char * name ); public: ~KeyGenerationJob(); diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h index 2200dee30..8d9cb6a34 100644 --- a/certmanager/lib/kleo/keylistjob.h +++ b/certmanager/lib/kleo/keylistjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - KeyListJob( TQObject * tqparent, const char * name ); + KeyListJob( TQObject * parent, const char * name ); public: ~KeyListJob(); diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h index 8d790fb73..f5f7304bd 100644 --- a/certmanager/lib/kleo/refreshkeysjob.h +++ b/certmanager/lib/kleo/refreshkeysjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - RefreshKeysJob( TQObject * tqparent, const char * name ); + RefreshKeysJob( TQObject * parent, const char * name ); public: ~RefreshKeysJob(); diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h index 117ac6227..976c5d5c8 100644 --- a/certmanager/lib/kleo/signencryptjob.h +++ b/certmanager/lib/kleo/signencryptjob.h @@ -68,7 +68,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SignEncryptJob( TQObject * tqparent, const char * name ); + SignEncryptJob( TQObject * parent, const char * name ); public: ~SignEncryptJob(); diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h index 7d90dc85b..f317fe582 100644 --- a/certmanager/lib/kleo/signjob.h +++ b/certmanager/lib/kleo/signjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SignJob( TQObject * tqparent, const char * name ); + SignJob( TQObject * parent, const char * name ); public: ~SignJob(); diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h index 797693914..d801bd4cc 100644 --- a/certmanager/lib/kleo/specialjob.h +++ b/certmanager/lib/kleo/specialjob.h @@ -66,7 +66,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - SpecialJob( TQObject * tqparent, const char * name ); + SpecialJob( TQObject * parent, const char * name ); public: ~SpecialJob(); diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h index 5c0a3c472..0bc801c7a 100644 --- a/certmanager/lib/kleo/verifydetachedjob.h +++ b/certmanager/lib/kleo/verifydetachedjob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - VerifyDetachedJob( TQObject * tqparent, const char * name ); + VerifyDetachedJob( TQObject * parent, const char * name ); public: ~VerifyDetachedJob(); diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h index 942afac12..6092a32cb 100644 --- a/certmanager/lib/kleo/verifyopaquejob.h +++ b/certmanager/lib/kleo/verifyopaquejob.h @@ -63,7 +63,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT protected: - VerifyOpaqueJob( TQObject * tqparent, const char * name ); + VerifyOpaqueJob( TQObject * parent, const char * name ); public: ~VerifyOpaqueJob(); diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 9d2efd16b..bc589ec48 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -46,7 +46,7 @@ class GnuPGViewer : public TQTextEdit { Q_OBJECT TQ_OBJECT public: - GnuPGViewer( TQWidget * tqparent=0, const char * name=0 ); + GnuPGViewer( TQWidget * parent=0, const char * name=0 ); ~GnuPGViewer(); void setProcess( Kleo::GnuPGProcessBase * process ); diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index c3aba82d2..de3a4ff06 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -46,8 +46,8 @@ #include -GnuPGViewer::GnuPGViewer( TQWidget * tqparent, const char * name ) - : TQTextEdit( tqparent, name ), mProcess( 0 ) +GnuPGViewer::GnuPGViewer( TQWidget * parent, const char * name ) + : TQTextEdit( parent, name ), mProcess( 0 ) { setTextFormat( LogText ); setMaxLogLines( 10000 ); diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b95ad74bd..8acef90f0 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -69,8 +69,8 @@ static const int numKeyParams = sizeof keyParams / sizeof *keyParams; static const char * protocol = 0; -KeyGenerator::KeyGenerator( TQWidget * tqparent, const char * name, WFlags ) - : KDialogBase( tqparent, name, true, "KeyGenerationJob test", +KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) + : KDialogBase( parent, name, true, "KeyGenerationJob test", Close|User1, User1, true, KGuiItem( "Create" ) ) { TQWidget * w = new TQWidget( this ); diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h index 44c075803..70ded0c7e 100644 --- a/certmanager/lib/tests/test_keygen.h +++ b/certmanager/lib/tests/test_keygen.h @@ -47,7 +47,7 @@ class KeyGenerator : public KDialogBase { Q_OBJECT TQ_OBJECT public: - KeyGenerator( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KeyGenerator(); public slots: diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 6667b2e7c..ca31b39ab 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -91,8 +91,8 @@ namespace { } } -CertListView::CertListView( TQWidget * tqparent, const char * name, WFlags f ) - : Kleo::KeyListView( new TestColumnStrategy(), 0, tqparent, name, f ) +CertListView::CertListView( TQWidget * parent, const char * name, WFlags f ) + : Kleo::KeyListView( new TestColumnStrategy(), 0, parent, name, f ) { setHierarchical( true ); setRootIsDecorated( true ); diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h index 6af935f92..f5b9bd897 100644 --- a/certmanager/lib/tests/test_keylister.h +++ b/certmanager/lib/tests/test_keylister.h @@ -43,7 +43,7 @@ class CertListView : public Kleo::KeyListView { Q_OBJECT TQ_OBJECT public: - CertListView( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 ); public slots: void slotResult( const GpgME::KeyListResult & result ); diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index a8d48a007..1c548c5b5 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -40,14 +40,14 @@ #include /* - * Constructs a AddDirectoryServiceDialogImpl which is a child of 'tqparent', with the + * Constructs a AddDirectoryServiceDialogImpl which is a child of 'parent', with the * 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. */ -AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : AddDirectoryServiceDialog( tqparent, name, modal, fl ) +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) ) ); } diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index d6ad086d1..0b1a0ca6a 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -40,7 +40,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog TQ_OBJECT public: - AddDirectoryServiceDialogImpl( TQWidget* tqparent = 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 7869b1d2b..1052cff52 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -76,8 +76,8 @@ namespace Kleo { class Kleo::BackendListView : public KListView { public: - BackendListView( BackendConfigWidget* tqparent, const char* name = 0 ) - : KListView( tqparent, name ) {} + BackendListView( BackendConfigWidget* parent, const char* name = 0 ) + : KListView( parent, name ) {} /// return backend for currently selected (/current) item. Used by Configure button. const Kleo::CryptoBackend* currentBackend() const; @@ -162,7 +162,7 @@ const Kleo::CryptoBackend* Kleo::BackendListView::currentBackend() const { if ( !curItem ) // can't happen return 0; if ( lvi_cast( curItem ) ) - curItem = curItem->tqparent(); + curItem = curItem->parent(); if ( const Kleo::BackendListViewItem * blvi = lvi_cast( curItem ) ) return blvi->cryptoBackend(); return 0; @@ -175,9 +175,9 @@ const Kleo::CryptoBackend* Kleo::BackendListView::chosenBackend( const char * pr it.current() ; ++it ) if ( ProtocolCheckListItem * p = lvi_cast( it.current() ) ) if ( p->isOn() && qstricmp( p->protocolName(), protocolName ) == 0 ) { - // OK that's the one. Now go up to the tqparent backend + // OK that's the one. Now go up to the parent backend // (need to do that in the listview since Protocol doesn't know it) - if ( const BackendListViewItem * parItem = lvi_cast( it.current()->tqparent() ) ) + if ( const BackendListViewItem * parItem = lvi_cast( it.current()->parent() ) ) return parItem->cryptoBackend(); } return 0; @@ -196,8 +196,8 @@ void Kleo::BackendListView::deselectAll( const char * protocolName, TQCheckListI //// -Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget( tqparent, name, f ), d( 0 ) +Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( factory ); d = new Private(); diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 83b2eea0d..bdac0cf06 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~BackendConfigWidget(); void load(); diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 169af00be..65edb93ef 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -34,11 +34,11 @@ #include #include -Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent, const char* name ) +Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) : KDialogBase( Swallow, // Remove the "whats's this" button since we have no support for it WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | WStyle_Title | WStyle_SysMenu, - tqparent, name, true /*modal*/, + parent, name, true /*modal*/, i18n( "Configure" ), Default|Cancel|Apply|Ok|User1, Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) ) { diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 05bb1c399..8a4c07e9f 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -48,7 +48,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *tqparent = 0, const char* name = 0 ); + CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 ); protected: virtual void slotOk(); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 9fa55e969..a16dcd22e 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -80,8 +80,8 @@ static const KJanusWidget::Face determineJanusFace( const Kleo::CryptoConfig * c : KJanusWidget::IconList ; } -Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent, const char * name ) - : KJanusWidget( tqparent, name, determineJanusFace( config ) ), mConfig( config ) +Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent, const char * name ) + : KJanusWidget( parent, name, determineJanusFace( config ) ), mConfig( config ) { TQWidget * vbox = 0; if ( face() == Plain ) { @@ -182,8 +182,8 @@ void Kleo::CryptoConfigModule::cancel() Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), + TQWidget* parent, const char* name ) + : TQWidget( parent, name ), mComponent( component ) { TQGridLayout * glay = new TQGridLayout( this, 1, 3, 0, KDialog::spacingHint() ); diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h index 46606c55e..b6f832b83 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.h +++ b/certmanager/lib/ui/cryptoconfigmodule.h @@ -49,7 +49,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * tqparent=0, const char * name=0 ); + CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 ); bool hasError() const; diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index fb9acc6c5..65cae2499 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -62,7 +62,7 @@ namespace Kleo { public: CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -82,7 +82,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * tqlayout, TQWidget* tqparent, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -155,7 +155,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -175,7 +175,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -195,7 +195,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -215,7 +215,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -235,7 +235,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -255,7 +255,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private: @@ -274,7 +274,7 @@ namespace Kleo { Kleo::CryptoConfigEntry* entry, const TQString& entryName, TQGridLayout * tqlayout, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); private slots: diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 3dc3cd102..4975e3818 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -92,8 +92,8 @@ private: Kleo::DirectoryServicesWidget::DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* tqparent, const char* name, WFlags fl ) - : DirectoryServicesWidgetBase( tqparent, name, fl ), + TQWidget* parent, const char* name, WFlags fl ) + : DirectoryServicesWidgetBase( parent, name, fl ), mConfigEntry( configEntry ) { x500LV->setSorting( -1 ); diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 8a275f67a..bfefcec82 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -49,7 +49,7 @@ class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase public: DirectoryServicesWidget( Kleo::CryptoConfigEntry* configEntry, - TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DirectoryServicesWidget(); void load(); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 46adfe3b0..a4fc7d9a1 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -74,8 +74,8 @@ static void prepare( TQListView * lv ) { lv->addColumn( i18n("Description") ); } -Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget( tqparent, name, f ), d( 0 ) +Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent, const char * name, WFlags f ) + : TQWidget( parent, name, f ), d( 0 ) { assert( mapper ); d = new Private(); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index a0867c4fa..b433c35ba 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -47,8 +47,8 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - /*! Use Kleo::DNAttributeMapper::instance()->configWidget( tqparent, name ) instead. */ - DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */ + DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~DNAttributeOrderConfigWidget(); void load(); diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index ee809df77..d736399f8 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -48,16 +48,16 @@ #include #include -KDHorizontalLine::KDHorizontalLine( TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame( tqparent, name, f ), +KDHorizontalLine::KDHorizontalLine( TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { TQFrame::setFrameStyle( HLine | Sunken ); } -KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame( tqparent, name, f ), +KDHorizontalLine::KDHorizontalLine( const TQString & title, TQWidget * parent, const char * name, WFlags f ) + : TQFrame( parent, name, f ), mAlign( TQt::AlignAuto ), mLenVisible( 0 ) { diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index fe286801e..466b54bca 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -49,8 +49,8 @@ class KDHorizontalLine : public TQFrame { TQ_OBJECT TQ_PROPERTY( TQString title READ title WRITE setTitle ) public: - KDHorizontalLine( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); - KDHorizontalLine( const TQString & title, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( TQWidget * parent=0, const char * name=0, WFlags f=0 ); + KDHorizontalLine( const TQString & title, TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KDHorizontalLine(); TQString title() const { return mTitle; } diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index e81adc438..402235ddd 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -106,9 +106,9 @@ struct Kleo::KeyApprovalDialog::Private { Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients, const std::vector & sender, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), + : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), d( 0 ) { assert( !recipients.empty() ); diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index 993db1262..0452743b7 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -71,7 +71,7 @@ namespace Kleo { KeyApprovalDialog( const std::vector & recipients, const std::vector & sender, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeyApprovalDialog(); diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index f1641339d..32d5be217 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -63,15 +63,15 @@ namespace { class ItemToolTip : public TQToolTip { public: - ItemToolTip( Kleo::KeyListView * tqparent ); + ItemToolTip( Kleo::KeyListView * parent ); protected: void maybeTip( const TQPoint & p ); private: Kleo::KeyListView * mKeyListView; }; - ItemToolTip::ItemToolTip( Kleo::KeyListView * tqparent ) - : TQToolTip( tqparent->viewport() ), mKeyListView( tqparent ) {} + ItemToolTip::ItemToolTip( Kleo::KeyListView * parent ) + : TQToolTip( parent->viewport() ), mKeyListView( parent ) {} void ItemToolTip::maybeTip( const TQPoint & p ) { if ( !mKeyListView ) @@ -135,8 +135,8 @@ static const struct { static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; -Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * tqparent, const char * name, WFlags f ) - : KListView( tqparent, name ), +Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) + : KListView( parent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), mHierarchical( false ) @@ -276,9 +276,9 @@ void Kleo::KeyListView::doHierarchicalInsert( const GpgME::Key & key ) { return; KeyListViewItem * item = 0; if ( !key.isRoot() ) - if ( KeyListViewItem * tqparent = itemByFingerprint( key.chainID() ) ) { - item = new KeyListViewItem( tqparent, key ); - tqparent->setOpen( true ); + if ( KeyListViewItem * parent = itemByFingerprint( key.chainID() ) ) { + item = new KeyListViewItem( parent, key ); + parent->setOpen( true ); } if ( !item ) item = new KeyListViewItem( this, key ); // top-level (for now) @@ -293,12 +293,12 @@ void Kleo::KeyListView::gatherScattered() { item = item->nextSibling(); if ( cur->key().isRoot() ) continue; - if ( KeyListViewItem * tqparent = itemByFingerprint( cur->key().chainID() ) ) { - // found a new tqparent... + if ( KeyListViewItem * parent = itemByFingerprint( cur->key().chainID() ) ) { + // found a new parent... // ### todo: optimize by suppressing removing/adding the item to the itemMap... takeItem( cur ); - tqparent->insertItem( cur ); - tqparent->setOpen( true ); + parent->insertItem( cur ); + parent->setOpen( true ); } } } @@ -313,8 +313,8 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) { assert( cur->childCount() == 0 ); // ### todo: optimize by suppressing removing/adding the item to the itemMap... - if ( cur->tqparent() ) - cur->tqparent()->takeItem( cur ); + if ( cur->parent() ) + cur->parent()->takeItem( cur ); else takeItem( cur ); insertItem( cur ); @@ -370,26 +370,26 @@ void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, // // -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ) - : TQListViewItem( tqparent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, const GpgME::Key & key ) + : TQListViewItem( parent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( tqparent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( parent, after ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ) - : TQListViewItem( tqparent ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ) + : TQListViewItem( parent ) { setKey( key ); } -Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ) - : TQListViewItem( tqparent, after ) +Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ) + : TQListViewItem( parent, after ) { setKey( key ); } @@ -402,7 +402,7 @@ Kleo::KeyListViewItem::~KeyListViewItem() { while ( TQListViewItem * item = firstChild() ) delete item; // better do this here, too, since deletion is top-down and thus - // we're deleted when our tqparent item is no longer a + // we're deleted when our parent item is no longer a // KeyListViewItem, but a mere TQListViewItem, so our takeItem() // overload is gone by that time... if ( KeyListView * lv = listView() ) @@ -483,33 +483,33 @@ void Kleo::KeyListViewItem::takeItem( TQListViewItem * qlvi ) { // // -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, subkey.parent() ), mSubkey( subkey ) { } -Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ) - : KeyListViewItem( tqparent, after, subkey.tqparent() ), mSubkey( subkey ) +Kleo::SubkeyKeyListViewItem::SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ) + : KeyListViewItem( parent, after, subkey.parent() ), mSubkey( subkey ) { } void Kleo::SubkeyKeyListViewItem::setSubkey( const GpgME::Subkey & subkey ) { mSubkey = subkey; - setKey( subkey.tqparent() ); + setKey( subkey.parent() ); } TQString Kleo::SubkeyKeyListViewItem::text( int col ) const { @@ -561,33 +561,33 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userID ) + : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userID ) + : KeyListViewItem( parent, userID.parent() ), mUserID( userID ) { } -Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userID ) - : KeyListViewItem( tqparent, after, userID.tqparent() ), mUserID( userID ) +Kleo::UserIDKeyListViewItem::UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userID ) + : KeyListViewItem( parent, after, userID.parent() ), mUserID( userID ) { } void Kleo::UserIDKeyListViewItem::setUserID( const GpgME::UserID & userID ) { mUserID = userID; - setKey( userID.tqparent() ); + setKey( userID.parent() ); } TQString Kleo::UserIDKeyListViewItem::text( int col ) const { @@ -640,33 +640,33 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & // // -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, signature.parent().parent() ), mSignature( signature ) { } -Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) - : KeyListViewItem( tqparent, after, signature.tqparent().tqparent() ), mSignature( signature ) +Kleo::SignatureKeyListViewItem::SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & signature ) + : KeyListViewItem( parent, after, signature.parent().parent() ), mSignature( signature ) { } void Kleo::SignatureKeyListViewItem::setSignature( const GpgME::UserID::Signature & signature ) { mSignature = signature; - setKey( signature.tqparent().tqparent() ); + setKey( signature.parent().parent() ); } TQString Kleo::SignatureKeyListViewItem::text( int col ) const { diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 6161bfe8d..d59211313 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -64,10 +64,10 @@ namespace Kleo { class KDE_EXPORT KeyListViewItem : public TQListViewItem { public: - KeyListViewItem( KeyListView * tqparent, const GpgME::Key & key ); - KeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * tqparent, const GpgME::Key & key ); - KeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); + KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * parent, const GpgME::Key & key ); + KeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Key & key ); ~KeyListViewItem(); void setKey( const GpgME::Key & key ); @@ -103,10 +103,10 @@ namespace Kleo { class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: - SubkeyKeyListViewItem( KeyListView * tqparent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * tqparent, const GpgME::Subkey & subkey ); - SubkeyKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * parent, const GpgME::Subkey & subkey ); + SubkeyKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); void setSubkey( const GpgME::Subkey & subkey ); const GpgME::Subkey & subkey() const { return mSubkey; } @@ -135,10 +135,10 @@ namespace Kleo { class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: - UserIDKeyListViewItem( KeyListView * tqparent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID & userid ); - UserIDKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID & userid ); + UserIDKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID & userid ); void setUserID( const GpgME::UserID & userid ); const GpgME::UserID userID() const { return mUserID; } @@ -167,10 +167,10 @@ namespace Kleo { class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: - SignatureKeyListViewItem( KeyListView * tqparent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListView * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * tqparent, const GpgME::UserID::Signature & sig ); - SignatureKeyListViewItem( KeyListViewItem * tqparent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * parent, const GpgME::UserID::Signature & sig ); + SignatureKeyListViewItem( KeyListViewItem * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); void setSignature( const GpgME::UserID::Signature & sig ); const GpgME::UserID::Signature & signature() const { return mSignature; } @@ -254,7 +254,7 @@ namespace Kleo { KeyListView( const ColumnStrategy * strategy, const DisplayStrategy * display=0, - TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + TQWidget * parent=0, const char * name=0, WFlags f=0 ); ~KeyListView(); diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 16efbd46f..01e6902f5 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -82,8 +82,8 @@ #include Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, - TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), + TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( multipleKeys ), @@ -94,8 +94,8 @@ Kleo::KeyRequester::KeyRequester( unsigned int allowedKeys, bool multipleKeys, init(); } -Kleo::KeyRequester::KeyRequester( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name ), +Kleo::KeyRequester::KeyRequester( TQWidget * parent, const char * name ) + : TQWidget( parent, name ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mMulti( false ), @@ -226,14 +226,14 @@ void Kleo::KeyRequester::updateKeys() { #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ @@ -430,15 +430,15 @@ static inline unsigned int signingKeyUsage( bool openpgp, bool smime, bool trust } Kleo::EncryptionKeyRequester::EncryptionKeyRequester( bool multi, unsigned int proto, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( encryptionKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - tqparent, name ) + parent, name ) { } -Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * tqparent, const char * name ) - : KeyRequester( 0, false, tqparent, name ) +Kleo::EncryptionKeyRequester::EncryptionKeyRequester( TQWidget * parent, const char * name ) + : KeyRequester( 0, false, parent, name ) { } @@ -451,15 +451,15 @@ void Kleo::EncryptionKeyRequester::setAllowedKeys( unsigned int proto, bool only } Kleo::SigningKeyRequester::SigningKeyRequester( bool multi, unsigned int proto, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool onlyTrusted, bool onlyValid ) : KeyRequester( signingKeyUsage( proto & OpenPGP, proto & SMIME, onlyTrusted, onlyValid ), multi, - tqparent, name ) + parent, name ) { } -Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * tqparent, const char * name ) - : KeyRequester( 0, false, tqparent, name ) +Kleo::SigningKeyRequester::SigningKeyRequester( TQWidget * parent, const char * name ) + : KeyRequester( 0, false, parent, name ) { } diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 5c7913ddb..68bdd7038 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -78,9 +78,9 @@ namespace Kleo { TQ_OBJECT public: KeyRequester( unsigned int allowedKeys, bool multipleKeys=false, - TQWidget * tqparent=0, const char * name=0 ); + TQWidget * parent=0, const char * name=0 ); // Constructor for TQt Designer - KeyRequester( TQWidget * tqparent=0, const char * name=0 ); + KeyRequester( TQWidget * parent=0, const char * name=0 ); ~KeyRequester(); const GpgME::Key & key() const; @@ -169,12 +169,12 @@ namespace Kleo { * Preferred constructor */ EncryptionKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for TQt designer */ - EncryptionKeyRequester( TQWidget * tqparent=0, const char * name=0 ); + EncryptionKeyRequester( TQWidget * parent=0, const char * name=0 ); ~EncryptionKeyRequester(); void setAllowedKeys( unsigned int proto, bool onlyTrusted=true, bool onlyValid=true ); @@ -202,12 +202,12 @@ namespace Kleo { * @param onlyValid only show valid keys */ SigningKeyRequester( bool multipleKeys=false, unsigned int proto=AllProtocols, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool onlyTrusted=true, bool onlyValid=true ); /** * Constructor for TQt designer */ - SigningKeyRequester( TQWidget * tqparent=0, const char * name=0 ); + SigningKeyRequester( TQWidget * parent=0, const char * name=0 ); ~SigningKeyRequester(); /* diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 141e9e989..29d24e151 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -301,9 +301,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -321,9 +321,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -342,9 +342,9 @@ Kleo::KeySelectionDialog::KeySelectionDialog( const TQString & title, unsigned int keyUsage, bool extendedSelection, bool rememberChoice, - TQWidget * tqparent, const char * name, + TQWidget * parent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel|Help, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel|Help, Ok ), mOpenPGPBackend( 0 ), mSMIMEBackend( 0 ), mRememberCB( 0 ), @@ -562,14 +562,14 @@ void Kleo::KeySelectionDialog::slotStartCertificateManager( const TQString &quer #ifndef __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ #define __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ -static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) { +static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) { assert( err ); const TQString msg = i18n( "

An error occurred while fetching " "the keys from the backend:

" "

%1

" ) .tqarg( TQString::fromLocal8Bit( err.asString() ) ); - KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) ); + KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) ); } #endif // __KLEO_UI_SHOW_KEY_LIST_ERROR_H__ diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index c0bfa7eef..44634a396 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -90,7 +90,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -99,7 +99,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); KeySelectionDialog( const TQString & title, const TQString & text, @@ -107,7 +107,7 @@ namespace Kleo { unsigned int keyUsage=AllKeys, bool extendedSelection=false, bool rememberChoice=false, - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~KeySelectionDialog(); diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 0cef145b2..2dfe083d5 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -77,8 +77,8 @@ class AuditLogViewer : public KDialogBase { // Q_OBJECT TQ_OBJECT public: - explicit AuditLogViewer( const TQString & log, TQWidget * tqparent=0, const char * name=0, WFlags f=0 ) - : KDialogBase( tqparent, name, false, i18n("View GnuPG Audit Log"), + explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 ) + : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"), Close|User1|User2, Close, false, KGuiItem_save(), KGuiItem_copy() ), m_log( /* sic */ ), m_textEdit( new TQTextEdit( this, "m_textEdit" ) ) @@ -144,13 +144,13 @@ private: } // anon namespace // static -void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString & caption ) { +void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString & caption ) { if ( !job ) return; if ( !GpgME::hasFeature( AuditLogFeature ) || !job->isAuditLogSupported() ) { - KMessageBox::information( tqparent, i18n("Your system does not have support for GnuPG Audit Logs"), + KMessageBox::information( parent, i18n("Your system does not have support for GnuPG Audit Logs"), i18n("System Error") ); return; } @@ -158,7 +158,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString const GpgME::Error err = job->auditLogError(); if ( err.code() != GPG_ERR_NO_DATA ) { - KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") + KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1") .tqarg( TQString::fromLocal8Bit( err.asString() ) ), i18n("GnuPG Audit Log Error") ); return; @@ -167,29 +167,29 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString const TQString log = job->auditLogAsHtml(); if ( log.isEmpty() ) { - KMessageBox::information( tqparent, i18n("No GnuPG Audit Log available for this operation."), + KMessageBox::information( parent, i18n("No GnuPG Audit Log available for this operation."), i18n("No GnuPG Audit Log") ); return; } - auditLog( tqparent, log, caption ); + auditLog( parent, log, caption ); } // static -void MessageBox::auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ) { - AuditLogViewer * const alv = new AuditLogViewer( log, tqparent, "alv", TQt::WDestructiveClose ); +void MessageBox::auditLog( TQWidget * parent, const TQString & log, const TQString & caption ) { + AuditLogViewer * const alv = new AuditLogViewer( log, parent, "alv", TQt::WDestructiveClose ); alv->setCaption( caption ); alv->show(); } // static -void MessageBox::auditLog( TQWidget * tqparent, const Job * job ) { - auditLog( tqparent, job, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * parent, const Job * job ) { + auditLog( parent, job, i18n("GnuPG Audit Log Viewer") ); } // static -void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) { - auditLog( tqparent, log, i18n("GnuPG Audit Log Viewer") ); +void MessageBox::auditLog( TQWidget * parent, const TQString & log ) { + auditLog( parent, log, i18n("GnuPG Audit Log Viewer") ); } static TQString to_information_string( const SigningResult & result ) { @@ -221,63 +221,63 @@ static TQString to_error_string( const SigningResult & sresult, const Encryption } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { - information( tqparent, result, job, i18n("Signing Result"), options ); +void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { + information( parent, result, job, i18n("Signing Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, int options ) { - error( tqparent, result, job, i18n("Signing Error"), options ); +void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, int options ) { + error( parent, result, job, i18n("Signing Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const SigningResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { - information( tqparent, result, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { + information( parent, result, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( result ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, int options ) { - error( tqparent, result, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, int options ) { + error( parent, result, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const EncryptionResult & result, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( result ), job, caption, options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - information( tqparent, sresult, eresult, job, i18n("Encryption Result"), options ); +void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + information( parent, sresult, eresult, job, i18n("Encryption Result"), options ); } // static -void MessageBox::information( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); +void MessageBox::information( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Information, to_information_string( sresult, eresult ), job, caption, options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { - error( tqparent, sresult, eresult, job, i18n("Encryption Error"), options ); +void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, int options ) { + error( parent, sresult, eresult, job, i18n("Encryption Error"), options ); } // static -void MessageBox::error( TQWidget * tqparent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { - make( tqparent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); +void MessageBox::error( TQWidget * parent, const SigningResult & sresult, const EncryptionResult & eresult, const Job * job, const TQString & caption, int options ) { + make( parent, TQMessageBox::Critical, to_error_string( sresult, eresult ), job, caption, options ); } // static @@ -307,15 +307,15 @@ bool MessageBox::showAuditLogButton( const Kleo::Job * job ) { // static -void MessageBox::make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { +void MessageBox::make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Job * job, const TQString & caption, int options ) { KDialogBase * dialog = showAuditLogButton( job ) ? new KDialogBase( caption, KDialogBase::Yes | KDialogBase::No, KDialogBase::Yes, KDialogBase::Yes, - tqparent, "error", true, true, + parent, "error", true, true, KStdGuiItem::ok(), KGuiItem_showAuditLog() ) : new KDialogBase( caption, KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, - tqparent, "error", true, true, + parent, "error", true, true, KStdGuiItem::ok() ) ; if ( options & KMessageBox::PlainCaption ) dialog->setPlainCaption( caption ); diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index 64cd1a2ed..69dea34c5 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -54,30 +54,30 @@ namespace Kleo { class MessageBox { public: - static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void information( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); - static void error( TQWidget * tqparent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); - - static void auditLog( TQWidget * tqparent, const Kleo::Job * job, const TQString & caption ); - static void auditLog( TQWidget * tqparent, const Kleo::Job * job ); - static void auditLog( TQWidget * tqparent, const TQString & log, const TQString & caption ); - static void auditLog( TQWidget * tqparent, const TQString & log ); + static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::EncryptionResult & result, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void information( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, const TQString & caption, int options=KMessageBox::Notify ); + static void error( TQWidget * parent, const GpgME::SigningResult & sresult, const GpgME::EncryptionResult & eresult, const Kleo::Job * job, int options=KMessageBox::Notify ); + + static void auditLog( TQWidget * parent, const Kleo::Job * job, const TQString & caption ); + static void auditLog( TQWidget * parent, const Kleo::Job * job ); + static void auditLog( TQWidget * parent, const TQString & log, const TQString & caption ); + static void auditLog( TQWidget * parent, const TQString & log ); static bool showAuditLogButton( const Kleo::Job * job ); private: - static void make( TQWidget * tqparent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); + static void make( TQWidget * parent, TQMessageBox::Icon icon, const TQString & text, const Kleo::Job * job, const TQString & caption, int options ); }; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 91ecdef6f..d88278878 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -66,8 +66,8 @@ struct Kleo::PassphraseDialog::Private { Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & caption, - TQWidget * tqparent, const char * name, bool modal ) - : KDialogBase( tqparent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) + TQWidget * parent, const char * name, bool modal ) + : KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok ), d( 0 ) { d = new Private(); diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index 6ff4289c4..15e6c132e 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -59,7 +59,7 @@ namespace Kleo { public: PassphraseDialog( const TQString & description, const TQString & caption=TQString(), - TQWidget * tqparent=0, const char * name=0, + TQWidget * parent=0, const char * name=0, bool modal=true ); ~PassphraseDialog(); diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index b6518c60e..6fe2f5311 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -39,8 +39,8 @@ static const int busyTimerTickInterval = 100; static const int busyTimerTickIncrement = 5; -Kleo::ProgressBar::ProgressBar( TQWidget * tqparent, const char * name, WFlags f ) - : TQProgressBar( 0, tqparent, name, f ), +Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) + : TQProgressBar( 0, parent, name, f ), mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 705fe11f1..f5a9644fe 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -46,7 +46,7 @@ namespace Kleo { Q_OBJECT TQ_OBJECT public: - ProgressBar( TQWidget * tqparent=0, const char * name=0, WFlags f=0 ); + ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); public slots: void slotProgress( const TQString & message, int type, int current, int total ); -- cgit v1.2.1