From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkpgp/kpgpui.cpp | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libkpgp/kpgpui.cpp') diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 294560465..11bd79294 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -58,10 +58,10 @@ const int Kpgp::KeySelectionDialog::sCheckSelectionDelay = 250; namespace Kpgp { -PassphraseDialog::PassphraseDialog( TQWidget *parent, +PassphraseDialog::PassphraseDialog( TQWidget *tqparent, const TQString &caption, bool modal, const TQString &keyID ) - :KDialogBase( parent, 0, modal, caption, Ok|Cancel ) + :KDialogBase( tqparent, 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 *parent, const char *name, bool encrypt ) - : TQWidget( parent, name ), pgp( Module::getKpgp() ) +Config::Config( TQWidget *tqparent, const char *name, bool encrypt ) + : TQWidget( tqparent, name ), pgp( Module::getKpgp() ) { TQGroupBox * group; TQLabel * label; @@ -116,7 +116,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) group = new TQVGroupBox( i18n("Warning"), this ); group->tqlayout()->setSpacing( KDialog::spacingHint() ); - // (mmutz) work around Qt label bug in 3.0.0 (and possibly later): + // (mmutz) work around TQt label bug in 3.0.0 (and possibly later): // 1. Don't use rich text: No ... label = new TQLabel( i18n("Please check if encryption really " "works before you start using it seriously. Also note that attachments " @@ -205,7 +205,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) msg = i18n( "

When this option is enabled, the application will " "always show you a list of public keys from which you can " "choose the one it will use for encryption. If it is off, " - "the application will only show the dialog if it cannot find " + "the application will only show the dialog if it cannot tqfind " "the right key or if there are several which could be used. " "

" ); TQWhatsThis::add( showKeyApprovalDlg, msg ); @@ -286,9 +286,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, const bool rememberChoice, const unsigned int allowedKeys, const bool extendedSelection, - TQWidget *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, title, Default|Ok|Cancel, Ok ), + : KDialogBase( tqparent, name, modal, title, Default|Ok|Cancel, Ok ), mRememberCB( 0 ), mAllowedKeys( allowedKeys ), mCurrentContextMenuItem( 0 ) @@ -368,7 +368,7 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, slotCheckSelection( lvi ); } // make sure that the selected item is visible - // (ensureItemVisible(...) doesn't work correctly in Qt 3.0.0) + // (ensureItemVisible(...) doesn't work correctly in TQt 3.0.0) if( lvi != 0 ) mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) ); @@ -542,13 +542,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const dt.setTime_t( key->creationDate() ); if( remark.isEmpty() ) { return " " + i18n("creation date and status of an OpenPGP key", - "Creation date: %1, Status: %2") + "Creation date: %1, tqStatus: %2") .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ); } else { return " " + i18n("creation date, status and remark of an OpenPGP key", - "Creation date: %1, Status: %2 (%3)") + "Creation date: %1, tqStatus: %2 (%3)") .arg( KGlobal::locale()->formatDate( dt.date(), true ) ) .arg( status ) .arg( remark ); @@ -670,8 +670,8 @@ void KeySelectionDialog::updateKeyInfo( const Kpgp::Key* key, return; } - if( lvi->parent() != 0 ) { - lvi = lvi->parent(); + if( lvi->tqparent() != 0 ) { + lvi = lvi->tqparent(); } if( 0 == key ) { @@ -788,8 +788,8 @@ KeySelectionDialog::getKeyId( const TQListViewItem* lvi ) const KeyID keyId; if( 0 != lvi ) { - if( 0 != lvi->parent() ) { - keyId = lvi->parent()->text(0).local8Bit(); + if( 0 != lvi->tqparent() ) { + keyId = lvi->tqparent()->text(0).local8Bit(); } else { keyId = lvi->text(0).local8Bit(); @@ -1158,9 +1158,9 @@ void KeySelectionDialog::showAllItems() } // ------------------------------------------------------------------------ -KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, +KeyRequester::KeyRequester( TQWidget * tqparent, bool multipleKeys, unsigned int allowedKeys, const char * name ) - : TQWidget( parent, name ), + : TQWidget( tqparent, 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 * parent, bool multi, +PublicKeyRequester::PublicKeyRequester( TQWidget * tqparent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( parent, multi, allowed & ~SecretKeys, name ) + : KeyRequester( tqparent, multi, allowed & ~SecretKeys, name ) { } @@ -1281,12 +1281,12 @@ PublicKeyRequester::~PublicKeyRequester() { KeyIDList PublicKeyRequester::keyRequestHook( Module * pgp ) const { assert( pgp ); - return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString::null, mAllowedKeys ); + return pgp->selectPublicKeys( mDialogCaption, mDialogMessage, mKeys, TQString(), mAllowedKeys ); } -SecretKeyRequester::SecretKeyRequester( TQWidget * parent, bool multi, +SecretKeyRequester::SecretKeyRequester( TQWidget * tqparent, bool multi, unsigned int allowed, const char * name ) - : KeyRequester( parent, multi, allowed & ~PublicKeys, name ) + : KeyRequester( tqparent, 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 *parent, const char *name, + TQWidget *tqparent, const char *name, bool modal ) - : KDialogBase( parent, name, modal, i18n("Encryption Key Approval"), + : KDialogBase( tqparent, 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 *parent, + const TQCString & charset, TQWidget *tqparent, const char *name, bool modal ) - :KDialogBase( parent, name, modal, i18n("OpenPGP Information"), Ok|Cancel, Ok) + :KDialogBase( tqparent, 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(); @@ -1674,7 +1674,7 @@ void CipherTextDialog::setMinimumSize() } #endif - mEditBox->setMinimumWidth( QMIN( textWidth, maxWidth ) ); + mEditBox->setMinimumWidth( TQMIN( textWidth, maxWidth ) ); } void KeyRequester::virtual_hook( int, void* ) {} -- cgit v1.2.1