diff options
Diffstat (limited to 'certmanager/conf')
-rw-r--r-- | certmanager/conf/appearanceconfigpage.cpp | 6 | ||||
-rw-r--r-- | certmanager/conf/appearanceconfigpage.h | 2 | ||||
-rw-r--r-- | certmanager/conf/appearanceconfigwidget.h | 2 | ||||
-rw-r--r-- | certmanager/conf/appearanceconfigwidgetbase.ui | 4 | ||||
-rw-r--r-- | certmanager/conf/configuredialog.cpp | 2 | ||||
-rw-r--r-- | certmanager/conf/configuredialog.h | 2 | ||||
-rw-r--r-- | certmanager/conf/dirservconfigpage.cpp | 12 | ||||
-rw-r--r-- | certmanager/conf/dirservconfigpage.h | 6 | ||||
-rw-r--r-- | certmanager/conf/dnorderconfigpage.cpp | 6 | ||||
-rw-r--r-- | certmanager/conf/dnorderconfigpage.h | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 087e237e..3ec3e1dd 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kdemacros.h> +#include <tdemacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : TDECModule( parent, name ) @@ -44,7 +44,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, con TQVBoxLayout* lay = new TQVBoxLayout( this ); mWidget = new Kleo::AppearanceConfigWidget( this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); @@ -70,7 +70,7 @@ void AppearanceConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_appear( TQWidget *parent, const char * ) { AppearanceConfigurationPage *page = new AppearanceConfigurationPage( parent, "kleopatra_config_appear" ); diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h index 6b6848c4..c8cd8e22 100644 --- a/certmanager/conf/appearanceconfigpage.h +++ b/certmanager/conf/appearanceconfigpage.h @@ -42,7 +42,7 @@ namespace Kleo { * "Appearance" configuration page for kleopatra's configuration dialog */ class AppearanceConfigurationPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h index f6ca9c8e..2609f5dc 100644 --- a/certmanager/conf/appearanceconfigwidget.h +++ b/certmanager/conf/appearanceconfigwidget.h @@ -41,7 +41,7 @@ class TDEConfig; namespace Kleo { class AppearanceConfigWidget : public AppearanceConfigWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui index 57029201..462963f2 100644 --- a/certmanager/conf/appearanceconfigwidgetbase.ui +++ b/certmanager/conf/appearanceconfigwidgetbase.ui @@ -201,7 +201,7 @@ <tabstop>strikeoutCB</tabstop> <tabstop>defaultLookPB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotForegroundClicked()</slot> <slot access="protected">slotBackgroundClicked()</slot> <slot access="protected">slotFontClicked()</slot> @@ -210,6 +210,6 @@ <slot access="protected">slotItalicClicked()</slot> <slot access="protected">slotBoldClicked()</slot> <slot access="protected">slotStrikeoutClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index 4d0d1e68..cf6923f0 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -41,7 +41,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); showButton( User1, true ); addModule( "kleopatra_config_dirserv", false ); diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h index 95d20d53..8216cbe8 100644 --- a/certmanager/conf/configuredialog.h +++ b/certmanager/conf/configuredialog.h @@ -38,7 +38,7 @@ class ConfigureDialog : public KCMultiDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 43373e72..772dfd7d 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <kdemacros.h> +#include <tdemacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc @@ -146,7 +146,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget Kleo::CryptoConfigEntry::ArgType_LDAPURL, true ); mWidget = new Kleo::DirectoryServicesWidget( entry, this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); // LDAP timeout TQHBox* box = new TQHBox( this ); @@ -155,7 +155,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box ); mTimeout = new TQTimeEdit( box ); mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds ); - connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( mTimeout, TQ_SIGNAL( valueChanged( const TQTime& ) ), this, TQ_SLOT( slotChanged() ) ); label->setBuddy( mTimeout ); TQWidget* stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); @@ -167,13 +167,13 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget mMaxItems = new KIntNumInput( box ); mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter ); mMaxItems->setMinValue( 0 ); - connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( mMaxItems, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); #ifdef NOT_USEFUL_CURRENTLY mAddNewServersCB = new TQCheckBox( i18n( "Automatically add &new servers discovered in CRL distribution points" ), this ); - connect( mAddNewServersCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( mAddNewServersCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); lay->addWidget( mAddNewServersCB ); #endif @@ -259,7 +259,7 @@ void DirectoryServicesConfigurationPage::defaults() extern "C" { - KDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kleopatra_config_dirserv( TQWidget *parent, const char * ) { DirectoryServicesConfigurationPage *page = new DirectoryServicesConfigurationPage( parent, "kleopatra_config_dirserv" ); diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index e9bdd51a..81bf3b8e 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <tdecmodule.h> #include <kleo/cryptoconfig.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQCheckBox; class TQTimeEdit; @@ -50,8 +50,8 @@ namespace Kleo { * The user can configure LDAP servers in this page, to be used for listing/fetching * remote certificates in kleopatra. */ -class KDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { - Q_OBJECT +class TDE_EXPORT DirectoryServicesConfigurationPage : public TDECModule { + TQ_OBJECT public: DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 ); diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 18668684..beaea7fa 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqlayout.h> @@ -45,7 +45,7 @@ DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( mWidget, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); @@ -70,7 +70,7 @@ void DNOrderConfigPage::slotChanged() { emit changed(true); } -extern "C" KDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { +extern "C" TDE_EXPORT TDECModule * create_kleopatra_config_dnorder( TQWidget * parent, const char * ) { return new DNOrderConfigPage( parent, "kleopatra_config_dnorder" ); } diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h index 0830acbc..9c42d5c8 100644 --- a/certmanager/conf/dnorderconfigpage.h +++ b/certmanager/conf/dnorderconfigpage.h @@ -42,7 +42,7 @@ namespace Kleo { * "DN Order" configuration page for kleopatra's configuration dialog */ class DNOrderConfigPage : public TDECModule { - Q_OBJECT + TQ_OBJECT public: DNOrderConfigPage( TQWidget * parent=0, const char * name=0 ); |