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 --- libkpgp/kpgpbase.cpp | 4 ++-- libkpgp/kpgpui.cpp | 40 ++++++++++++++++++++-------------------- libkpgp/kpgpui.h | 16 ++++++++-------- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'libkpgp') diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index f3a79216e..53058d55b 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -128,7 +128,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP ) _exit(127); } - /*Only get here if we're the tqparent.*/ + /*Only get here if we're the parent.*/ close(pin[0]); close(pout[1]); close(perr[1]); @@ -500,7 +500,7 @@ Base::runGpg( const char *cmd, const char *passphrase, bool onlyReadFromGnuPG ) _exit(127); } - // Only get here if we're the tqparent. + // Only get here if we're the parent. close(pin[0]); close(pout[1]); diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index cb07abc41..a52680b19 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -58,10 +58,10 @@ const int Kpgp::KeySelectionDialog::sCheckSelectionDelay = 250; namespace Kpgp { -PassphraseDialog::PassphraseDialog( TQWidget *tqparent, +PassphraseDialog::PassphraseDialog( TQWidget *parent, const TQString &caption, bool modal, const TQString &keyID ) - :KDialogBase( tqparent, 0, modal, caption, Ok|Cancel ) + :KDialogBase( parent, 0, modal, caption, Ok|Cancel ) { TQHBox *hbox = makeHBoxMainWidget(); hbox->setSpacing( spacingHint() ); @@ -104,8 +104,8 @@ const char * PassphraseDialog::passphrase() // ------------------------------------------------------------------------ // Forbidden accels for KMail: AC GH OP // for KNode: ACE H O -Config::Config( TQWidget *tqparent, const char *name, bool encrypt ) - : TQWidget( tqparent, name ), pgp( Module::getKpgp() ) +Config::Config( TQWidget *parent, const char *name, bool encrypt ) + : TQWidget( parent, name ), pgp( Module::getKpgp() ) { TQGroupBox * group; TQLabel * label; @@ -286,9 +286,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, const bool rememberChoice, const unsigned int allowedKeys, const bool extendedSelection, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel, Ok ), + : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ), mRememberCB( 0 ), mAllowedKeys( allowedKeys ), mCurrentContextMenuItem( 0 ) @@ -670,8 +670,8 @@ void KeySelectionDialog::updateKeyInfo( const Kpgp::Key* key, return; } - if( lvi->tqparent() != 0 ) { - lvi = lvi->tqparent(); + if( lvi->parent() != 0 ) { + lvi = lvi->parent(); } if( 0 == key ) { @@ -788,8 +788,8 @@ KeySelectionDialog::getKeyId( const TQListViewItem* lvi ) const KeyID keyId; if( 0 != lvi ) { - if( 0 != lvi->tqparent() ) { - keyId = lvi->tqparent()->text(0).local8Bit(); + if( 0 != lvi->parent() ) { + keyId = lvi->parent()->text(0).local8Bit(); } else { keyId = lvi->text(0).local8Bit(); @@ -1158,9 +1158,9 @@ void KeySelectionDialog::showAllItems() } // ------------------------------------------------------------------------ -KeyRequester::KeyRequester( TQWidget * tqparent, bool multipleKeys, +KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, unsigned int allowedKeys, const char * name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mDialogCaption( i18n("OpenPGP Key Selection") ), mDialogMessage( i18n("Please select an OpenPGP key to use.") ), mMulti( multipleKeys ), @@ -1268,9 +1268,9 @@ void KeyRequester::setAllowedKeys( int allowedKeys ) { } -PublicKeyRequester::PublicKeyRequester( TQWidget * tqparent, bool multi, +PublicKeyRequester::PublicKeyRequester( TQWidget * parent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( tqparent, multi, allowed & ~SecretKeys, name ) + : KeyRequester( parent, multi, allowed & ~SecretKeys, name ) { } @@ -1284,9 +1284,9 @@ KeyIDList PublicKeyRequester::keyRequestHook( Module * pgp ) const { return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString(), mAllowedKeys ); } -SecretKeyRequester::SecretKeyRequester( TQWidget * tqparent, bool multi, +SecretKeyRequester::SecretKeyRequester( TQWidget * parent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( tqparent, multi, allowed & ~PublicKeys, name ) + : KeyRequester( parent, multi, allowed & ~PublicKeys, name ) { } @@ -1310,9 +1310,9 @@ KeyIDList SecretKeyRequester::keyRequestHook( Module * pgp ) const { KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, const TQValueVector& keyIDs, const int allowedKeys, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Encryption Key Approval"), + : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), Ok|Cancel, Ok ), mKeys( keyIDs ), mAllowedKeys( allowedKeys ), @@ -1614,9 +1614,9 @@ KeyApprovalDialog::slotCancel() // ------------------------------------------------------------------------ CipherTextDialog::CipherTextDialog( const TQCString & text, - const TQCString & charset, TQWidget *tqparent, + const TQCString & charset, TQWidget *parent, const char *name, bool modal ) - :KDialogBase( tqparent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok) + :KDialogBase( parent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok) { // FIXME (post KDE2.2): show some more info, e.g. the output of GnuPG/PGP TQFrame *page = makeMainWidget(); diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 1c24373a9..4644edcf1 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -58,7 +58,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase TQ_OBJECT public: - PassphraseDialog( TQWidget *tqparent=0, const TQString &caption=TQString(), + PassphraseDialog( TQWidget *parent=0, const TQString &caption=TQString(), bool modal=true, const TQString &keyID=TQString()); virtual ~PassphraseDialog(); @@ -79,7 +79,7 @@ class KDE_EXPORT Config : public TQWidget TQ_OBJECT public: - Config(TQWidget *tqparent = 0, const char *name = 0, bool encrypt =true); + Config(TQWidget *parent = 0, const char *name = 0, bool encrypt =true); virtual ~Config(); virtual void setValues(); @@ -121,7 +121,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper const bool rememberChoice = false, const unsigned int allowedKeys = AllKeys, const bool extendedSelection = false, - TQWidget *tqparent=0, const char *name=0, + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~KeySelectionDialog(); @@ -207,7 +207,7 @@ class KDE_EXPORT KeyRequester: public TQWidget TQ_OBJECT public: - KeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + KeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=AllKeys, const char * name=0 ); virtual ~KeyRequester(); @@ -258,7 +258,7 @@ class KDE_EXPORT PublicKeyRequester : public KeyRequester { Q_OBJECT TQ_OBJECT public: - PublicKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=PublicKeys, const char * name=0 ); virtual ~PublicKeyRequester(); @@ -278,7 +278,7 @@ class KDE_EXPORT SecretKeyRequester : public KeyRequester { Q_OBJECT TQ_OBJECT public: - SecretKeyRequester( TQWidget * tqparent=0, bool multipleKeys=false, + SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false, unsigned int allowedKeys=SecretKeys, const char * name=0 ); virtual ~SecretKeyRequester(); @@ -304,7 +304,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase KeyApprovalDialog( const TQStringList&, const TQValueVector&, const int allowedKeys, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool modal = true ); virtual ~KeyApprovalDialog() {}; @@ -338,7 +338,7 @@ class KDE_EXPORT CipherTextDialog: public KDialogBase public: CipherTextDialog( const TQCString & text, const TQCString & charset=0, - TQWidget *tqparent=0, const char *name=0, bool modal=true ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~CipherTextDialog() {}; private: -- cgit v1.2.1