summaryrefslogtreecommitdiffstats
path: root/kmail/accountwizard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/accountwizard.cpp')
-rw-r--r--kmail/accountwizard.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 6a188fbb5..04be2add9 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -36,7 +36,7 @@
#include <tqdir.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqvbox.h>
@@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage()
void AccountWizard::setupAccountInformationPage()
{
mAccountInformationPage = new TQWidget( this );
- TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2,
+ TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2,
KDialog::marginHint(), KDialog::spacingHint() );
TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage );
mRealName = new KLineEdit( mAccountInformationPage );
label->setBuddy( mRealName );
- tqlayout->addWidget( label, 0, 0 );
- tqlayout->addWidget( mRealName, 0, 1 );
+ layout->addWidget( label, 0, 0 );
+ layout->addWidget( mRealName, 0, 1 );
label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage );
mEMailAddress = new KLineEdit( mAccountInformationPage );
label->setBuddy( mEMailAddress );
- tqlayout->addWidget( label, 1, 0 );
- tqlayout->addWidget( mEMailAddress, 1, 1 );
+ layout->addWidget( label, 1, 0 );
+ layout->addWidget( mEMailAddress, 1, 1 );
label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage );
mOrganization = new KLineEdit( mAccountInformationPage );
label->setBuddy( mOrganization );
- tqlayout->addWidget( label, 2, 0 );
- tqlayout->addWidget( mOrganization, 2, 1 );
+ layout->addWidget( label, 2, 0 );
+ layout->addWidget( mOrganization, 2, 1 );
addPage( mAccountInformationPage, i18n( "Account Information" ) );
}
@@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage()
void AccountWizard::setupLoginInformationPage()
{
mLoginInformationPage = new TQWidget( this );
- TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2,
+ TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2,
KDialog::marginHint(), KDialog::spacingHint() );
TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage );
mLoginName = new KLineEdit( mLoginInformationPage );
label->setBuddy( mLoginName );
- tqlayout->addWidget( label, 0, 0 );
- tqlayout->addWidget( mLoginName, 0, 1 );
+ layout->addWidget( label, 0, 0 );
+ layout->addWidget( mLoginName, 0, 1 );
label = new TQLabel( i18n( "Password:" ), mLoginInformationPage );
mPassword = new KLineEdit( mLoginInformationPage );
mPassword->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPassword );
- tqlayout->addWidget( label, 1, 0 );
- tqlayout->addWidget( mPassword, 1, 1 );
+ layout->addWidget( label, 1, 0 );
+ layout->addWidget( mPassword, 1, 1 );
addPage( mLoginInformationPage, i18n( "Login Information" ) );
}
@@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage()
void AccountWizard::setupServerInformationPage()
{
mServerInformationPage = new TQWidget( this );
- TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2,
+ TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2,
KDialog::marginHint(), KDialog::spacingHint() );
mIncomingLabel = new TQLabel( mServerInformationPage );
@@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage()
connect( mChooseLocation, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( chooseLocation() ) );
- tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop );
- tqlayout->addWidget( mIncomingLocationWdg, 0, 1 );
- tqlayout->addWidget( mIncomingServerWdg, 0, 1 );
+ layout->addWidget( mIncomingLabel, 0, 0, AlignTop );
+ layout->addWidget( mIncomingLocationWdg, 0, 1 );
+ layout->addWidget( mIncomingServerWdg, 0, 1 );
TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage );
mOutgoingServer = new KLineEdit( mServerInformationPage );
label->setBuddy( mOutgoingServer );
- tqlayout->addWidget( label, 1, 0 );
- tqlayout->addWidget( mOutgoingServer, 1, 1 );
+ layout->addWidget( label, 1, 0 );
+ layout->addWidget( mOutgoingServer, 1, 1 );
mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage );
- tqlayout->addWidget( mOutgoingUseSSL, 2, 1 );
+ layout->addWidget( mOutgoingUseSSL, 2, 1 );
mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ),
mServerInformationPage );
- tqlayout->addWidget( mLocalDelivery, 3, 0 );
+ layout->addWidget( mLocalDelivery, 3, 0 );
connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ),
mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) );
@@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port )
connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) );
- mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::checkImapCapabilities( const TQString &server, int port )
@@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port )
connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
- mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
@@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
const TQString&, const TQString&, const TQString& ) ) );
- mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::popCapabilities( const TQStringList &capaNormalList,