diff options
Diffstat (limited to 'libkpgp')
-rw-r--r-- | libkpgp/kpgp.h | 2 | ||||
-rw-r--r-- | libkpgp/kpgpblock.h | 2 | ||||
-rw-r--r-- | libkpgp/kpgpui.cpp | 92 | ||||
-rw-r--r-- | libkpgp/kpgpui.h | 18 |
4 files changed, 57 insertions, 57 deletions
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index 4382f1f5..5ae06b79 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include "kpgpkey.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQLineEdit; class TQCursor; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index 82001a1d..a1df95bf 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstrlist.h> -#include <tdepimmacros.h> +#include <kdemacros.h> //#include <tqstringlist.h> class TQStringList; diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 3ad786ab..cb870d73 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -82,7 +82,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, lineedit->setEchoMode(TQLineEdit::Password); lineedit->setMinimumWidth( fontMetrics().maxWidth()*20 ); lineedit->setFocus(); - connect( lineedit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotOk()) ); + connect( lineedit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotOk()) ); vlay->addWidget( label ); vlay->addWidget( lineedit ); @@ -146,8 +146,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) << i18n("Do not use any encryption tool") ); label->setBuddy( toolCombo ); hbox->setStretchFactor( toolCombo, 1 ); - connect( toolCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( toolCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed( void ) ) ); // This is the place to add a KURLRequester to be used for asking // the user for the path to the executable... topLayout->addWidget( group ); @@ -156,8 +156,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() ); storePass = new TQCheckBox( i18n("&Keep passphrase in memory"), mpOptionsGroupBox ); - connect( storePass, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( storePass, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the passphrase of your " "private key will be remembered by the application as long " "as the application is running. Thus you will only have to " @@ -173,8 +173,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) if( encrypt ) { encToSelf = new TQCheckBox( i18n("Always encr&ypt to self"), mpOptionsGroupBox ); - connect( encToSelf, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( encToSelf, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the message/file " "will not only be encrypted with the receiver's public key, " @@ -188,8 +188,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showCipherText = new TQCheckBox( i18n("&Show signed/encrypted text after " "composing"), mpOptionsGroupBox ); - connect( showCipherText, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showCipherText, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the signed/encrypted text " "will be shown in a separate window, enabling you to know how " @@ -200,8 +200,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showKeyApprovalDlg = new TQCheckBox( i18n("Always show the encryption " "keys &for approval"), mpOptionsGroupBox ); - connect( showKeyApprovalDlg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showKeyApprovalDlg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>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, " @@ -328,9 +328,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, hlay->addWidget( le, 1 ); le->setFocus(); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mListView = new TDEListView( page ); mListView->addColumn( i18n("Key ID") ); @@ -373,24 +373,24 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) ); if( extendedSelection ) { - connect( mCheckSelectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotCheckSelection() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mCheckSelectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotCheckSelection() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); } - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( mListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); + this, TQ_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); - connect( this, TQT_SIGNAL( defaultClicked() ), - this, TQT_SLOT( slotRereadKeys() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), + this, TQ_SLOT( slotRereadKeys() ) ); } @@ -823,25 +823,25 @@ void KeySelectionDialog::slotRereadKeys() int offsetY = mListView->contentsY(); if( mListView->isMultiSelection() ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - disconnect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } initKeylist( keys, KeyIDList( mKeyIds ) ); slotFilter(); if( mListView->isMultiSelection() ) { - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); slotSelectionChanged(); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } // restore the saved position of the contents @@ -886,8 +886,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) // As we might change the selection, we have to disconnect the slot // to prevent recursion - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); KeyIDList newKeyIdList; TQValueList<TQListViewItem*> keysToBeChecked; @@ -989,8 +989,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) } enableButtonOK( keysAllowed ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } } @@ -1037,7 +1037,7 @@ void KeySelectionDialog::slotRMB( TQListViewItem* lvi, const TQPoint& pos, int ) mCurrentContextMenuItem = lvi; TQPopupMenu menu(this); - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT( slotRecheckKey() ) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT( slotRecheckKey() ) ); menu.exec( pos ); } @@ -1189,8 +1189,8 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -1383,7 +1383,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, //hbox->setStretchFactor( keyidLB, 10 ); //mKeyIdListBoxes.insert( 0, keyidLB ); - new KSeparator( Qt::Horizontal, bigvbox ); + new KSeparator( TQt::Horizontal, bigvbox ); } else { mEncryptToSelf = 0; @@ -1402,7 +1402,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, ++kit; // skip the sender's key id } else { - new KSeparator( Qt::Horizontal, bigvbox ); + new KSeparator( TQt::Horizontal, bigvbox ); } TQHBox *hbox = new TQHBox( bigvbox ); @@ -1470,12 +1470,12 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, default: encrPrefCombo->setCurrentItem( 0 ); } - connect( encrPrefCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPrefsChanged(int)) ); + connect( encrPrefCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPrefsChanged(int)) ); mEncrPrefCombos.insert( i, encrPrefCombo ); } - connect( mChangeButtonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotChangeEncryptionKey(int)) ); + connect( mChangeButtonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotChangeEncryptionKey(int)) ); // calculate the optimal width for the dialog int dialogWidth = marginHint() diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 5756d9ed..dacfe41b 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -29,7 +29,7 @@ #include "kpgp.h" -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQRegExp; @@ -54,7 +54,7 @@ class KeyIDList; // needed by KeySelectionDialog /** the passphrase dialog */ class KDE_EXPORT PassphraseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase button mechanism. */ class KDE_EXPORT Config : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -103,7 +103,7 @@ class KDE_EXPORT Config : public TQWidget #define KeySelectionDialogSuper KDialogBase class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper { - Q_OBJECT + TQ_OBJECT enum TrustCheckMode { NoExpensiveTrustCheck, @@ -203,7 +203,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper class KDE_EXPORT KeyRequester: public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -255,7 +255,7 @@ protected: class KDE_EXPORT PublicKeyRequester : public KeyRequester { - Q_OBJECT + TQ_OBJECT public: PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false, @@ -275,7 +275,7 @@ protected: class KDE_EXPORT SecretKeyRequester : public KeyRequester { - Q_OBJECT + TQ_OBJECT public: SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false, @@ -297,7 +297,7 @@ protected: // ------------------------------------------------------------------------- class KDE_EXPORT KeyApprovalDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -333,7 +333,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase // ------------------------------------------------------------------------- class KDE_EXPORT CipherTextDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: |