diff options
Diffstat (limited to 'libkpgp')
| -rw-r--r-- | libkpgp/kpgp.cpp | 26 | ||||
| -rw-r--r-- | libkpgp/kpgp.h | 16 | ||||
| -rw-r--r-- | libkpgp/kpgpbase2.cpp | 8 | ||||
| -rw-r--r-- | libkpgp/kpgpbase5.cpp | 2 | ||||
| -rw-r--r-- | libkpgp/kpgpbaseG.cpp | 6 | ||||
| -rw-r--r-- | libkpgp/kpgpblock.h | 4 | ||||
| -rw-r--r-- | libkpgp/kpgpui.cpp | 100 | ||||
| -rw-r--r-- | libkpgp/kpgpui.h | 36 |
8 files changed, 99 insertions, 99 deletions
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 4d5120d0..e535abe3 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgp.cpp Copyright (C) 2001,2002 the KPGP authors @@ -73,7 +73,7 @@ Module::~Module() writeAddressData(); if (kpgpObject == this) kpgpObject = kpgpod.setObject( Module::kpgpObject, 0, false ); - clear(TRUE); + clear(true); delete config; delete pgp; } @@ -268,7 +268,7 @@ Module::decrypt( Block& block ) // loop as long as the user enters a wrong passphrase and doesn't abort // everything ready if( prepare( true, &block ) != 1 ) - return FALSE; + return false; // ok now try to decrypt the message. retval = pgp->decrypt( block, passphrase ); // loop on bad passphrase @@ -678,7 +678,7 @@ Module::signKey(const KeyID& keyId) if (0 == pgp) assignPGPBase(); if( prepare( true ) != 1 ) - return FALSE; + return false; if(pgp->signKey(keyId, passphrase) & ERROR) { errMsg = pgp->lastErrorMessage(); @@ -855,7 +855,7 @@ Module::changePassPhrase() { //FIXME... KMessageBox::information(0,i18n("This feature is\nstill missing")); - return FALSE; + return false; } void @@ -1310,7 +1310,7 @@ Module::checkForPGP(void) int index = 0; int lastindex = -1; - havePgp=FALSE; + havePgp=false; path = getenv("PATH"); while((index = path.find(":",lastindex+1)) != -1) @@ -1323,7 +1323,7 @@ Module::checkForPGP(void) TQStrListIterator it(pSearchPaths); - haveGpg=FALSE; + haveGpg=false; // lets try gpg for ( it.toFirst() ; it.current() ; ++it ) @@ -1333,14 +1333,14 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: gpg found" << endl; - havePgp=TRUE; - haveGpg=TRUE; + havePgp=true; + haveGpg=true; break; } } // search for pgp5.0 - havePGP5=FALSE; + havePGP5=false; for ( it.toFirst() ; it.current() ; ++it ) { path = (*it); @@ -1348,8 +1348,8 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 5 found" << endl; - havePgp=TRUE; - havePGP5=TRUE; + havePgp=true; + havePGP5=true; break; } } @@ -1363,7 +1363,7 @@ Module::checkForPGP(void) if ( !access( path, X_OK ) ) { kdDebug(5100) << "Kpgp: pgp 2 or 6 found" << endl; - havePgp=TRUE; + havePgp=true; break; } } diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h index 4382f1f5..26f56cc8 100644 --- a/libkpgp/kpgp.h +++ b/libkpgp/kpgp.h @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include "kpgpkey.h" -#include <tdepimmacros.h> +#include <tdemacros.h> class TQLineEdit; class TQCursor; @@ -78,7 +78,7 @@ enum Result class Base; class Block; -class KDE_EXPORT Module +class TDE_EXPORT Module { friend class Block; @@ -198,8 +198,8 @@ public: */ Validity keyTrust( const TQString& userID ); - /** Returns TRUE if the given key is at least trusted marginally. Otherwise - FALSE is returned. + /** Returns true if the given key is at least trusted marginally. Otherwise + false is returned. */ bool isTrusted( const KeyID& keyID ); @@ -231,7 +231,7 @@ public: bool storePassPhrase(void) const; /** clears everything from memory */ - void clear(const bool erasePassPhrase = FALSE); + void clear(const bool erasePassPhrase = false); /** returns the last error that occurred */ const TQString lastErrorMsg(void) const; @@ -308,8 +308,8 @@ public: /** Parses the given message and splits it into OpenPGP blocks and Non-OpenPGP blocks. - Returns TRUE if the message contains at least one OpenPGP block and - FALSE otherwise. + Returns true if the message contains at least one OpenPGP block and + false otherwise. The format is then: <pre> 1st Non-OpenPGP block @@ -340,7 +340,7 @@ private: 0 (together with some warning message) if something is missing -1 if the passphrase dialog was canceled */ - int prepare(bool needPassPhrase=FALSE, Block* block = 0 ); + int prepare(bool needPassPhrase=false, Block* block = 0 ); /** cleanup passphrase if it should not be stored. */ void cleanupPass() { if (!storePass) wipePassPhrase(); } diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 255701a6..7299762e 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -29,7 +29,7 @@ #include <tqdatetime.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #define PGP2 "pgp" @@ -115,7 +115,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; if (error.find("Cannot find the public key") != -1) @@ -125,7 +125,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("Cannot find the public key",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); if (num++) @@ -156,7 +156,7 @@ Base2::encsign( Block& block, const KeyIDList& recipients, while((index = error.find("skipping userid",index)) != -1) { - bad = TRUE; + bad = true; int index2 = error.find('\n',index+16); if (num++) badkeys += ", "; diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index c3a8a9d3..f73ea4a4 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -30,7 +30,7 @@ #include <tqdatetime.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 2e5c916f..c4aa0ac1 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -24,7 +24,7 @@ #include "kpgp.h" #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <tqtextcodec.h> @@ -128,7 +128,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, if(!recipients.isEmpty()) { int index = 0; - bool bad = FALSE; + bool bad = false; unsigned int num = 0; TQCString badkeys = ""; // Examples: @@ -140,7 +140,7 @@ BaseG::encsign( Block& block, const KeyIDList& recipients, // (untrusted key, 23456789 is the key Id of the encryption sub key) while((index = error.find("skipped: ",index)) != -1) { - bad = TRUE; + bad = true; index = error.find('\'',index); int index2 = error.find('\'',index+1); badkeys += error.mid(index, index2-index+1) + ", "; diff --git a/libkpgp/kpgpblock.h b/libkpgp/kpgpblock.h index 82001a1d..422a04e6 100644 --- a/libkpgp/kpgpblock.h +++ b/libkpgp/kpgpblock.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstrlist.h> -#include <tdepimmacros.h> +#include <tdemacros.h> //#include <tqstringlist.h> class TQStringList; @@ -90,7 +90,7 @@ class Module; * BEGIN PGP SIGNED MESSAGE * Used for cleartext signed messages. */ -class KDE_EXPORT Block +class TDE_EXPORT Block { public: diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 3ad786ab..2d364aea 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, " @@ -293,8 +293,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, mAllowedKeys( allowedKeys ), mCurrentContextMenuItem( 0 ) { - if ( kapp ) - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + if ( tdeApp ) + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); Kpgp::Module *pgp = Kpgp::Module::getKpgp(); TDEConfig *config = pgp->getConfig(); TDEConfigGroup dialogConfig( config, "Key Selection Dialog" ); @@ -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() ) ); } } @@ -1015,10 +1015,10 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; pProgressDlg->setLabel( i18n("Checking key 0x%1...") .arg( TQString( getKeyId( *it ) ) ) ); - kapp->processEvents(); + tdeApp->processEvents(); keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); pProgressDlg->progressBar()->advance( 1 ); - kapp->processEvents(); + tdeApp->processEvents(); } delete pProgressDlg; @@ -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 184b61f5..90888133 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* kpgpui.h Copyright (C) 2001,2002 the KPGP authors @@ -29,7 +29,7 @@ #include "kpgp.h" -#include <tdepimmacros.h> +#include <tdemacros.h> class TQString; class TQRegExp; @@ -52,9 +52,9 @@ class Key; // needed by KeySelectionDialog class KeyIDList; // needed by KeySelectionDialog /** the passphrase dialog */ -class KDE_EXPORT PassphraseDialog : public KDialogBase +class TDE_EXPORT PassphraseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -73,9 +73,9 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase /** a widget for configuring the pgp interface. Can be included into a tabdialog. This widget by itself does not provide an apply/cancel button mechanism. */ -class KDE_EXPORT Config : public TQWidget +class TDE_EXPORT Config : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -101,9 +101,9 @@ class KDE_EXPORT Config : public TQWidget // ------------------------------------------------------------------------- #define KeySelectionDialogSuper KDialogBase -class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper +class TDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper { - Q_OBJECT + TQ_OBJECT enum TrustCheckMode { NoExpensiveTrustCheck, @@ -201,9 +201,9 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper static const int sCheckSelectionDelay; }; -class KDE_EXPORT KeyRequester: public TQWidget +class TDE_EXPORT KeyRequester: public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -254,8 +254,8 @@ protected: }; -class KDE_EXPORT PublicKeyRequester : public KeyRequester { - Q_OBJECT +class TDE_EXPORT PublicKeyRequester : public KeyRequester { + TQ_OBJECT public: PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false, @@ -274,8 +274,8 @@ protected: }; -class KDE_EXPORT SecretKeyRequester : public KeyRequester { - Q_OBJECT +class TDE_EXPORT SecretKeyRequester : public KeyRequester { + TQ_OBJECT public: SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false, @@ -295,9 +295,9 @@ protected: // ------------------------------------------------------------------------- -class KDE_EXPORT KeyApprovalDialog: public KDialogBase +class TDE_EXPORT KeyApprovalDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -331,9 +331,9 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase // ------------------------------------------------------------------------- -class KDE_EXPORT CipherTextDialog: public KDialogBase +class TDE_EXPORT CipherTextDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: |