summaryrefslogtreecommitdiffstats
path: root/kmail/identitydialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/identitydialog.cpp')
-rw-r--r--kmail/identitydialog.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index f32c014ae..1b621ef95 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -73,12 +73,12 @@ using KMail::FolderRequester;
#include <tqtabwidget.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqgroupbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
// other headers:
#include <gpgmepp/key.h>
@@ -427,16 +427,16 @@ namespace KMail {
// Tab Widget: Signature
//
mSignatureConfigurator = new SignatureConfigurator( tabWidget );
- mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
+ mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() );
tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") );
mXFaceConfigurator = new XFaceConfigurator( tabWidget );
- mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
+ mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
- if ( tqgeometry.hasKey( "Identity Dialog size" ) )
- resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ if ( geometry.hasKey( "Identity Dialog size" ) )
+ resize( geometry.readSizeEntry( "Identity Dialog size" ) );
mNameEdit->setFocus();
connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
}
IdentityDialog::~IdentityDialog() {
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
- tqgeometry.writeEntry( "Identity Dialog size", size() );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ geometry.writeEntry( "Identity Dialog size", size() );
}
void IdentityDialog::slotAboutToShow( TQWidget * w ) {
@@ -527,7 +527,7 @@ void IdentityDialog::slotOk() {
for ( TQStringList::const_iterator it = aliases.begin(), end = aliases.end() ; it != end ; ++it ) {
if ( !isValidSimpleEmailAddress( *it ) ) {
TQString errorMsg( simpleEmailAddressErrorMsg());
- KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) );
+ KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").arg( *it ) );
return;
}
}
@@ -580,7 +580,7 @@ void IdentityDialog::slotOk() {
}
if ( err )
- if ( KMessageBox::warningContinueCancel( this, msg.tqarg( email ),
+ if ( KMessageBox::warningContinueCancel( this, msg.arg( email ),
i18n("Email Address Not Found in Key/Certificates"),
KStdGuiItem::cont(), "warn_email_not_in_certificate" )
!= KMessageBox::Continue)
@@ -612,7 +612,7 @@ void IdentityDialog::slotOk() {
void IdentityDialog::setIdentity( KPIM::Identity & ident ) {
- setCaption( i18n("Edit Identity \"%1\"").tqarg( ident.identityName() ) );
+ setCaption( i18n("Edit Identity \"%1\"").arg( ident.identityName() ) );
// "General" tab:
mNameEdit->setText( ident.fullName() );
@@ -641,7 +641,7 @@ void IdentityDialog::slotOk() {
"\"%1\" does not exist (anymore); "
"therefore, the default sent-mail folder "
"will be used.")
- .tqarg( ident.identityName() ) ) )
+ .arg( ident.identityName() ) ) )
mFccCombo->setFolder( kmkernel->sentFolder() );
else
mFccCombo->setFolder( ident.fcc() );
@@ -652,7 +652,7 @@ void IdentityDialog::slotOk() {
"\"%1\" does not exist (anymore); "
"therefore, the default drafts folder "
"will be used.")
- .tqarg( ident.identityName() ) ) )
+ .arg( ident.identityName() ) ) )
mDraftsCombo->setFolder( kmkernel->draftsFolder() );
else
mDraftsCombo->setFolder( ident.drafts() );
@@ -663,14 +663,14 @@ void IdentityDialog::slotOk() {
"\"%1\" does not exist (anymore); "
"therefore, the default templates folder "
"will be used.")
- .tqarg( ident.identityName() ) ) )
+ .arg( ident.identityName() ) ) )
mTemplatesCombo->setFolder( kmkernel->templatesFolder() );
else
mTemplatesCombo->setFolder( ident.templates() );
// "Templates" tab:
uint identity = ident.uoid();
- TQString iid = TQString("IDENTITY_%1").tqarg( identity );
+ TQString iid = TQString("IDENTITY_%1").arg( identity );
Templates t( iid );
mCustom->setChecked(t.useCustomTemplates());
mWidget->loadFromIdentity( identity );
@@ -709,7 +709,7 @@ void IdentityDialog::slotOk() {
mTemplatesCombo->folder()->idString() : TQString() );
// "Templates" tab:
uint identity = ident.uoid();
- TQString iid = TQString("IDENTITY_%1").tqarg( identity );
+ TQString iid = TQString("IDENTITY_%1").arg( identity );
Templates t( iid );
kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl;
t.setUseCustomTemplates(mCustom->isChecked());