diff options
Diffstat (limited to 'certmanager/lib/ui')
24 files changed, 123 insertions, 123 deletions
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp index 1c548c5b..ed1a3317 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp @@ -44,12 +44,12 @@ * 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. + * true to construct a modal dialog. */ 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) ) ); + portED->setValidator( new TQIntValidator( 0, 65535, portED ) ); } /* diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h index c422c3a4..bc6af010 100644 --- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h +++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h @@ -40,7 +40,7 @@ class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog public: - AddDirectoryServiceDialogImpl( TQWidget* parent = 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 9d8f4d40..43b1c13f 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing @@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureButtonClicked()) ); d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -304,9 +304,9 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { int result = dlg.exec(); if ( result == TQDialog::Accepted ) { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed - kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index 041177a2..7f965773 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class CryptoBackendFactory; @@ -45,7 +45,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT BackendConfigWidget : public TQWidget { + class TDE_EXPORT BackendConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 4ec32cbb..40608ee1 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); + connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); if ( mMainWidget->hasError() ) { showButton( Default, false ); diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 9ed30c9e..f16ff948 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { @@ -43,7 +43,7 @@ namespace Kleo { /** * Simple KDialogBase wrapper around CryptoConfigModule */ - class KDE_EXPORT CryptoConfigDialog : public KDialogBase + class TDE_EXPORT CryptoConfigDialog : public KDialogBase { TQ_OBJECT diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index cfe15442..c6e5594f 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( const char* name ) : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) ); } TQString Kleo::CryptoConfigEntryGUI::description() const @@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); + connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) ); } } @@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); } } @@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) ); } } @@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); + connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index 5514e877..9a97c680 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,14 +34,14 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> class CryptPlugWrapper; namespace Kleo { class CryptoConfigEntry; -class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase +class TDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase { TQ_OBJECT diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index fcc7d493..c34b16f1 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -330,13 +330,13 @@ By clicking this button, you can remove the currently selected directory service <slot>slotMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotAddService()</slot> <slot access="protected">slotDeleteService()</slot> <slot access="protected">slotServiceChanged( TQListViewItem* )</slot> <slot access="protected">slotServiceSelected( TQListViewItem* )</slot> <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 874ba0fa..38c4df9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); - connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); + connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); @@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { @@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap tb->setEnabled( false ); TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index 70c093d4..a8fcf934 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class DNAttributeMapper; } @@ -43,7 +43,7 @@ class TQListViewItem; namespace Kleo { - class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { + class TDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 6b873c0b..fd796b8d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index d6a59b09..25c82fcf 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> @@ -55,7 +55,7 @@ class TQStringList; namespace Kleo { - class KDE_EXPORT KeyApprovalDialog : public KDialogBase { + class TDE_EXPORT KeyApprovalDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 00f69500..af067b1e 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -123,14 +123,14 @@ static const struct { const char * source; const char * target; } signalReplacements[] = { - { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, - { TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, - { TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, + { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; @@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); d->updateTimer = new TQTimer( this ); - connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 414e4dea..0db1b1e3 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPainter; class TQColorGroup; @@ -62,7 +62,7 @@ namespace Kleo { class KeyListView; - class KDE_EXPORT KeyListViewItem : public TQListViewItem { + class TDE_EXPORT KeyListViewItem : public TQListViewItem { public: KeyListViewItem( KeyListView * parent, const GpgME::Key & key ); KeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Key & key ); @@ -101,7 +101,7 @@ namespace Kleo { GpgME::Key mKey; }; - class KDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SubkeyKeyListViewItem : public KeyListViewItem { public: SubkeyKeyListViewItem( KeyListView * parent, const GpgME::Subkey & subkey ); SubkeyKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::Subkey & subkey ); @@ -133,7 +133,7 @@ namespace Kleo { GpgME::Subkey mSubkey; }; - class KDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT UserIDKeyListViewItem : public KeyListViewItem { public: UserIDKeyListViewItem( KeyListView * parent, const GpgME::UserID & userid ); UserIDKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID & userid ); @@ -165,7 +165,7 @@ namespace Kleo { GpgME::UserID mUserID; }; - class KDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { + class TDE_EXPORT SignatureKeyListViewItem : public KeyListViewItem { public: SignatureKeyListViewItem( KeyListView * parent, const GpgME::UserID::Signature & sig ); SignatureKeyListViewItem( KeyListView * parent, KeyListViewItem * after, const GpgME::UserID::Signature & sig ); @@ -198,13 +198,13 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public TDEListView { + class TDE_EXPORT KeyListView : public TDEListView { TQ_OBJECT friend class KeyListViewItem; public: - class KDE_EXPORT ColumnStrategy { + class TDE_EXPORT ColumnStrategy { public: virtual ~ColumnStrategy(); virtual TQString title( int column ) const = 0; @@ -232,7 +232,7 @@ namespace Kleo { virtual int signatureCompare( const GpgME::UserID::Signature & sig1, const GpgME::UserID::Signature & sig2, const int column ) const; }; - class KDE_EXPORT DisplayStrategy { + class TDE_EXPORT DisplayStrategy { public: virtual ~DisplayStrategy(); //font diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index e245898e..6dd1b05e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -130,8 +130,8 @@ void Kleo::KeyRequester::init() 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 ) ); @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 2f7b3b26..ba383335 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class KeyListView; @@ -73,7 +73,7 @@ class TQLabel; namespace Kleo { /// Base class for SigningKeyRequester and EncryptionKeyRequester - class KDE_EXPORT KeyRequester : public TQWidget { + class TDE_EXPORT KeyRequester : public TQWidget { TQ_OBJECT public: @@ -159,7 +159,7 @@ namespace Kleo { }; - class KDE_EXPORT EncryptionKeyRequester : public KeyRequester { + class TDE_EXPORT EncryptionKeyRequester : public KeyRequester { TQ_OBJECT public: @@ -187,7 +187,7 @@ namespace Kleo { }; - class KDE_EXPORT SigningKeyRequester : public KeyRequester { + class TDE_EXPORT SigningKeyRequester : public KeyRequester { TQ_OBJECT public: diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 25a1a225..78bb441d 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -60,7 +60,7 @@ #include <twin.h> #include <tdeconfig.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kactivelabel.h> #include <kurl.h> @@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection if ( !text.isEmpty() ) { if ( text.startsWith( "<qt>" ) ) { KActiveLabel *textLabel = new KActiveLabel( text, page ); - disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); - connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); + disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) ); + connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) ); textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { @@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQPushButton * const searchExternalPB = new TQPushButton( i18n("Search for &External Certificates"), page ); mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft ); - connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) ); + connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) ); if ( initialQuery.isEmpty() ) searchExternalPB->hide(); @@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); mKeyListView->setResizeMode( TQListView::LastColumn ); @@ -430,27 +430,27 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection "</p></qt>") ); } - connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotTryOk()) ); + TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotTryOk()) ); connect( mKeyListView, - TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), - TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); + TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); - connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); + connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) ); + connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); - if ( kapp ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + if ( tdeApp ) { + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); TQSize dialogSize( 500, 400 ); TDEConfigGroup dialogConfig( TDEGlobal::config(), "Key Selection Dialog" ); @@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P return; } - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : - TQT_SLOT(slotAddKey(const GpgME::Key&)) ); + TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQ_SLOT(slotAddKey(const GpgME::Key&)) ); TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); @@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo mCurrentContextMenuItem = item; TQPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) ); menu.exec( p ); } diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index c8c833dd..60442558 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> class TQVBoxLayout; @@ -63,7 +63,7 @@ namespace GpgME { namespace Kleo { - class KDE_EXPORT KeySelectionDialog : public KDialogBase { + class TDE_EXPORT KeySelectionDialog : public KDialogBase { TQ_OBJECT public: diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index f2771201..68837d38 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & vlay->addWidget( d->lineedit ); - connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 6fe2f531..8c530a56 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); + connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) ); fixup( true ); } diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index ead5b12c..4119a1d7 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQTimer; namespace Kleo { @@ -42,7 +42,7 @@ namespace Kleo { /** @short A TQProgressBar with self-powered busy indicator */ - class KDE_EXPORT ProgressBar : public TQProgressBar { + class TDE_EXPORT ProgressBar : public TQProgressBar { TQ_OBJECT public: diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 692ee4cb..b99db7cb 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, setLabelText( baseText ); setProgress( 0, 0 ); // activate busy indicator - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); - connect( this, TQT_SIGNAL(canceled()), - job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) ); + connect( this, TQ_SIGNAL(canceled()), + job, TQ_SLOT(slotCancel()) ); - TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) ); } Kleo::ProgressDialog::~ProgressDialog() { @@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() { void Kleo::ProgressDialog::setMinimumDuration( int ms ) { if ( 0 < ms && ms < minimumDuration() ) - TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) ); TQProgressDialog::setMinimumDuration( ms ); } diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index 35b1886d..7414cb08 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace Kleo { class Job; @@ -43,7 +43,7 @@ namespace Kleo { /** @short A progress dialog for Kleo::Jobs */ - class KDE_EXPORT ProgressDialog : public TQProgressDialog { + class TDE_EXPORT ProgressDialog : public TQProgressDialog { TQ_OBJECT public: |