summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail')
-rw-r--r--kmail/CMakeLists.txt1
-rw-r--r--kmail/accountdialog.cpp24
-rw-r--r--kmail/accountmanager.cpp6
-rw-r--r--kmail/accountwizard.cpp10
-rw-r--r--kmail/actionscheduler.cpp24
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/antispamwizard.cpp10
-rw-r--r--kmail/archivefolderdialog.cpp4
-rw-r--r--kmail/backupjob.cpp26
-rw-r--r--kmail/bodypartformatterfactory.cpp12
-rw-r--r--kmail/cachedimapjob.cpp22
-rw-r--r--kmail/callback.cpp12
-rw-r--r--kmail/chiasmuskeyselector.cpp2
-rw-r--r--kmail/compactionjob.cpp10
-rw-r--r--kmail/configuredialog.cpp38
-rw-r--r--kmail/configuredialog_p.cpp12
-rw-r--r--kmail/csshelper.cpp2
-rw-r--r--kmail/customtemplates.cpp2
-rw-r--r--kmail/distributionlistdialog.cpp2
-rw-r--r--kmail/expirejob.cpp18
-rw-r--r--kmail/favoritefolderview.cpp6
-rw-r--r--kmail/filehtmlwriter.cpp2
-rw-r--r--kmail/filterlogdlg.cpp2
-rw-r--r--kmail/folderdiaacltab.cpp8
-rw-r--r--kmail/folderdiaquotatab.cpp6
-rw-r--r--kmail/folderpropertiesdialog.ui12
-rw-r--r--kmail/folderrequester.cpp4
-rw-r--r--kmail/foldershortcutdialog.cpp2
-rw-r--r--kmail/folderstorage.cpp4
-rw-r--r--kmail/foldertreebase.cpp6
-rw-r--r--kmail/folderutil.cpp2
-rw-r--r--kmail/folderviewtooltip.h10
-rw-r--r--kmail/headeritem.cpp2
-rw-r--r--kmail/headerlistquicksearch.cpp6
-rw-r--r--kmail/headerstyle.cpp114
-rw-r--r--kmail/identitydialog.cpp16
-rw-r--r--kmail/identitylistview.cpp2
-rw-r--r--kmail/imapaccountbase.cpp28
-rw-r--r--kmail/imapjob.cpp8
-rw-r--r--kmail/importjob.cpp20
-rw-r--r--kmail/index.cpp8
-rw-r--r--kmail/interfaces/bodypart.h3
-rw-r--r--kmail/keyresolver.cpp34
-rw-r--r--kmail/kmaccount.cpp8
-rw-r--r--kmail/kmacctimap.cpp20
-rw-r--r--kmail/kmacctlocal.cpp16
-rw-r--r--kmail/kmacctmaildir.cpp12
-rw-r--r--kmail/kmail.kcfg8
-rw-r--r--kmail/kmail_part.cpp4
-rw-r--r--kmail/kmailicalifaceimpl.cpp26
-rw-r--r--kmail/kmcommands.cpp46
-rw-r--r--kmail/kmcomposewin.cpp274
-rw-r--r--kmail/kmedit.cpp22
-rw-r--r--kmail/kmfilter.cpp10
-rw-r--r--kmail/kmfilteraction.cpp50
-rw-r--r--kmail/kmfilterdlg.cpp14
-rw-r--r--kmail/kmfolder.cpp6
-rw-r--r--kmail/kmfoldercachedimap.cpp46
-rw-r--r--kmail/kmfoldercombobox.cpp4
-rw-r--r--kmail/kmfolderdir.cpp6
-rw-r--r--kmail/kmfolderimap.cpp12
-rw-r--r--kmail/kmfolderindex.cpp4
-rw-r--r--kmail/kmfoldermaildir.cpp20
-rw-r--r--kmail/kmfoldermbox.cpp18
-rw-r--r--kmail/kmfoldermgr.cpp8
-rw-r--r--kmail/kmfoldersearch.cpp4
-rw-r--r--kmail/kmfoldertree.cpp24
-rw-r--r--kmail/kmheaders.cpp44
-rw-r--r--kmail/kmkernel.cpp44
-rw-r--r--kmail/kmlineeditspell.cpp2
-rw-r--r--kmail/kmmainwidget.cpp306
-rw-r--r--kmail/kmmainwin.cpp12
-rw-r--r--kmail/kmmessage.cpp56
-rw-r--r--kmail/kmmimeparttree.cpp8
-rw-r--r--kmail/kmmsgbase.cpp30
-rw-r--r--kmail/kmmsginfo.cpp2
-rw-r--r--kmail/kmmsgpartdlg.cpp12
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp4
-rw-r--r--kmail/kmreadermainwin.cpp30
-rw-r--r--kmail/kmreaderwin.cpp200
-rw-r--r--kmail/kmsearchpatternedit.cpp8
-rw-r--r--kmail/kmsender.cpp30
-rw-r--r--kmail/kmservertest.cpp2
-rw-r--r--kmail/kmstartup.cpp16
-rw-r--r--kmail/kmsystemtray.cpp6
-rw-r--r--kmail/kmtransport.cpp10
-rw-r--r--kmail/listjob.cpp4
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp20
-rw-r--r--kmail/mailserviceimpl.h5
-rw-r--r--kmail/managesievescriptsdialog.cpp2
-rw-r--r--kmail/messagecomposer.cpp8
-rw-r--r--kmail/networkaccount.cpp2
-rw-r--r--kmail/newfolderdialog.cpp6
-rw-r--r--kmail/objecttreeparser.cpp114
-rw-r--r--kmail/partNode.cpp8
-rw-r--r--kmail/partnodebodypart.cpp4
-rw-r--r--kmail/popaccount.cpp26
-rw-r--r--kmail/quotajobs.h4
-rw-r--r--kmail/recipientseditor.cpp4
-rw-r--r--kmail/recipientspicker.cpp4
-rw-r--r--kmail/regexplineedit.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.cpp54
-rw-r--r--kmail/searchjob.cpp4
-rw-r--r--kmail/searchwindow.cpp88
-rw-r--r--kmail/sievedebugdialog.cpp8
-rw-r--r--kmail/snippetwidget.cpp40
-rw-r--r--kmail/subscriptiondialog.cpp2
-rw-r--r--kmail/templateparser.cpp26
-rw-r--r--kmail/templatesconfiguration.cpp12
-rw-r--r--kmail/templatesinsertcommand.cpp4
-rw-r--r--kmail/urlhandlermanager.cpp10
-rw-r--r--kmail/util.cpp10
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/vacation.cpp6
-rw-r--r--kmail/vacationdialog.cpp2
-rw-r--r--kmail/xfaceconfigurator.cpp2
116 files changed, 1256 insertions, 1255 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 0dddc98c2..c2edd2380 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -227,6 +227,7 @@ tde_add_kpart( libkmailpart AUTOMOC
tde_add_kpart( libkmail_bodypartformatter_application_octetstream
SOURCES app_octetstream.cpp
+ LINK ${TQT_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 4dab221bc..2782bfa93 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -181,7 +181,7 @@ void
ProcmailRCParser::processLocalLock(const TQString &s)
{
TQString val;
- int colonPos = s.findRev(':');
+ int colonPos = s.tqfindRev(':');
if (colonPos > 0) { // we don't care about the leading one
val = s.mid(colonPos + 1).stripWhiteSpace();
@@ -357,7 +357,7 @@ void AccountDialog::makeLocalAccountPage()
topLayout->addWidget( choose, 3, 2 );
TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page );
- group->setColumnLayout(0, TQt::Horizontal);
+ group->setColumnLayout(0, Qt::Horizontal);
group->tqlayout()->setSpacing( 0 );
group->tqlayout()->setMargin( 0 );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() );
@@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mPop.portEdit = new KLineEdit( page1 );
- mPop.portEdit->setValidator( new TQIntValidator(this) );
+ mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
label->setBuddy( mPop.portEdit );
grid->addWidget( mPop.portEdit, 4, 1 );
@@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage()
vlay->addSpacing( KDialog::spacingHint() );
- mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Encryption"), page2 );
mPop.encryptionNone =
new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
@@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage()
TQT_SLOT(slotPopEncryptionChanged(int)));
vlay->addWidget( mPop.encryptionGroup );
- mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Authentication Method"), page2 );
mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup,
"auth clear text" );
@@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, row, 0 );
mImap.portEdit = new KLineEdit( page1 );
- mImap.portEdit->setValidator( new TQIntValidator(this) );
+ mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
label->setBuddy( mImap.portEdit );
grid->addWidget( mImap.portEdit, row, 1 );
@@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
vlay->addSpacing( KDialog::spacingHint() );
- mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Encryption"), page2 );
mImap.encryptionNone =
new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
@@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
TQT_SLOT(slotImapEncryptionChanged(int)));
vlay->addWidget( mImap.encryptionGroup );
- mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Authentication Method"), page2 );
mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup );
mImap.authLogin = new TQRadioButton( i18n("Please translate this "
@@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings()
mPop.loginEdit->setText( ap.login() );
mPop.passwordEdit->setText( ap.passwd());
mPop.hostEdit->setText( ap.host() );
- mPop.portEdit->setText( TQString("%1").arg( ap.port() ) );
+ mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) );
mPop.usePipeliningCheck->setChecked( ap.usePipelining() );
mPop.storePasswordCheck->setChecked( ap.storePasswd() );
mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() );
@@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings()
mImap.loginEdit->setText( ai.login() );
mImap.passwordEdit->setText( ai.passwd());
mImap.hostEdit->setText( ai.host() );
- mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+ mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
mImap.autoExpungeCheck->setChecked( ai.autoExpunge() );
mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() );
mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() );
@@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings()
mImap.loginEdit->setText( ai.login() );
mImap.passwordEdit->setText( ai.passwd());
mImap.hostEdit->setText( ai.host() );
- mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
+ mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) );
#if 0
mImap.resourceCheck->setChecked( ai.resource() );
#endif
@@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *tqparent,
} else {
ns = i18n("Shared");
}
- setCaption( i18n("Edit Namespace '%1'").arg(ns) );
+ setCaption( i18n("Edit Namespace '%1'").tqarg(ns) );
TQGrid* grid = new TQGrid( 2, page );
mBg = new TQButtonGroup( 0 );
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index d62280fd1..40d95b296 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -100,7 +100,7 @@ void AccountManager::readConfig(void)
acctType = "pop";
acctName = config->readEntry("Name");
id = config->readUnsignedNumEntry("Id", 0);
- if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i);
+ if (acctName.isEmpty()) acctName = i18n("Account %1").tqarg(i);
acct = create(acctType, acctName, id);
if (!acct) continue;
add(acct);
@@ -183,7 +183,7 @@ void AccountManager::processNextCheck( bool _newMail )
TQString tmp = i18n("Account %1 has no mailbox defined:\n"
"mail checking aborted;\n"
"check your account settings.")
- .arg(curAccount->name());
+ .tqarg(curAccount->name());
KMessageBox::information(0,tmp);
emit checkedMail( false, mInteractive, mTotalNewInFolder );
mTotalNewMailsArrived = 0;
@@ -223,7 +223,7 @@ void AccountManager::processNextCheck( bool _newMail )
this, TQT_SLOT( processNextCheck( bool ) ) );
KPIM::BroadcastqStatus::instance()->seStatusMsg(
- i18n("Checking account %1 for new mail").arg(curAccount->name()));
+ i18n("Checking account %1 for new mail").tqarg(curAccount->name()));
kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index e4e8b8334..0ae07d6c1 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -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..." ).arg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( 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..." ).arg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( 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..." ).arg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
}
void AccountWizard::popCapabilities( const TQStringList &capaNormalList,
@@ -652,7 +652,7 @@ void AccountWizard::smtpCapabilities( const TQStringList &capaNormal,
if ( authNone.isEmpty() && authSSL.isEmpty() && authTLS.isEmpty() ) {
// slave doesn't seem to support "* AUTH METHODS" metadata (or server can't do AUTH)
authBitsNone = authMethodsFromStringList( capaNormal );
- if ( capaNormal.findIndex( "STARTTLS" ) != -1 )
+ if ( capaNormal.tqfindIndex( "STARTTLS" ) != -1 )
authBitsTLS = authBitsNone;
else
authBitsTLS = 0;
@@ -664,7 +664,7 @@ void AccountWizard::smtpCapabilities( const TQStringList &capaNormal,
}
uint authBits = 0;
- if ( capaNormal.findIndex( "STARTTLS" ) != -1 ) {
+ if ( capaNormal.tqfindIndex( "STARTTLS" ) != -1 ) {
mTransportInfo->encryption = "TLS";
authBits = authBitsTLS;
} else if ( !capaSSL.isEmpty() ) {
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index 77685ee4b..3d1c86880 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res)
if (msg) {
if ( FilterLog::instance()->isLogging() ) {
TQString logText( i18n( "<b>Applying filter action:</b> %1" )
- .arg( mFilterAction->displayString() ) );
+ .tqarg( mFilterAction->displayString() ) );
FilterLog::instance()->add( logText, FilterLog::appliedAction );
}
KMFilterAction *action = mFilterAction;
@@ -786,19 +786,19 @@ TQString ActionScheduler::debug()
TQValueList<ActionScheduler*>::iterator it;
int i = 1;
for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) {
- res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) );
- if ((*it)->mAccount && kmkernel->tqfind( (*it)->mAccountId )) {
+ res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) );
+ if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) {
res.append( TQString( "Account %1, Name %2.\n" )
- .arg( (*it)->mAccountId )
- .arg( kmkernel->acctMgr()->tqfind( (*it)->mAccountId )->name() ) );
+ .tqarg( (*it)->mAccountId )
+ .tqarg( kmkernel->acctMgr()->tqfind( (*it)->mAccountId )->name() ) );
}
- res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) );
- res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) );
- res.append( TQString( "mFetchExecuting %1.\n" ).arg( (*it)->mFetchExecuting ? "true" : "false" ) );
- res.append( TQString( "mOriginalSerNum %1.\n" ).arg( (*it)->mOriginalSerNum ) );
- res.append( TQString( "mMessageIt %1.\n" ).arg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) );
- res.append( TQString( "mSerNums count %1, " ).arg( (*it)->mSerNums.count() ) );
- res.append( TQString( "mFetchSerNums count %1.\n" ).arg( (*it)->mFetchSerNums.count() ) );
+ res.append( TQString( "mExecuting %1, " ).tqarg( (*it)->mExecuting ? "true" : "false" ) );
+ res.append( TQString( "mExecutingLock %1, " ).tqarg( (*it)->mExecutingLock ? "true" : "false" ) );
+ res.append( TQString( "mFetchExecuting %1.\n" ).tqarg( (*it)->mFetchExecuting ? "true" : "false" ) );
+ res.append( TQString( "mOriginalSerNum %1.\n" ).tqarg( (*it)->mOriginalSerNum ) );
+ res.append( TQString( "mMessageIt %1.\n" ).tqarg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) );
+ res.append( TQString( "mSerNums count %1, " ).tqarg( (*it)->mSerNums.count() ) );
+ res.append( TQString( "mFetchSerNums count %1.\n" ).tqarg( (*it)->mFetchSerNums.count() ) );
res.append( TQString( "mResult " ) );
if ((*it)->mResult == ResultOk)
res.append( TQString( "ResultOk.\n" ) );
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 384752c24..19198e11a 100644
--- a/kmail/antispamconfig.cpp
+++ b/kmail/antispamconfig.cpp
@@ -59,7 +59,7 @@ void AntiSpamConfig::readConfig()
KConfigGroup general( &config, "General" );
unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 );
for ( unsigned int i = 1; i <= totalTools; ++i ) {
- KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) );
+ KConfigGroup tool( &config, TQString("Spamtool #%1").tqarg( i ) );
if ( tool.hasKey( "ScoreHeader" ) ) {
TQString name = tool.readEntry( "ScoreName" );
TQCString header = tool.readEntry( "ScoreHeader" ).latin1();
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index af32ec486..1e5e912b8 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability()
bool found = false;
for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin();
it != mToolList.end(); ++it ) {
- TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) );
+ TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) );
mInfoPage->setScanProgressText( text );
if ( (*it).isSpamTool() && (*it).isServerBased() ) {
// check the configured account for pattern in <server>
@@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability()
}
else {
// check the availability of the application
- KApplication::kApplication()->processEvents( 200 );
+ KApplication::kApplication()->tqprocessEvents( 200 );
if ( !checkForProgram( (*it).getExecutable() ) ) {
mInfoPage->addAvailableTool( (*it).getVisibleName() );
found = true;
@@ -702,7 +702,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
int registeredTools = general.readNumEntry( "tools", 0 );
for (int i = 1; i <= registeredTools; i++)
{
- KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+ KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) );
if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
mToolList.append( readToolConfig( toolConfig ) );
}
@@ -714,7 +714,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig()
int user_registeredTools = user_general.readNumEntry( "tools", 0 );
for (int i = 1; i <= user_registeredTools; i++)
{
- KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
+ KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) );
if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
mergeToolConfig( readToolConfig( toolConfig ) );
}
@@ -925,7 +925,7 @@ void ASWizInfoPage::addAvailableTool( const TQString &visibleName )
bool ASWizInfoPage::isProgramSelected( const TQString &visibleName )
{
TQString listName = visibleName;
- return mToolsList->isSelected( mToolsList->findItem( listName ) );
+ return mToolsList->isSelected( mToolsList->tqfindItem( listName ) );
}
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index ca10bd449..b1422f476 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName )
}
return currentPath +
i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName +
- "_" + TQDate::tqcurrentDate().toString( TQt::ISODate ) + ".tar.bz2";
+ "_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2";
}
ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *tqparent )
@@ -194,7 +194,7 @@ void ArchiveFolderDialog::slotFixFileExtension()
// First, try to find the extension of the file name and remove it
for( int i = 0; i < numExtensions; i++ ) {
- int index = fileName.lower().findRev( sortedExtensions[i] );
+ int index = fileName.lower().tqfindRev( sortedExtensions[i] );
if ( index != -1 ) {
fileName = fileName.left( fileName.length() - TQString( sortedExtensions[i] ).length() );
break;
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index 3953f3bcf..e3a2ac0dd 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -148,7 +148,7 @@ void BackupJob::abort( const TQString &errorMessage )
// The progressmanager will delete it
}
- TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() );
+ TQString text = i18n( "Failed to archive the folder '%1'." ).tqarg( mRootFolder->name() );
text += "\n" + errorMessage;
KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) );
deleteLater();
@@ -172,12 +172,12 @@ void BackupJob::finish()
TQFileInfo archiveFileInfo( mMailArchivePath.path() );
TQString text = i18n( "Archiving folder '%1' successfully completed. "
"The archive was written to the file '%2'." )
- .arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
+ .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() );
text += "\n" + i18n( "1 message of size %1 was archived.",
"%n messages with the total size of %1 were archived.", mArchivedMessages )
- .arg( KIO::convertSize( mArchivedSize ) );
+ .tqarg( KIO::convertSize( mArchivedSize ) );
text += "\n" + i18n( "The archive file has a size of %1." )
- .arg( KIO::convertSize( archiveFileInfo.size() ) );
+ .tqarg( KIO::convertSize( archiveFileInfo.size() ) );
KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) );
if ( mDeleteFoldersAfterCompletion ) {
@@ -213,7 +213,7 @@ void BackupJob::archiveNextMessage()
KMMsgDict::instance()->getLocation( serNum, &folder, &mMessageIndex );
if ( mMessageIndex == -1 ) {
kdWarning(5006) << "Failed to get message location for sernum " << serNum << endl;
- abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) );
return;
}
@@ -223,7 +223,7 @@ void BackupJob::archiveNextMessage()
KMMessage *message = mCurrentFolder->getMsg( mMessageIndex );
if ( !message ) {
kdWarning(5006) << "Failed to retrieve message with index " << mMessageIndex << endl;
- abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) );
return;
}
@@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage()
kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
<< " is neither complete nor has a tqparent!" << endl;
abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
- .arg( mCurrentFolder->name() ) );
+ .tqarg( mCurrentFolder->name() ) );
}
mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -318,7 +318,7 @@ void BackupJob::processCurrentMessage()
if ( !mArchive->writeFile( fileName, user, group, messageSize, permissions, accessTime,
modificationTime, creationTime, messageString ) ) {
- abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Failed to write a message into the archive folder '%1'." ).tqarg( mCurrentFolder->name() ) );
return;
}
@@ -357,7 +357,7 @@ void BackupJob::folderJobFinished( KMail::FolderJob *job )
if ( job->error() ) {
if ( mCurrentFolder )
- abort( i18n( "Downloading a message in folder '%1' failed." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Downloading a message in folder '%1' failed." ).tqarg( mCurrentFolder->name() ) );
else
abort( i18n( "Downloading a message in the current folder failed." ) );
}
@@ -388,9 +388,9 @@ void BackupJob::archiveNextFolder()
mCurrentFolder = mPendingFolders.take( 0 );
kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl;
- mProgressItem->setqStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
+ mProgressItem->setqStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) );
if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
- abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) );
return;
}
mCurrentFolderOpen = true;
@@ -411,7 +411,7 @@ void BackupJob::archiveNextFolder()
success = false;
if ( !success ) {
abort( i18n( "Unable to create folder structure for folder '%1' within archive file." )
- .arg( mCurrentFolder->name() ) );
+ .tqarg( mCurrentFolder->name() ) );
return;
}
@@ -423,7 +423,7 @@ void BackupJob::archiveNextFolder()
<< " at index " << i << "!" << endl;
// TODO: handle error in a nicer way. this is _very_ bad
abort( i18n( "Unable to backup messages in folder '%1', the index file is corrupted." )
- .arg( mCurrentFolder->name() ) );
+ .tqarg( mCurrentFolder->name() ) );
return;
}
else
diff --git a/kmail/bodypartformatterfactory.cpp b/kmail/bodypartformatterfactory.cpp
index f11690d52..5f6feea7e 100644
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@@ -83,7 +83,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
if ( !type || !*type || !subtype || !*subtype || !formatter || !all )
return;
- TypeRegistry::iterator type_it = all->tqfind( type );
+ TypeRegistry::iterator type_it = all->find( type );
if ( type_it == all->end() ) {
kdDebug( 5006 ) << "BodyPartFormatterFactory: instantiating new Subtype Registry for \""
<< type << "\"" << endl;
@@ -92,7 +92,7 @@ static void insertBodyPartFormatter( const char * type, const char * subtype,
}
SubtypeRegistry & subtype_reg = type_it->second;
- SubtypeRegistry::iterator subtype_it = subtype_reg.tqfind( subtype );
+ SubtypeRegistry::iterator subtype_it = subtype_reg.find( subtype );
if ( subtype_it != subtype_reg.end() ) {
kdDebug( 5006 ) << "BodyPartFormatterFactory: overwriting previously registered formatter for \""
<< type << "/" << subtype << "\"" << endl;
@@ -159,9 +159,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
if ( all->empty() )
return 0;
- TypeRegistry::const_iterator type_it = all->tqfind( type );
+ TypeRegistry::const_iterator type_it = all->find( type );
if ( type_it == all->end() )
- type_it = all->tqfind( "*" );
+ type_it = all->find( "*" );
if ( type_it == all->end() )
return 0;
@@ -169,9 +169,9 @@ const KMail::Interface::BodyPartFormatter * KMail::BodyPartFormatterFactory::cre
if ( subtype_reg.empty() )
return 0;
- SubtypeRegistry::const_iterator subtype_it = subtype_reg.tqfind( subtype );
+ SubtypeRegistry::const_iterator subtype_it = subtype_reg.find( subtype );
if ( subtype_it == subtype_reg.end() )
- subtype_it = subtype_reg.tqfind( "*" );
+ subtype_it = subtype_reg.find( "*" );
if ( subtype_it == subtype_reg.end() )
return 0;
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 2b9ab2a8e..ca95344c7 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job )
KURL url = mAccount->getUrl();
url.setPath( mFolder->imapPath() +
- TQString::tqfromLatin1(";UID=%1").arg(uids) );
+ TQString::tqfromLatin1(";UID=%1").tqarg(uids) );
KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -341,7 +341,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
if( mfd.flags > 0 )
KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
KURL url = mAccount->getUrl();
- url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid));
+ url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").tqarg(mfd.uid));
ImapAccountBase::jobData jd( url.url(), mFolder->folder() );
jd.cancellable = true;
@@ -408,10 +408,10 @@ void CachedImapJob::slotPutNextMessage()
unsigned int i = 0;
for( char *ch = cstr.data(); *ch; ch++ ) {
if ( *ch == '\n' ) {
- mData.at(i) = '\r';
+ mData.tqat(i) = '\r';
i++;
}
- mData.at(i) = *ch; i++;
+ mData.tqat(i) = *ch; i++;
}
jd.data = mData;
jd.msgList.append( mMsg );
@@ -539,7 +539,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
if ( job->error() && !silentUpload ) {
TQString myError = "<p><b>" + i18n("Error while uploading folder")
- + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").arg((*it).items[0])
+ + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").tqarg((*it).items[0])
+ "</p><p>" + i18n("This could be because you do not have permission to do this, or because the folder is already present on the server; the error message from the server communication is here:") + "</p>";
mAccount->handleJobError( job, myError );
}
@@ -597,8 +597,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job )
TQDataStream stream( packedArgs, IO_WriteOnly );
const TQString command = TQString( "X-CREATE-SPECIAL" );
- const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
- .arg( path );
+ const TQString argument = TQString( "%1 %2" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
+ .tqarg( path );
stream << (int) 'X' << 'N' << command << argument;
@@ -626,7 +626,7 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job )
mAccount->removeDeletedFolder( (*it).path );
if( job->error() ) {
- mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*it).path ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).tqarg( (*it).path ) + '\n' );
delete this;
return;
}
@@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job)
if( job->error() ) {
mErrorCode = job->error();
- mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).tqparent->label() ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).tqparent->label() ) + '\n' );
delete this;
return;
}
@@ -813,7 +813,7 @@ void CachedImapJob::slotSubscribtionChange1Failed( const TQString &errorMessage
"from the folder list after the next sync since it is unsubscribed on the server.\n"
"You can try to manually subscribe to the folder yourself.\n\n"
"%2" )
- .arg( mFolder->label() ).arg( errorMessage ) );
+ .tqarg( mFolder->label() ).tqarg( errorMessage ) );
delete this;
}
@@ -854,7 +854,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job )
if( job->error() ) {
revertLabelChange();
- const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() );
+ const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).tqarg( mFolder->label() );
mAccount->handleJobError( job, errorMessage );
delete this;
} else {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 037f80900..923ff6be3 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const
return transports.first();
const TQString defaultTransport = GlobalSettings::self()->defaultTransport();
- const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) );
+ const int defaultIndex = TQMAX( 0, transports.tqfindIndex( defaultTransport ) );
TQString text;
if ( nullIdentity )
@@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal,
msg->setSubject( subject );
if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) {
if ( status == TQString("cancel") )
- msg->setSubject( i18n( "Declined: %1" ).arg(subject).tqreplace("Answer: ","") );
+ msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).tqreplace("Answer: ","") );
else if ( status == TQString("tentative") )
- msg->setSubject( i18n( "Tentative: %1" ).arg(subject).tqreplace("Answer: ","") );
+ msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).tqreplace("Answer: ","") );
else if ( status == TQString("accepted") )
- msg->setSubject( i18n( "Accepted: %1" ).arg(subject).tqreplace("Answer: ","") );
+ msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).tqreplace("Answer: ","") );
else if ( status == TQString("delegated") )
- msg->setSubject( i18n( "Delegated: %1" ).arg(subject).tqreplace("Answer: ","") );
+ msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).tqreplace("Answer: ","") );
}
msg->setTo( to );
msg->setFrom( receiver() );
@@ -227,7 +227,7 @@ TQString Callback::receiver() const
// select default identity by default
const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress();
- const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) );
+ const int defaultIndex = TQMAX( 0, addrs.tqfindIndex( defaultAddr ) );
mReceiver =
KInputDialog::getItem( i18n( "Select Address" ),
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index d88c3164b..9fde31bb9 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -21,7 +21,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* tqparent, const TQString& ca
mListBox = new KListBox( page );
mListBox->insertStringList( keys );
- const int current = keys.findIndex( currentKey );
+ const int current = keys.tqfindIndex( currentKey );
mListBox->setSelected( TQMAX( 0, current ), true );
mListBox->ensureCurrentVisible();
tqlayout->addWidget( mListBox, 1 );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index 3d3dd6acc..5de762e96 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -96,7 +96,7 @@ int MboxCompactionJob::executeNow( bool silent )
if (!storage->compactable()) {
kdDebug(5006) << storage->location() << " compaction skipped." << endl;
if ( !mSilent ) {
- TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
+ TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() );
BroadcastqStatus::instance()->seStatusMsg( str );
}
return 0;
@@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc )
mbox->close("mboxcompact", true);
mbox->setAutoCreateIndex( autoCreate );
mbox->setNeedsCompacting( false ); // We are clean now
- str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
+ str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() );
kdDebug(5006) << str << endl;
} else {
mbox->close("mboxcompact");
- str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
+ str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl;
kdDebug(5006) << "Compaction aborted." << endl;
TQFile::remove( mTempName );
@@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc )
mCancellable = false;
TQString str;
if ( !rc ) {
- str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
+ str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() );
} else {
- str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
+ str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
}
mErrorCode = rc;
storage->setNeedsCompacting( false );
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index bc415a888..993c6c74f 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity()
if ( !item ) return;
TQString msg = i18n("<qt>Do you really want to remove the identity named "
- "<b>%1</b>?</qt>").arg( item->identity().identityName() );
+ "<b>%1</b>?</qt>").tqarg( item->identity().identityName() );
if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"),
KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue )
if ( im->removeIdentity( item->identity().identityName() ) ) {
@@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * tqparent, const char
btn_vlay->addStretch( 1 ); // spacer
// "Common options" groupbox:
- group = new TQGroupBox( 0, TQt::Vertical,
+ group = new TQGroupBox( 0, Qt::Vertical,
i18n("Common Options"), this );
vlay->addWidget(group);
@@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list,
while ( list.tqfind( result ) != list.end() ) {
result = i18n("%1: name; %2: number appended to it to make it unique "
"among a list of names", "%1 %2")
- .arg( name ).arg( suffix );
+ .tqarg( name ).tqarg( suffix );
suffix++;
}
return result;
@@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport()
"Configure->Accounts->Sending listview, \"type\" "
"column, first row, to indicate that this is the "
"default transport", "%1 (Default)")
- .arg( transportInfo->type );
+ .tqarg( transportInfo->type );
GlobalSettings::self()->setDefaultTransport( transportInfo->name );
}
(void) new TQListViewItem( mTransportList, lastItem, transportInfo->name,
@@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() {
if ( !acct ) {
// ### FIXME: see above
KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>")
- .arg(listItem->text(0)) );
+ .tqarg(listItem->text(0)) );
return;
}
@@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() {
kmkernel->acctMgr()->writeConfig( true );
if ( (*it) && !kmkernel->acctMgr()->remove(*it) )
KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>")
- .arg( (*it)->name() ) );
+ .tqarg( (*it)->name() ) );
}
mAccountsToDelete.clear();
@@ -1667,7 +1667,7 @@ void AppearancePage::FontsTab::installProfile( KConfig * profile ) {
needChange = true;
mFont[i] = fonts.readFontEntry( fontNames[i].configName );
kdDebug(5006) << "got font \"" << fontNames[i].configName
- << "\" thusly: \"" << mFont[i].toString() << "\"" << endl;
+ << "\" thusly: \"" << TQString(mFont[i].toString()) << "\"" << endl;
}
if ( needChange && mFontLocationCombo->currentItem() > 0 )
mFontChooser->setFont( mFont[ mFontLocationCombo->currentItem() ],
@@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() {
mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() );
static const TQColor defaultColor[ numColorNames ] = {
- kapp->palette().active().base(), // bg
+ kapp->tqpalette().active().base(), // bg
KGlobalSettings::alternateBackgroundColor(), // alt bg
- kapp->palette().active().text(), // fg
+ kapp->tqpalette().active().text(), // fg
TQColor( 0x00, 0x80, 0x00 ), // quoted l1
TQColor( 0x00, 0x70, 0x00 ), // quoted l2
TQColor( 0x00, 0x60, 0x00 ), // quoted l3
@@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * tqparent, const c
for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
if ( buttonLabel.tqcontains("%1") )
- buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
+ buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
radio = new TQRadioButton( buttonLabel, mDateDisplay );
mDateDisplay->insert( radio, i );
if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) {
@@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
if ( charset.lower() == TQString::tqfromLatin1("locale") ) {
charset = TQString::tqfromLatin1("%1 (locale)")
- .arg( TQCString( kmkernel->networkCodec()->mimeName() ).lower() );
+ .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
return;
}
@@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
if ( (*it) == TQString::tqfromLatin1("locale") ) {
TQCString cset = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower( cset.data() );
- (*it) = TQString("%1 (locale)").arg( cset );
+ (*it) = TQString("%1 (locale)").tqarg( TQString(cset) );
}
mCharsetListEditor->setStringList( charsets );
@@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * tqparent, const char
mMessageIdSuffixEdit = new KLineEdit( this );
// only ASCII letters, digits, plus, minus and dots are allowed
mMessageIdSuffixValidator =
- new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this );
+ new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) );
mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator );
label = new TQLabel( mMessageIdSuffixEdit,
i18n("Custom message-&id suffix:"), this );
@@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char
"exploits. <a href=\"whatsthis:%1\">More about "
"HTML mails...</a> <a href=\"whatsthis:%2\">More "
"about external references...</a>")
- .arg(htmlWhatsThis).arg(externalWhatsThis),
+ .tqarg(htmlWhatsThis).tqarg(externalWhatsThis),
group );
vlay->addWidget( group );
@@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * tqparent, const char
label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning "
"confirmations undermines your privacy. "
"<a href=\"whatsthis:%1\">More...</a>")
- .arg(receiptWhatsThis),
+ .tqarg(receiptWhatsThis),
group );
vlay->addWidget( group );
@@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() {
TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) );
if ( systemProxy.isEmpty() )
systemProxy = i18n( "no proxy" );
- mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) );
+ mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) );
bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue();
mWidget->honorHTTPProxyRB->setChecked( honor );
mWidget->useCustomHTTPProxyRB->setChecked( !honor );
@@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp
{
Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
if ( !entry ) {
- kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl;
+ kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl;
return 0;
}
if( entry->argType() != argType || entry->isList() != isList ) {
- kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl;
+ kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl;
return 0;
}
return entry;
@@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() {
// Inbox folder of the selected account
KMAccount* acct = mAccountCombo->currentAccount();
if ( acct ) {
- folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() );
+ folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() );
GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() );
}
}
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index ff473f668..098e90870 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -225,7 +225,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
if ( suppressedAcronyms.tqfind( acronym ) == suppressedAcronyms.end() ) {
// not found:
TQString displayname = TQString::tqfromLatin1("%1 (%2)")
- .arg( name ).arg( acronym );
+ .tqarg( name ).tqarg( acronym );
TQPixmap flag( locate("locale", acronym + flagPng ) );
mComboBox->insertItem( flag, displayname );
}
@@ -239,7 +239,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
TQString NewLanguageDialog::language() const
{
TQString s = mComboBox->currentText();
- int i = s.findRev( '(' );
+ int i = s.tqfindRev( '(' );
return s.mid( i + 1, s.length() - i - 2 );
}
@@ -255,21 +255,21 @@ int LanguageComboBox::insertLanguage( const TQString & language )
KSimpleConfig entry( locate("locale", language + entryDesktop) );
entry.setGroup( "KCM Locale" );
TQString name = entry.readEntry( "Name" );
- TQString output = TQString::tqfromLatin1("%1 (%2)").arg( name ).arg( language );
+ TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( language );
insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
- return listBox()->index( listBox()->findItem(output) );
+ return listBox()->index( listBox()->tqfindItem(output) );
}
TQString LanguageComboBox::language() const
{
TQString s = currentText();
- int i = s.findRev( '(' );
+ int i = s.tqfindRev( '(' );
return s.mid( i + 1, s.length() - i - 2 );
}
void LanguageComboBox::setLanguage( const TQString & language )
{
- TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").arg( language );
+ TQString tqparenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language );
for (int i = 0; i < count(); i++)
// ### FIXME: use .endWith():
if ( text(i).tqfind( tqparenthizedLanguage ) >= 0 ) {
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 3fe2fd78b..86166dbc2 100644
--- a/kmail/csshelper.cpp
+++ b/kmail/csshelper.cpp
@@ -77,7 +77,7 @@ namespace KMail {
TQFont defaultFont = mBodyFont;
defaultFont.setItalic( true );
for ( int i = 0 ; i < 3 ; ++i ) {
- const TQString key = TQString( "quote%1-font" ).arg( i+1 );
+ const TQString key = TQString( "quote%1-font" ).tqarg( i+1 );
mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont );
}
}
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index ef3668df4..4f1684907 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *tqparent, const char *name )
"<i>Universal</i> which can be used for all kind of operations. "
"You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>"
"</qt>" );
- mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) );
+ mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) );
const TQString toToolTip = i18n( "Additional recipients of the message when forwarding" );
const TQString ccToolTip = i18n( "Additional recipients who get a copy of the message when forwarding" );
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 62b4fcee4..6ee1492a2 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1()
#endif
KMessageBox::information( this,
i18n( "<qt>Distribution list with the given name <b>%1</b> "
- "already exists. Please select a different name.</qt>" ).arg( name ) );
+ "already exists. Please select a different name.</qt>" ).tqarg( name ) );
return;
}
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 6d634d8f8..30ab9cd7d 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -162,7 +162,7 @@ void ExpireJob::done()
moving = true;
str = i18n( "Removing 1 old message from folder %1...",
"Removing %n old messages from folder %1...", count )
- .arg( mSrcFolder->label() );
+ .tqarg( mSrcFolder->label() );
} else {
// Expire by moving
mMoveToFolder =
@@ -170,7 +170,7 @@ void ExpireJob::done()
if ( !mMoveToFolder ) {
str = i18n( "Cannot expire messages from folder %1: destination "
"folder %2 not found" )
- .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
+ .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
kdWarning(5006) << str << endl;
} else {
kdDebug(5006) << "ExpireJob: finished expiring in folder "
@@ -185,7 +185,7 @@ void ExpireJob::done()
str = i18n( "Moving 1 old message from folder %1 to folder %2...",
"Moving %n old messages from folder %1 to folder %2...",
count )
- .arg( mSrcFolder->label(), mMoveToFolder->label() );
+ .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
}
}
}
@@ -213,34 +213,34 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
msg = i18n( "Removed 1 old message from folder %1.",
"Removed %n old messages from folder %1.",
mRemovedMsgs.count() )
- .arg( mSrcFolder->label() );
+ .tqarg( mSrcFolder->label() );
}
else {
msg = i18n( "Moved 1 old message from folder %1 to folder %2.",
"Moved %n old messages from folder %1 to folder %2.",
mRemovedMsgs.count() )
- .arg( mSrcFolder->label(), mMoveToFolder->label() );
+ .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
}
break;
case KMCommand::Failed:
if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
msg = i18n( "Removing old messages from folder %1 failed." )
- .arg( mSrcFolder->label() );
+ .tqarg( mSrcFolder->label() );
}
else {
msg = i18n( "Moving old messages from folder %1 to folder %2 failed." )
- .arg( mSrcFolder->label(), mMoveToFolder->label() );
+ .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
}
break;
case KMCommand::Canceled:
if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
msg = i18n( "Removing old messages from folder %1 was canceled." )
- .arg( mSrcFolder->label() );
+ .tqarg( mSrcFolder->label() );
}
else {
msg = i18n( "Moving old messages from folder %1 to folder %2 was "
"canceled." )
- .arg( mSrcFolder->label(), mMoveToFolder->label() );
+ .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
}
default: ;
}
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 7176cdebb..5c5cfa66f 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -405,13 +405,13 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti)
if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) {
name = i18n( "Local Inbox" );
} else {
- name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) );
+ name = i18n( "Inbox of %1" ).tqarg( accountFti->text( 0 ) );
}
} else {
if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) {
- name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) );
+ name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) );
} else {
- name = i18n( "%1 (local)" ).arg( fti->text( 0 ) );
+ name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) );
}
}
return name;
diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp
index 479e6d3e2..c4f2d214e 100644
--- a/kmail/filehtmlwriter.cpp
+++ b/kmail/filehtmlwriter.cpp
@@ -96,7 +96,7 @@ namespace KMail {
if ( !mFile.open( IO_WriteOnly ) )
kdWarning( 5006 ) << "FileHtmlWriter: Cannot open file " << mFile.name() << endl;
else
- mStream.setDevice( &mFile );
+ mStream.setDevice( &TQT_TQIODEVICE_OBJECT(mFile) );
}
void FileHtmlWriter::embedPart( const TQCString & contentId, const TQString & url ) {
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 441390fb5..c387b2e16 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -257,7 +257,7 @@ void FilterLogDialog::slotUser2()
KMessageBox::error( this,
i18n( "Could not write the file %1:\n"
"\"%2\" is the detailed error description." )
- .arg( fileName,
+ .tqarg( fileName,
TQString::fromLocal8Bit( strerror( errno ) ) ),
i18n( "KMail Error" ) );
}
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 90903fdb1..c850cf2ec 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin
if ( internalRightsList.isEmpty() )
return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen
else
- return i18n( "Custom Permissions (%1)" ).arg( internalRightsList );
+ return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList );
}
void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
@@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load()
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
if ( folder && folder->storage() == mImapAccount->rootFolder() )
return; // nothing to be done for the (virtual) account folder
- mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
slotConnectionResult( -1, TQString() );
@@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
if ( errorCode ) {
if ( errorCode == -1 ) // unspecified error
- mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) );
else
// Connection error (error message box already shown by the account)
mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
@@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c
if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) );
else
- mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
+ mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) );
return;
}
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 4215ba723..ac93431f8 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load()
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
if ( folder && folder->storage() == mImapAccount->rootFolder() )
return; // nothing to be done for the (virtual) account folder
- mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
slotConnectionResult( -1, TQString() );
@@ -136,7 +136,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
if ( errorCode ) {
if ( errorCode == -1 ) // unspecified error
- mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) );
else
// Connection error (error message box already shown by the account)
mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) );
@@ -162,7 +162,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION )
mLabel->setText( i18n( "This account does not have support for quota information." ) );
else
- mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
+ mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).tqarg( job->errorString() ) );
} else {
mQuotaInfo = info;
}
diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui
index 984885c16..1966944a0 100644
--- a/kmail/folderpropertiesdialog.ui
+++ b/kmail/folderpropertiesdialog.ui
@@ -608,13 +608,13 @@
</connection>
<connection>
<sender>mNormalIconButton</sender>
- <signal>iconChanged(QString)</signal>
+ <signal>iconChanged(TQString)</signal>
<receiver>KMFolderDialogUI</receiver>
- <slot>slotChangeIcon(QString)</slot>
+ <slot>slotChangeIcon(TQString)</slot>
</connection>
</connections>
<includes>
- <include location="global" impldecl="in declaration">qvaluelist.h</include>
+ <include location="global" impldecl="in declaration">tqvaluelist.h</include>
<include location="local" impldecl="in implementation">kmfolderdir.h</include>
<include location="local" impldecl="in implementation">kmfolder.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
@@ -622,16 +622,16 @@
</includes>
<forwards>
<forward>class KMFolderDir;</forward>
- <forward>template &lt;typename T&gt; class QGuardedPtr; </forward>
+ <forward>template &lt;typename T&gt; class TQGuardedPtr; </forward>
<forward>class KMFolder; </forward>
</forwards>
<variables>
<variable>KMFolder *mFolder;</variable>
- <variable>QValueList&lt;QGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
+ <variable>TQValueList&lt;TQGuardedPtr&lt;KMFolder&gt; &gt; mFolders;</variable>
<variable>KMFolderDir *mFolderDIr;</variable>
</variables>
<Q_SLOTS>
- <slot access="protected">slotChangeIcon( QString )</slot>
+ <slot access="protected">slotChangeIcon( TQString )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 06374664f..b04022bbe 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -57,7 +57,7 @@ FolderRequester::FolderRequester( TQWidget *tqparent, KMFolderTree *tree )
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed ) );
- setFocusPolicy( TQWidget::StrongFocus );
+ setFocusPolicy( Qt::StrongFocus );
}
//-----------------------------------------------------------------------------
@@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString )
setFolder( folder );
} else {
if ( !idString.isEmpty() ) {
- edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) );
+ edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) );
} else {
edit->setText( i18n( "Please select a folder" ) );
}
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index b4897afec..f9bbed20d 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
TQWidget *tqparent,
const char *name )
: KDialogBase( tqparent, name, true,
- i18n( "Shortcut for Folder %1" ).arg( folder->label() ),
+ i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ),
KDialogBase::Ok | KDialogBase::Cancel ),
mFolder( folder ), mMainWidget( mainwidget )
{
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index e1a7f364e..72547d8d2 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -725,11 +725,11 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
// if the folder is being moved then move its node and, if necessary, also
// the associated subfolder directory node to the new tqparent
if (newParent) {
- if (oldParent->findRef( folder() ) != -1)
+ if (oldParent->tqfindRef( folder() ) != -1)
oldParent->take();
newParent->inSort( folder() );
if ( child ) {
- if ( child->tqparent()->findRef( child ) != -1 )
+ if ( child->tqparent()->tqfindRef( child ) != -1 )
child->tqparent()->take();
newParent->inSort( child );
child->setParent( newParent );
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 0397692aa..87084b7bb 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig()
KConfig* conf = KMKernel::config();
// Custom/System color support
KConfigGroupSaver saver(conf, "Reader");
- TQColor c1=TQColor(kapp->palette().active().text());
+ TQColor c1=TQColor(kapp->tqpalette().active().text());
TQColor c2=TQColor("blue");
- TQColor c4=TQColor(kapp->palette().active().base());
+ TQColor c4=TQColor(kapp->tqpalette().active().base());
TQColor c5=TQColor("red");
if (!conf->readBoolEntry("defaultColors",true)) {
@@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
else
action = dndMode();
if ( action == DRAG_COPY || action == DRAG_MOVE ) {
- new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this );
+ new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) );
}
}
}
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index e5a604b8b..e227113db 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *tqpare
KMessageBox::information(tqparent,
i18n("<qt>The folder you deleted was associated with the account "
"<b>%1</b> which delivered mail into it. The folder the account "
- "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name()));
+ "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name()));
}
}
if (folderToDelete->folderType() == KMFolderTypeImap)
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 5ffac8d4a..a60e60c6c 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -32,15 +32,15 @@ class FolderViewToolTip : public TQToolTip
item->updateCount();
TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" )
- .arg( item->folder()->prettyURL().tqreplace( " ", "&nbsp;" ) )
- .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
- .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
- .arg( KIO::convertSize( item->folderSize() ) );
+ .tqarg( item->folder()->prettyURL().tqreplace( " ", "&nbsp;" ) )
+ .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
+ .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
+ .tqarg( KIO::convertSize( item->folderSize() ) );
if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) {
QuotaInfo info = imap->quotaInfo();
if ( info.isValid() && !info.isEmpty() )
- tipText += i18n("<br>Quota: %1").arg( info.toString() );
+ tipText += i18n("<br>Quota: %1").tqarg( info.toString() );
}
tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText );
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 230b64999..7742e3ba6 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -458,7 +458,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers,
int column = sortOrder & ((1 << 5) - 1);
TQString ret = TQChar( (char)sortOrder );
- TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 );
+ TQString sortArrival = TQString( "%1" ).tqarg( msg->getMsgSerNum(), 0, 36 );
while (sortArrival.length() < 7) sortArrival = '0' + sortArrival;
if (column == paintInfo->dateCol) {
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index 39df6dc9b..2ed869b61 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -57,7 +57,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *tqparent,
TQApplication::reverseLayout()
? "clear_left"
: "locationbar_erase",
- 0, this,
+ 0, TQT_TQOBJECT(this),
TQT_SLOT( reset() ),
actionCollection,
"reset_quicksearch" );
@@ -112,12 +112,12 @@ HeaderListQuickSearch::~HeaderListQuickSearch()
bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event )
{
- if ( watched == mStatusCombo ) {
+ if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) {
KMMainWidget *mainWidget = 0;
// Travel up the tqparents list until we find the main widget
for ( TQWidget *curWidget = tqparentWidget(); curWidget; curWidget = curWidget->tqparentWidget() ) {
- mainWidget = ::qt_cast<KMMainWidget *>( curWidget );
+ mainWidget = ::tqqt_cast<KMMainWidget *>( curWidget );
if ( mainWidget )
break;
}
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 0b728444f..6e459c7aa 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -82,10 +82,10 @@ namespace KMail {
static TQString convertToHtmlBlock( const TQString & str, bool useSpan=false ) {
TQString dir = directionOf( str );
TQString format = "<%1 dir=\"%3\">%4</%2>";
- return format.arg( useSpan ? "span" : "div" )
- .arg( useSpan ? "span" : "div" )
- .arg( dir )
- .arg( LinkLocator::convertToHtml( str ) );
+ return format.tqarg( useSpan ? "span" : "div" )
+ .tqarg( useSpan ? "span" : "div" )
+ .tqarg( dir )
+ .tqarg( LinkLocator::convertToHtml( str ) );
}
#endif
@@ -262,13 +262,13 @@ namespace KMail {
return headerStr + "</div>";
}
- headerStr = TQString("<div class=\"header\" dir=\"%1\">").arg(dir);
+ headerStr = TQString("<div class=\"header\" dir=\"%1\">").tqarg(dir);
//case HdrLong:
if ( strategy->showHeader( "subject" ) )
headerStr += TQString("<div dir=\"%1\"><b style=\"font-size:130%\">" +
strToHtml(message->subject()) + "</b></div>\n")
- .arg(subjectDir);
+ .tqarg(subjectDir);
if ( strategy->showHeader( "date" ) )
headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>\n");
@@ -408,9 +408,9 @@ namespace KMail {
}
}
TQString titleText = i18n("%1% probability of being spam.\n\nFull report:\n%2")
- .arg( TQString::number( percent ), filterHeader );
+ .tqarg( TQString::number( percent ), filterHeader );
return TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" style=\"border: 1px solid black;\" title=\"%4\"> &nbsp;")
- .arg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ),
+ .tqarg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ),
TQString::number( 5 ), titleText );
}
@@ -430,7 +430,7 @@ namespace KMail {
// of the application tqlayout.
TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
- TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir);
+ TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").tqarg(dir);
// However, the direction of the message subject within the header is
// determined according to the contents of the subject itself. Since
@@ -494,7 +494,7 @@ namespace KMail {
if ( !presence.isEmpty() )
{
TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" )
- .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
+ .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
presence += presenceIcon;
}
}
@@ -585,26 +585,26 @@ namespace KMail {
{
//kdDebug( 5006 ) << "Got a photo: " << photoURL << endl;
userHTML = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">")
- .arg( photoURL ).arg( photoWidth ).arg( photoHeight );
+ .tqarg( photoURL ).tqarg( photoWidth ).tqarg( photoHeight );
if ( presence.isEmpty() ) {
userHTML = TQString("<div class=\"senderpic\">") + userHTML + "</div>";
} else {
userHTML = TQString( "<div class=\"senderpic\">"
"<a href=\"im:%1\">%2<div class=\"senderstatus\">"
"<span name=\"presence-%3\">%4</span></div></a>"
- "</div>" ).arg( kabcUid )
- .arg( userHTML )
- .arg( kabcUid )
- .arg( presence );
+ "</div>" ).tqarg( kabcUid )
+ .tqarg( userHTML )
+ .tqarg( kabcUid )
+ .tqarg( presence );
}
} else {
// we don't have a photo, just show presence, if we have it
if ( !presence.isEmpty() )
userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
"<span name=\"presence-%2\">%3</span></div></a>" )
- .arg( kabcUid )
- .arg( kabcUid )
- .arg( presence );
+ .tqarg( kabcUid )
+ .tqarg( kabcUid )
+ .tqarg( presence );
}
#if 0
// Disabled 'Launch IM' link in headers - Will
@@ -646,7 +646,7 @@ namespace KMail {
// kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl;
- TQTime currTime = TQTime::currentTime( TQt::UTC );
+ TQTime currTime = TQTime::currentTime( Qt::UTC );
// kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl;
@@ -662,7 +662,7 @@ namespace KMail {
color = "white";
bg_color = "#000B6B";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lETQVQI11WOsRGATQAzDOG/LHoz9"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAIAAAASmSbdAAAAS0lEQVQI11WOsRGAQAzDOG/LHoz9"
"kikIcF+kSBxbPs7LoNGVapAI0Zn+O+8NUwldozn6io7G7kdS/5zi7i+BvUM/5uSXlIfzMHx/bmWR"
"k++yj9rZAAAAAElFTkSuQmCC)";
}
@@ -671,8 +671,8 @@ namespace KMail {
color = "white";
bg_color = "#00A6FF";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI122OQQ7DMAzDaP3/dfuO"
- "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJTQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI122OQQ7DMAzDaP3/dfuO"
+ "pWSHJgva7iZIBk3m/Ew5hexCHVCilewzFHKEbFZqgxJQWyzKhWKl9unqddJj8+L9sl0oR2gUim+o"
"zu4uSh7kn67/DNv+C4tsZOtjAWEHAAAAAElFTkSuQmCC)";
}
else if ( currTime > TQTime( 12, 0, 0 ) && currTime <= TQTime( 18, 0, 0 ) ) {
@@ -680,8 +680,8 @@ namespace KMail {
color = "black";
bg_color = "#00A6FF";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlETQVQI132OwQ0AIAwCSfcfw91c"
- "QsCfRm399HFwoWjdDhMICQhxHSWMTQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAPUlEQVQI132OwQ0AIAwCSfcfw91c"
+ "QsCfRm399HFwoWjdDhMICQhxHSWMQPhkTCoqWRZU2h5i9tr4GZfmV5t3wWUI3h+NugAAAABJRU5E"
"rkJggg==)";
}
else {
@@ -689,8 +689,8 @@ namespace KMail {
color = "white";
bg_color = "#0014CC";
bg_image = "url(data:image/png;base64,"
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklETQVQI11WOyRHAMAgDNQuUlBrS"
- "fyFpAfKwje0PwyEt0vN+hVsJpzS6TQML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAWklEQVQI11WOyRHAMAgDNQuUlBrS"
+ "fyFpAfKwje0PwyEt0vN+hVsJpzS6QML2ziWcFI6mZBZNSVDXYehyUgI1XsLI9eimHDH6kW0ddVIO"
"xx7JjrtshlbXlLDSD+WhJ+hwqWo8AAAAAElFTkSuQmCC)";
}
@@ -719,12 +719,12 @@ namespace KMail {
"margin: 0px 0px 3px 0px;"
"\" class=\"curtime\">%4<br />%5<br />%6</div>"
)
- .arg( bg_color )
- .arg( color )
- .arg( bg_image )
- .arg( i18n( "Now:" ) )
- .arg( currTime.toString( tformat ) )
- .arg( timeofday )
+ .tqarg( bg_color )
+ .tqarg( color )
+ .tqarg( bg_image )
+ .tqarg( i18n( "Now:" ) )
+ .tqarg( currTime.toString( tformat ) )
+ .tqarg( timeofday )
);
}
else {
@@ -739,8 +739,8 @@ namespace KMail {
( GlobalSettings::self()->showEmoticons() ?
LinkLocator::ReplaceSmileys : 0 );
headerStr += TQString("<div dir=\"%1\">%2</div>\n")
- .arg(subjectDir)
- .arg(message->subject().isEmpty()?
+ .tqarg(subjectDir)
+ .tqarg(message->subject().isEmpty()?
i18n("No Subject") :
strToHtml( message->subject(), flags ));
}
@@ -755,11 +755,11 @@ namespace KMail {
fromStr = message->fromStrip(); // let's use that
headerStr += TQString("<tr><th>%1</th>\n"
"<td>")
- .arg(i18n("From: "))
+ .tqarg(i18n("From: "))
+ KMMessage::emailAddrAsAnchor( fromStr, false )
+ ( !message->headerField( "Resent-From" ).isEmpty() ? "&nbsp;"
+ i18n("(resent from %1)")
- .arg( KMMessage::emailAddrAsAnchor(
+ .tqarg( KMMessage::emailAddrAsAnchor(
message->headerField( "Resent-From" ),false) )
: TQString("") )
+ ( !vCardName.isEmpty() ? "&nbsp;&nbsp;<a href=\"" + vCardName + "\">"
@@ -781,37 +781,37 @@ namespace KMail {
if ( strategy->showHeader( "to" ) )
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
- .arg(i18n("To: "))
- .arg(KMMessage::emailAddrAsAnchor(message->to(),false)));
+ .tqarg(i18n("To: "))
+ .tqarg(KMMessage::emailAddrAsAnchor(message->to(),false)));
// cc line, if any
if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty())
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
- .arg(i18n("CC: "))
- .arg(KMMessage::emailAddrAsAnchor(message->cc(),false)));
+ .tqarg(i18n("CC: "))
+ .tqarg(KMMessage::emailAddrAsAnchor(message->cc(),false)));
// Bcc line, if any
if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty())
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
- .arg(i18n("BCC: "))
- .arg(KMMessage::emailAddrAsAnchor(message->bcc(),false)));
+ .tqarg(i18n("BCC: "))
+ .tqarg(KMMessage::emailAddrAsAnchor(message->bcc(),false)));
if ( strategy->showHeader( "date" ) )
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td dir=\"%2\">%3</td></tr>\n")
- .arg(i18n("Date: "))
- .arg( directionOf( message->dateStr() ) )
- .arg(strToHtml(dateString)));
+ .tqarg(i18n("Date: "))
+ .tqarg( directionOf( message->dateStr() ) )
+ .tqarg(strToHtml(dateString)));
if ( GlobalSettings::self()->showUserAgent() ) {
if ( strategy->showHeader( "user-agent" ) ) {
if ( !message->headerField("User-Agent").isEmpty() ) {
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
- .arg(i18n("User-Agent: "))
- .arg( strToHtml( message->headerField("User-Agent") ) ) );
+ .tqarg(i18n("User-Agent: "))
+ .tqarg( strToHtml( message->headerField("User-Agent") ) ) );
}
}
@@ -819,8 +819,8 @@ namespace KMail {
if ( !message->headerField("X-Mailer").isEmpty() ) {
headerStr.append(TQString("<tr><th>%1</th>\n"
"<td>%2</td></tr>\n")
- .arg(i18n("X-Mailer: "))
- .arg( strToHtml( message->headerField("X-Mailer") ) ) );
+ .tqarg(i18n("X-Mailer: "))
+ .tqarg( strToHtml( message->headerField("X-Mailer") ) ) );
}
}
}
@@ -829,19 +829,19 @@ namespace KMail {
/* if( strategy->showHeader( "status" ) )
headerStr.append( TQString( "<tr><th>%1</th>\n"
"<td dir=\"%2\">%3</td></tr>\n")
- .arg(i18n("Sender status: "))
- .arg( directionOf( onlinetqStatus ) )
- .arg(onlinetqStatus));
+ .tqarg(i18n("Sender status: "))
+ .tqarg( directionOf( onlinetqStatus ) )
+ .tqarg(onlinetqStatus));
*/
headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) );
headerStr.append(
TQString( "</table></td><td align=\"center\" valign=\"top\">%1%2</td></tr></table>\n" )
- .arg(timeHTML)
- .arg(userHTML) );
+ .tqarg(timeHTML)
+ .tqarg(userHTML) );
if ( !spamHTML.isEmpty() )
headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
- .arg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) );
+ .tqarg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) );
headerStr += "</div>\n\n";
return headerStr;
@@ -854,7 +854,7 @@ namespace KMail {
buffer.open( IO_WriteOnly );
image.save( &buffer, fmt );
return TQString::tqfromLatin1("data:image/%1;base64,%2")
- .arg( fmt, KCodecs::base64Encode( ba ) );
+ .tqarg( fmt, KCodecs::base64Encode( ba ).data() );
}
// #####################
@@ -901,7 +901,7 @@ namespace KMail {
// colors depend on if its encapsulated or not
TQColor fontColor(TQt::white);
TQString linkColor = "class =\"white\"";
- const TQColor activeColor = tqApp->palette().active().highlight();
+ const TQColor activeColor = tqApp->tqpalette().active().highlight();
TQColor activeColorDark = activeColor.dark(130);
// reverse colors for encapsulated
if( !topLevel ){
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 1ec367eee..ca8fa8dca 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -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\"").arg( *it ) );
+ KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) );
return;
}
}
@@ -580,7 +580,7 @@ void IdentityDialog::slotOk() {
}
if ( err )
- if ( KMessageBox::warningContinueCancel( this, msg.arg( email ),
+ if ( KMessageBox::warningContinueCancel( this, msg.tqarg( 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\"").arg( ident.identityName() ) );
+ setCaption( i18n("Edit Identity \"%1\"").tqarg( 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.")
- .arg( ident.identityName() ) ) )
+ .tqarg( 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.")
- .arg( ident.identityName() ) ) )
+ .tqarg( 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.")
- .arg( ident.identityName() ) ) )
+ .tqarg( ident.identityName() ) ) )
mTemplatesCombo->setFolder( kmkernel->templatesFolder() );
else
mTemplatesCombo->setFolder( ident.templates() );
// "Templates" tab:
uint identity = ident.uoid();
- TQString iid = TQString("IDENTITY_%1").arg( identity );
+ TQString iid = TQString("IDENTITY_%1").tqarg( 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").arg( identity );
+ TQString iid = TQString("IDENTITY_%1").tqarg( identity );
Templates t( iid );
kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl;
t.setUseCustomTemplates(mCustom->isChecked());
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index 319bd32a8..695c8da7b 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -83,7 +83,7 @@ namespace KMail {
setText( 0, i18n("%1: identity name. Used in the config "
"dialog, section Identity, to indicate the "
"default identity", "%1 (Default)")
- .arg( ident.identityName() ) );
+ .tqarg( ident.identityName() ) );
else
setText( 0, ident.identityName() );
setText( 1, ident.fullEmailAddr() );
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 04dc29332..84da936e9 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -318,7 +318,7 @@ namespace KMail {
mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
if ( !mSlave ) {
KMessageBox::error(0, i18n("Could not start process for %1.")
- .arg( getUrl().protocol() ) );
+ .tqarg( getUrl().protocol() ) );
return Error;
}
if ( mSlave->isConnected() ) {
@@ -400,7 +400,7 @@ namespace KMail {
if (job->error())
{
if ( !(*it).quiet )
- handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' );
+ handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' );
emit subscriptionChangeFailed( job->errorString() );
// ## emit subscriptionChanged here in case anyone needs it to support continue/cancel
}
@@ -735,7 +735,7 @@ namespace KMail {
if ( !done ) {
TQString msg = i18n("KMail has detected a prefix entry in the "
"configuration of the account \"%1\" which is obsolete with the "
- "support of IMAP namespaces.").arg( name() );
+ "support of IMAP namespaces.").tqarg( name() );
if ( list.tqcontains( "" ) ) {
// replace empty entry with the old prefix
list.remove( "" );
@@ -879,13 +879,13 @@ namespace KMail {
KMMessage* msg = jd.msgList.first();
// Use double-quotes around the subject to keep the sentence readable,
// but don't use double quotes around the sender since from() might return a double-quoted name already
- const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() );
+ const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() );
const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from();
TQString myError = "<p><b>" + i18n("Error while uploading message")
+ "</b></p><p>"
- + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
+ + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
+ "</p><p>"
- + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) )
+ + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) )
+ "</p><p>"
+ i18n("The server reported:") + "</p>";
return handleJobError( job, myError );
@@ -908,7 +908,7 @@ namespace KMail {
}
readOnly = folder->isReadOnly();
}
- error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString );
+ error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString );
if ( readOnly ) {
error += i18n("\nSince you do not have write privileges on this folder, "
"please ask the owner of the folder to free up some space in it.");
@@ -958,19 +958,19 @@ namespace KMail {
if ( errorCode == KIO::ERR_SERVER_TIMEOUT || errorCode == KIO::ERR_CONNECTION_BROKEN ) {
msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
arg( name() );
- KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
+ KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastqStatus::instance()->seStatusMsg(
- i18n( "The connection to account %1 was broken." ).arg( name() ) );
+ i18n( "The connection to account %1 was broken." ).tqarg( name() ) );
else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
KPIM::BroadcastqStatus::instance()->seStatusMsg(
- i18n( "The connection to account %1 timed out." ).arg( name() ) );
+ i18n( "The connection to account %1 timed out." ).tqarg( name() ) );
} else {
if ( !errors.isEmpty() )
- KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
+ KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption );
else
- KMessageBox::error( kapp->activeWindow(), msg, caption );
+ KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
}
} else { // i.e. we have a chance to continue, ask the user about it
if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
@@ -978,7 +978,7 @@ namespace KMail {
msg = TQString( "<qt>") + context + error + '\n' + errors[2];
caption = errors[0];
}
- int ret = KMessageBox::warningContinueCancel( kapp->activeWindow(), msg, caption );
+ int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption );
if ( ret == KMessageBox::Cancel ) {
jobsKilled = true;
killAllJobs( false );
@@ -1418,7 +1418,7 @@ namespace KMail {
bool ImapAccountBase::locallySubscribedTo( const TQString& imapPath )
{
- return mLocalSubscriptionBlackList.tqfind( imapPath ) == mLocalSubscriptionBlackList.end();
+ return mLocalSubscriptionBlackList.find( imapPath ) == mLocalSubscriptionBlackList.end();
}
void ImapAccountBase::changeLocalSubscription( const TQString& imapPath, bool subscribe )
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index fe773a9dc..be94557de 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -140,10 +140,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
for ( char *ch = cstr.data(); *ch; ch++ )
{
if ( *ch == '\n' && (prevChar != '\r') ) {
- jd.data.at( i ) = '\r';
+ jd.data.tqat( i ) = '\r';
i++;
}
- jd.data.at( i ) = *ch;
+ jd.data.tqat( i ) = *ch;
prevChar = *ch;
i++;
}
@@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder,
"ImapJobCopyMove"+ProgressManager::getUniqueID(),
i18n("Server operation"),
i18n("Source folder: %1 - Destination folder: %2")
- .arg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
+ .tqarg( TQStyleSheet::escape( msg_tqparent->prettyURL() ),
TQStyleSheet::escape( mDestFolder->prettyURL() ) ),
true,
account->useSSL() || account->useTLS() );
@@ -598,7 +598,7 @@ void ImapJob::slotCopyMessageInfoData(KIO::Job * job, const TQString & data)
for ( msg = (*it).msgList.first(); msg; msg = (*it).msgList.next() )
{
ulong uid = msg->UID();
- index = olduids.findIndex(uid);
+ index = olduids.tqfindIndex(uid);
if (index > -1)
{
// found, get the new uid
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index f7c44d19d..9aaf4b957 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -78,7 +78,7 @@ void KMail::ImportJob::finish()
mProgressItem->setComplete();
mProgressItem = 0;
TQString text = i18n( "Importing the archive file '%1' into the folder '%2' succeeded." )
- .arg( mArchiveFile.path() ).arg( mRootFolder->name() );
+ .tqarg( mArchiveFile.path() ).tqarg( mRootFolder->name() );
text += "\n" + i18n( "1 message was imported.", "%n messages were imported.", mNumberOfImportedMessages );
KMessageBox::information( mParentWidget, text, i18n( "Import finished." ) );
deleteLater();
@@ -95,7 +95,7 @@ void KMail::ImportJob::abort( const TQString &errorMessage )
return;
mAborted = true;
- TQString text = i18n( "Failed to import the archive into folder '%1'." ).arg( mRootFolder->name() );
+ TQString text = i18n( "Failed to import the archive into folder '%1'." ).tqarg( mRootFolder->name() );
text += "\n" + errorMessage;
if ( mProgressItem ) {
mProgressItem->setComplete();
@@ -111,7 +111,7 @@ KMFolder * KMail::ImportJob::createSubFolder( KMFolder *tqparent, const TQString
KMFolder *newFolder = FolderUtil::createSubFolder( tqparent, tqparent->child(), folderName, TQString(),
KMFolderTypeMaildir );
if ( !newFolder ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparent->name() ) );
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparent->name() ) );
return 0;
}
else {
@@ -207,11 +207,11 @@ void KMail::ImportJob::importNextMessage()
}
mCurrentFolder = folder;
if ( mCurrentFolder->open( "ImportJob" ) != 0 ) {
- abort( i18n( "Unable to open folder '%1'." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to open folder '%1'." ).tqarg( mCurrentFolder->name() ) );
return;
}
kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl;
- mProgressItem->setqStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) );
+ mProgressItem->setqStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) );
}
mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) );
@@ -231,7 +231,7 @@ void KMail::ImportJob::importNextMessage()
// uploaded.
if ( mCurrentFolder->folderType() != KMFolderTypeImap ) {
if ( mCurrentFolder->addMsg( mCurrentMessage, &retIndex ) != 0 ) {
- abort( i18n( "Failed to add a message to the folder '%1'." ).arg( mCurrentFolder->name() ) );
+ abort( i18n( "Failed to add a message to the folder '%1'." ).tqarg( mCurrentFolder->name() ) );
return;
}
messageAdded();
@@ -284,7 +284,7 @@ KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *tqparentFolder, cons
mode_t subFolderPermissions )
{
if ( !tqparentFolder->createChildFolder() ) {
- abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( tqparentFolder->name() ) );
+ abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( tqparentFolder->name() ) );
return 0;
}
@@ -334,7 +334,7 @@ void KMail::ImportJob::importNextDirectory()
const TQString folderName = folderNameForDirectoryName( entry->name() );
if ( folderName.isEmpty() ) {
- abort( i18n( "Unexpected subdirectory named '%1'." ).arg( entry->name() ) );
+ abort( i18n( "Unexpected subdirectory named '%1'." ).tqarg( entry->name() ) );
return;
}
KMFolder *subFolder = getOrCreateSubFolder( currentFolder, folderName, entry->permissions() );
@@ -368,12 +368,12 @@ void KMail::ImportJob::start()
else if ( !mimeType->patterns().grep( "zip", false ).isEmpty() )
mArchive = new KZip( mArchiveFile.path() );
else {
- abort( i18n( "The file '%1' does not appear to be a valid archive." ).arg( mArchiveFile.path() ) );
+ abort( i18n( "The file '%1' does not appear to be a valid archive." ).tqarg( mArchiveFile.path() ) );
return;
}
if ( !mArchive->open( IO_ReadOnly ) ) {
- abort( i18n( "Unable to open archive file '%1'" ).arg( mArchiveFile.path() ) );
+ abort( i18n( "Unable to open archive file '%1'" ).tqarg( mArchiveFile.path() ) );
return;
}
diff --git a/kmail/index.cpp b/kmail/index.cpp
index f824880fc..a71d27e9c 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -219,9 +219,9 @@ void KMMsgIndex::setIndexingEnabled( KMFolder* folder, bool e ) {
// create() will notice that folder is disabled
break;
case s_creating:
- if ( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
+ if ( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) != mPendingFolders.end() ) {
// easy:
- mPendingFolders.erase( std::tqfind( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
+ mPendingFolders.erase( std::find( mPendingFolders.begin(), mPendingFolders.end(), folder ) );
break;
}
//else fall-through
@@ -433,7 +433,7 @@ bool KMMsgIndex::startQuery( KMSearch* s ) {
//}
void KMMsgIndex::removeSearch( TQObject* destroyed ) {
- mSearches.erase( std::tqfind( mSearches.begin(), mSearches.end(), destroyed ) );
+ mSearches.erase( std::find( mSearches.begin(), mSearches.end(), destroyed ) );
}
@@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() {
TQString terms;
for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) {
Q_ASSERT( rule->function() == KMSearchRule::FuncContains );
- terms += TQString::tqfromLatin1( " %1 " ).arg( rule->contents() );
+ terms += TQString::tqfromLatin1( " %1 " ).tqarg( rule->contents() );
}
mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 );
diff --git a/kmail/interfaces/bodypart.h b/kmail/interfaces/bodypart.h
index 251d61aff..434906321 100644
--- a/kmail/interfaces/bodypart.h
+++ b/kmail/interfaces/bodypart.h
@@ -34,8 +34,9 @@
#ifndef __KMAIL_INTERFACES_BODYPART_H__
#define __KMAIL_INTERFACES_BODYPART_H__
+#include <tqcstring.h>
+
template <typename T> class TQMemArray;
-typedef TQMemArray<char> TQByteArray;
class TQString;
namespace KMail {
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index bd4d4a51d..2135a9e79 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key>
"for encryption.")
: i18n("One or more of the OpenPGP encryption keys or S/MIME "
"certificates for recipient \"%1\" is not fully trusted "
- "for encryption.").arg(address) ;
+ "for encryption.").tqarg(address) ;
if ( !fishies.empty() ) {
// certificates can't have marginal trust
@@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expired less than a day ago.</p>",
"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
+ daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
key.shortKeyID() )
: ( ca
? ( key.isRoot()
@@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+ daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
orig.issuerSerial(),
Kleo::DN( key.userID(0).id() ).prettyDN() )
: ( mine ? sign
@@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expired less than a day ago.</p>",
"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expired %n days ago.</p>",
- daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+ daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
key.issuerSerial() ) );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expires in less than a day.</p>",
"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ),
+ daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ),
key.shortKeyID() )
: ( ca
? ( key.isRoot()
@@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
+ daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(),
orig.issuerSerial(),
Kleo::DN( key.userID(0).id() ).prettyDN() )
: ( mine ? sign
@@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
"<p>expires in less than a day.</p>",
"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>"
"<p>expires in less than %n days.</p>",
- daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(),
+ daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(),
key.issuerSerial() ) );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
@@ -1370,7 +1370,7 @@ void Kleo::KeyResolver::collapseAllSplitInfos() {
dump();
for ( unsigned int i = 0 ; i < numConcreteCryptoMessageFormats ; ++i ) {
std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
- d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
+ d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
if ( pos == d->mFormatInfoMap.end() )
continue;
std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1394,7 +1394,7 @@ void Kleo::KeyResolver::addToAllSplitInfos( const std::vector<GpgME::Key> & keys
if ( !( f & concreteCryptoMessageFormats[i] ) )
continue;
std::map<CryptoMessageFormat,FormatInfo>::iterator pos =
- d->mFormatInfoMap.tqfind( concreteCryptoMessageFormats[i] );
+ d->mFormatInfoMap.find( concreteCryptoMessageFormats[i] );
if ( pos == d->mFormatInfoMap.end() )
continue;
std::vector<SplitInfo> & v = pos->second.splitInfos;
@@ -1422,7 +1422,7 @@ void Kleo::KeyResolver::dump() const {
std::cerr << kit->shortKeyID() << " ";
std::cerr << std::endl
<< " SplitInfo #" << i << " recipients: "
- << sit->recipients.join(", ").utf8() << std::endl;
+ << sit->recipients.join(", ").utf8().data() << std::endl;
}
}
#endif
@@ -1560,14 +1560,14 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() {
std::vector<Kleo::KeyResolver::SplitInfo> Kleo::KeyResolver::encryptionItems( Kleo::CryptoMessageFormat f ) const {
dump();
std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
- d->mFormatInfoMap.tqfind( f );
+ d->mFormatInfoMap.find( f );
return it != d->mFormatInfoMap.end() ? it->second.splitInfos : std::vector<SplitInfo>() ;
}
std::vector<GpgME::Key> Kleo::KeyResolver::signingKeys( CryptoMessageFormat f ) const {
dump();
std::map<CryptoMessageFormat,FormatInfo>::const_iterator it =
- d->mFormatInfoMap.tqfind( f );
+ d->mFormatInfoMap.find( f );
return it != d->mFormatInfoMap.end() ? it->second.signKeys : std::vector<GpgME::Key>() ;
}
@@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
"There is a problem with the "
"encryption certificate(s) for \"%1\".\n\n"
"Please re-select the certificate(s) which should "
- "be used for this recipient.").arg(person),
+ "be used for this recipient.").tqarg(person),
keys );
}
bool canceled = false;
@@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p
"Select the certificate(s) which should "
"be used for this recipient. If there is no suitable certificate in the list "
"you can also search for external certificates by clicking the button: search for external certificates.</qt>")
- .arg( TQStyleSheet::escape(person) )
+ .tqarg( TQStyleSheet::escape(person) )
: i18n("if in your language something like "
"'certificate(s)' isn't possible please "
"use the plural in the translation",
"More than one certificate matches \"%1\".\n\n"
"Select the certificate(s) which should "
- "be used for this recipient.").arg( TQStyleSheet::escape(person) ),
+ "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ),
matchingKeys ), address, canceled );
// we can ignore 'canceled' here, since trustedOrConfirmed() returns
// an empty vector when canceled == true, and we'd just do the same
@@ -1765,7 +1765,7 @@ void Kleo::KeyResolver::addKeys( const std::vector<Item> & items ) {
Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences( const TQString& address ) const
{
const Private::ContactPreferencesMap::iterator it =
- d->mContactPreferencesMap.tqfind( address );
+ d->mContactPreferencesMap.find( address );
if ( it != d->mContactPreferencesMap.end() )
return it->second;
@@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont
KABC::Addressee addr;
if ( res.isEmpty() ) {
bool ok = true;
- TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok );
+ TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok );
if ( ok ) {
addr.setNameFromString( fullName );
addr.insertEmail( email, true );
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index eebe99f76..6c7950ae6 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -46,7 +46,7 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *tqparent)
: TQObject(tqparent), mPrecommand(precommand)
{
BroadcastqStatus::instance()->seStatusMsg(
- i18n("Executing precommand %1").arg(precommand ));
+ i18n("Executing precommand %1").tqarg(precommand ));
mPrecommandProcess.setUseShell(true);
mPrecommandProcess << precommand;
@@ -66,7 +66,7 @@ bool KMPrecommand::start()
{
bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit );
if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.")
- .arg(mPrecommand));
+ .tqarg(mPrecommand));
return ok;
}
@@ -77,7 +77,7 @@ void KMPrecommand::precommandExited(KProcess *p)
int exitCode = p->normalExit() ? p->exitStatus() : -1;
if (exitCode)
KMessageBox::error(0, i18n("The precommand exited with code %1:\n%2")
- .arg(exitCode).arg(strerror(exitCode)));
+ .tqarg(exitCode).tqarg(strerror(exitCode)));
emit finished(!exitCode);
}
@@ -378,7 +378,7 @@ bool KMAccount::runPrecommand(const TQString &precommand)
KMPrecommand precommandProcess(precommand, this);
BroadcastqStatus::instance()->seStatusMsg(
- i18n("Executing precommand %1").arg(precommand ));
+ i18n("Executing precommand %1").tqarg(precommand ));
connect(&precommandProcess, TQT_SIGNAL(finished(bool)),
TQT_SLOT(precommandExited(bool)));
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 6942bab53..b16dc0b34 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin
connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError()));
TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
- TQString("%1").arg(KAccount::id()) );
+ TQString("%1").tqarg(KAccount::id()) );
KConfig config( serNumUri );
TQStringList serNums = config.readListEntry( "unfiltered" );
mFilterSerNumsToSave.setAutoDelete( false );
@@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap()
killAllJobs( true );
TQString serNumUri = locateLocal( "data", "kmail/unfiltered." +
- TQString("%1").arg(KAccount::id()) );
+ TQString("%1").tqarg(KAccount::id()) );
KConfig config( serNumUri );
TQStringList serNums;
TQDictIterator<int> it( mFilterSerNumsToSave );
@@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive)
mMailCheckProgressItem =
ProgressManager::createProgressItem(
"MailCheckAccount" + name(),
- i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ),
+ i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ),
TQString(), // status
true, // can be canceled
useSSL() || useTLS() );
@@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
// It's possible that the message has been deleted or moved into a
// different folder, or that the serNum is stale
if ( !folder ) {
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
++filterIt;
continue;
}
@@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
if (!imapFolder ||
!imapFolder->folder()->isSystemFolder() ||
!(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
++filterIt;
continue;
}
@@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
msg = folder->getMsg( idx );
if (!msg) { // sanity checking
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
++filterIt;
continue;
}
@@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
TQT_SLOT(slotFilterMsg(KMMessage*)));
job->start();
} else {
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) );
if (slotFilterMsg(msg) == 2) break;
}
}
@@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder )
//-----------------------------------------------------------------------------
void KMAcctImap::slotFiltered(TQ_UINT32 serNum)
{
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) );
}
//-----------------------------------------------------------------------------
@@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum)
if ( findIt != mFilterSerNums.end() )
return;
mFilterSerNums.append( serNum );
- mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 );
+ mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 );
}
int KMAcctImap::slotFilterMsg( KMMessage *msg )
@@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg )
msg->setTransferInProgress(false);
TQ_UINT32 serNum = msg->getMsgSerNum();
if ( serNum )
- mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) );
+ mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) );
int filterResult = kmkernel->filterMgr()->process(msg,
KMFilterMgr::Inbound,
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 6062f3547..5c842b1d1 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -125,7 +125,7 @@ bool KMAcctLocal::preProcess()
//BroadcastqStatus::instance()->reset();
BroadcastqStatus::instance()->seStatusMsg(
- i18n("Preparing transmission from \"%1\"...").arg(mName));
+ i18n("Preparing transmission from \"%1\"...").tqarg(mName));
Q_ASSERT( !mMailCheckProgressItem );
@@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess()
mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
"MailCheck" + mName,
escapedName,
- i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
+ i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
false, // cannot be canceled
false ); // no tls/ssl
@@ -164,7 +164,7 @@ bool KMAcctLocal::preProcess()
mMailFolder->close("acctlocalMail");
checkDone( mHasNewMail, CheckError );
TQString errMsg = i18n( "Transmission failed: Could not lock %1." )
- .arg( mMailFolder->location() );
+ .tqarg( mMailFolder->location() );
BroadcastqStatus::instance()->seStatusMsg( errMsg );
return false;
}
@@ -177,7 +177,7 @@ bool KMAcctLocal::preProcess()
// prepare the static parts of the status message:
mStatusMsgStub = i18n("Moving message %3 of %2 from %1.")
- .arg(mMailFolder->location()).arg( mNumMsgs );
+ .tqarg(mMailFolder->location()).tqarg( mNumMsgs );
//BroadcastqStatus::instance()->seStatusProgressEnable( "L" + mName, true );
return true;
@@ -192,7 +192,7 @@ bool KMAcctLocal::fetchMsg()
/* This causes mail eating
if (kmkernel->mailCheckAborted()) break; */
- const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched );
+ const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched );
//BroadcastqStatus::instance()->seStatusMsg( statusMsg );
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
@@ -244,8 +244,8 @@ void KMAcctLocal::postProcess()
KMessageBox::queuedMessageBox( 0, KMessageBox::Information,
i18n( "<qt>Cannot remove mail from "
"mailbox <b>%1</b>:<br>%2</qt>" )
- .arg( mMailFolder->location() )
- .arg( strerror( rc ) ) );
+ .tqarg( mMailFolder->location() )
+ .tqarg( strerror( rc ) ) );
}
if( mMailCheckProgressItem ) { // do this only once...
@@ -253,7 +253,7 @@ void KMAcctLocal::postProcess()
mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from mailbox %1.",
"Fetched %n messages from mailbox %1.",
- mNumMsgs ).arg( mMailFolder->location() ) );
+ mNumMsgs ).tqarg( mMailFolder->location() ) );
mMailCheckProgressItem->setComplete();
mMailCheckProgressItem = 0;
}
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 7b83dcf89..07391a582 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -107,14 +107,14 @@ void KMAcctMaildir::processNewMail(bool)
}
BroadcastqStatus::instance()->seStatusMsg(
- i18n("Preparing transmission from \"%1\"...").arg(mName));
+ i18n("Preparing transmission from \"%1\"...").tqarg(mName));
Q_ASSERT( !mMailCheckProgressItem );
TQString escapedName = TQStyleSheet::escape( mName );
mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
"MailCheck" + mName,
escapedName,
- i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
+ i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
false, // cannot be canceled
false ); // no tls/ssl
@@ -130,7 +130,7 @@ void KMAcctMaildir::processNewMail(bool)
rc = mailFolder.open("acctmaildirMail");
if (rc)
{
- TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() );
+ TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() );
KMessageBox::sorry(0, aStr);
kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl;
checkDone( hasNewMail, CheckError );
@@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool)
// prepare the static parts of the status message:
TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.")
- .arg(mailFolder.location()).arg(num);
+ .tqarg(mailFolder.location()).tqarg(num);
mMailCheckProgressItem->setTotalItems( num );
@@ -162,7 +162,7 @@ void KMAcctMaildir::processNewMail(bool)
}
if (!addedOk) break;
- TQString statusMsg = statusMsgStub.arg(i);
+ TQString statusMsg = statusMsgStub.tqarg(i);
mMailCheckProgressItem->incCompletedItems();
mMailCheckProgressItem->updateProgress();
mMailCheckProgressItem->setqStatus( statusMsg );
@@ -192,7 +192,7 @@ void KMAcctMaildir::processNewMail(bool)
mMailCheckProgressItem->setqStatus(
i18n( "Fetched 1 message from maildir folder %1.",
"Fetched %n messages from maildir folder %1.",
- num ).arg(mailFolder.location() ) );
+ num ).tqarg(mailFolder.location() ) );
mMailCheckProgressItem->setComplete();
mMailCheckProgressItem = 0;
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 88370a456..52a30a4d8 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <include>qtextcodec.h</include>
+ <include>tqtextcodec.h</include>
<include>kapplication.h</include>
<kcfgfile name="kmailrc"/>
<group name="Behaviour">
@@ -561,13 +561,13 @@
<default>true</default>
</entry>
<entry name="ForegroundColor" type="Color" key="ForegroundColor">
- <default code="true">kapp->palette().active().text()</default>
+ <default code="true">kapp->tqpalette().active().text()</default>
</entry>
<entry name="BackgroundColor" type="Color" key="BackgroundColor">
- <default code="true">kapp->palette().active().base()</default>
+ <default code="true">kapp->tqpalette().active().base()</default>
</entry>
<entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding">
- <default code="true"> QCString(QTextCodec::codecForLocale()->name()).lower() == "eucjp"? QCString("jis7") : QCString(QTextCodec::codecForLocale()->name()).lower()</default>
+ <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default>
<label></label>
<whatsthis>Some emails, especially those generated automatically, do not specify the character encoding which needs to be used to properly display them. In such cases a fallback character encoding will be used, which you can configure here. Set it to the character encoding most commonly used in your part of the world. As a default the encoding configured for the whole system is used.</whatsthis>
</entry>
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 70c90cb00..0a895d9b9 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -100,7 +100,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
// create a canvas to insert our widget
TQWidget *canvas = new TQWidget(tqparentWidget, widgetName);
- canvas->setFocusPolicy(TQWidget::ClickFocus);
+ canvas->setFocusPolicy(Qt::ClickFocus);
setWidget(canvas);
KGlobal::iconLoader()->addAppDir("kmail");
#if 0
@@ -125,7 +125,7 @@ KMailPart::KMailPart(TQWidget *tqparentWidget, const char *widgetName,
kapp->config());
TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
topLayout->addWidget(mainWidget);
- mainWidget->setFocusPolicy(TQWidget::ClickFocus);
+ mainWidget->setFocusPolicy(Qt::ClickFocus);
mStatusBar = new KMailStatusBarExtension(this);
mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 812374734..25a90fd74 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -682,8 +682,8 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
remainder.pop_front();
remainder.pop_front();
label = i18n("%1's %2")
- .arg( parts[2] )
- .arg( remainder.join( TQString::tqfromLatin1("/") ) );
+ .tqarg( parts[2] )
+ .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
}
// Another special case is our own folders, under the imap INBOX, make
// those prettier too
@@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
// Fix kolab issue 2531 folder->storage() )->account() can be null
if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) {
label = i18n( "My %1 (%2)")
- .arg( remainder.join( TQString::tqfromLatin1("/") ),
+ .tqarg( remainder.join( TQString::tqfromLatin1("/") ),
static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
} else {
label = i18n("My %1")
- .arg( remainder.join( TQString::tqfromLatin1("/") ) );
+ .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
}
} else {
label = i18n("My %1")
- .arg( remainder.join( TQString::tqfromLatin1("/") ) );
+ .tqarg( remainder.join( TQString::tqfromLatin1("/") ) );
}
break;
}
@@ -1574,7 +1574,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl;
return;
}
- if ( path.startsWith( "/INBOX/", false ) ) {
+ if ( path.tqstartsWith( "/INBOX/", false ) ) {
// If INBOX, replace it with the username (which is user@domain)
path = path.mid( secondSlash );
path.prepend( folderURL.user() );
@@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig()
// No subfolder was found, so ask if we can make them
msg = i18n("KMail will now create the required groupware folders"
" as subfolders of %1; if you do not want this, cancel"
- " and the IMAP resource will be disabled").arg(tqparentFolderName);
+ " and the IMAP resource will be disabled").tqarg(tqparentFolderName);
} else {
// Some subfolders were found, be more precise
TQString operations = "<ul>";
@@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig()
if ( i != KMail::ContentsTypeMail ) {
TQString typeName = localizedDefaultFolderName( static_cast<KMail::FolderContentsType>( i ) );
if ( results[i].found == StandardFolderSearchResult::NotFound )
- operations += "<li>" + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "</li>";
+ operations += "<li>" + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "</li>";
else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName )
operations += "<li>" + i18n( "%1: found folder %2. It will be set as the main groupware folder." ).
- arg( typeName ).arg( results[i].folder->label() ) + "</li>";
+ tqarg( typeName ).tqarg( results[i].folder->label() ) + "</li>";
}
}
operations += "</ul>";
msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2"
"<br>If you do not want this, cancel"
- " and the IMAP resource will be disabled").arg(tqparentFolderName, operations);
+ " and the IMAP resource will be disabled").tqarg(tqparentFolderName, operations);
}
@@ -1991,9 +1991,9 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
labels << (*it)->prettyURL();
const TQString selected = KInputDialog::getItem( i18n("Default folder"),
i18n("There are multiple %1 default folders, please choose one:")
- .arg( localizedDefaultFolderName( contentsType ) ), labels );
+ .tqarg( localizedDefaultFolderName( contentsType ) ), labels );
if ( !selected.isEmpty() )
- result.folder = result.folders[ labels.findIndex( selected ) ];
+ result.folder = result.folders[ labels.tqfindIndex( selected ) ];
}
KMFolder* folder = result.folder;
@@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType
if( folder->canAccess() != 0 ) {
KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.")
- .arg( folderName( itemType ) ) );
+ .tqarg( folderName( itemType ) ) );
return 0;
}
folder->storage()->setContentsType( contentsType );
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 1473d3d6e..ba4a84e7a 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget )
KMCommand::Result KMUrlCopyCommand::execute()
{
- TQClipboard* clip = TQApplication::clipboard();
+ TQClipboard* clip = TQApplication::tqclipboard();
if (mUrl.protocol() == "mailto") {
// put the url into the mouse selection and the clipboard
@@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
{
if (KMessageBox::warningContinueCancel(0,
i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
- .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+ .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
!= KMessageBox::Continue)
return Canceled;
}
@@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
{
if (KMessageBox::warningContinueCancel(0,
i18n("File %1 exists.\nDo you want to replace it?")
- .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+ .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
== KMessageBox::Continue) {
mOffset = 0;
@@ -1397,12 +1397,12 @@ KMCommand::Result KMForwardDigestCommand::execute()
msgPartText += "--";
msgPartText += TQString::tqfromLatin1( boundary );
msgPartText += "\nContent-Type: MESSAGE/RFC822";
- msgPartText += TQString( "; CHARSET=%1" ).arg( msg->charset() );
+ msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) );
msgPartText += '\n';
DwHeaders dwh;
dwh.MessageId().CreateDefault();
- msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
- msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
+ msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() );
+ msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() );
if ( !msg->subject().tqcontains( "(fwd)" ) )
msgPartText += " (fwd)";
msgPartText += "\n\n";
@@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
msgPart->setSubtypeStr( tmp );
msgPart->setName( "unnamed" );
msgPart->setCte( DwMime::kCte7bit ); // does it have to be 7bit?
- msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) );
+ msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) );
// THIS HAS TO BE AFTER setCte()!!!!
msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) );
KCursorSaver busy( KBusyPtr::busy() );
@@ -1741,7 +1741,7 @@ KMCommand::Result KMFilterActionCommand::execute()
if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
progressItem->updateProgress();
TQString statusMsg = i18n("Filtering message %1 of %2");
- statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+ statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
}
@@ -1849,7 +1849,7 @@ void KMMenuCommand::folderToPopupMenu(bool move,
{
while ( menu->count() )
{
- TQPopupMenu *popup = menu->findItem( menu->idAt( 0 ) )->popup();
+ TQPopupMenu *popup = menu->tqfindItem( menu->idAt( 0 ) )->popup();
if (popup)
delete popup;
else
@@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute()
// corrupt IMAP cache, see FolderStorage::getMsg()
if ( msg == 0 ) {
KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
- "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
+ "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) );
deleteLater();
return Failed;
}
@@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
mime->name() == "application/x-shellscript" )
{
if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" )
- .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
+ .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
return Canceled;
}
KRun * runner = new KRun( mUrl );
@@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
++unnamedAtmCount;
s = i18n("filename for the %1-th unnamed attachment",
"attachment.%1")
- .arg( unnamedAtmCount );
+ .tqarg( unnamedAtmCount );
}
curUrl.setFileName( s );
} else {
@@ -2622,7 +2622,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
while ( renameNumbering.tqcontains(file) ) {
file = origFile;
int num = renameNumbering[file] + 1;
- int dotIdx = file.findRev('.');
+ int dotIdx = file.tqfindRev('.');
file = file.insert( (dotIdx>=0) ? dotIdx : file.length(), TQString("_") + TQString::number(num) );
}
curUrl.setFileName(file);
@@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) {
if ( KMessageBox::warningContinueCancel( tqparentWidget(),
i18n( "A file named %1 already exists. Do you want to overwrite it?" )
- .arg( curUrl.fileName() ),
+ .tqarg( curUrl.fileName() ),
i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
continue;
}
@@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
KMessageBox::error( tqparentWidget(),
i18n( "%2 is detailed error description",
"Could not write the file %1:\n%2" )
- .arg( file.name() )
- .arg( TQString::fromLocal8Bit( strerror( errno ) ) ),
+ .tqarg( file.name() )
+ .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ),
i18n( "KMail Error" ) );
return Failed;
}
@@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
{
KMessageBox::error( tqparentWidget(),
i18n( "Could not write the file %1." )
- .arg( url.path() ),
+ .tqarg( url.path() ),
i18n( "KMail Error" ) );
return Failed;
}
@@ -3012,7 +3012,7 @@ KMCommand::Result KMIMChatCommand::execute()
nameList.append( (*it).realName() );
}
TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
- apology = apology.arg( names );
+ apology = apology.tqarg( names );
}
KMessageBox::sorry( tqparentWidget(), apology );
@@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
return;
// FIXME: better detection of mimetype??
- if ( !mAtmName.endsWith( ".xia", false ) )
+ if ( !mAtmName.tqendsWith( ".xia", false ) )
return;
const Kleo::CryptoBackend::Protocol * chiasmus =
@@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
}
static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) {
- return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
+ return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
}
void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result )
@@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute()
KMail::KorgHelper::ensureRunning();
- TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() )
- .arg( msg->to() ).arg( msg->subject() );
+ TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() )
+ .tqarg( msg->to() ).tqarg( msg->subject() );
KTempFile tf;
tf.setAutoDelete( true );
@@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute()
tf.close();
KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
- iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri,
+ iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri,
tf.name(), TQStringList(), "message/rfc822", true );
delete iface;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 98a5c6e0a..ff4659c86 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -196,10 +196,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
setInstance( kmkernel->xmlGuiInstance() );
mMainWidget = new TQWidget(this);
// splitter between the headers area and the actual editor
- mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
+ mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" );
mHeadersToEditorSplitter->setChildrenCollapsible( false );
mHeadersArea = new TQWidget( mHeadersToEditorSplitter );
- mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum );
+ mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum );
TQVBoxLayout *v = new TQVBoxLayout( mMainWidget );
v->addWidget( mHeadersToEditorSplitter );
mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea);
@@ -250,10 +250,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
TQToolTip::add( mBtnCc, tip );
TQToolTip::add( mBtnBcc, tip );
- mBtnTo->setFocusPolicy(TQWidget::NoFocus);
- mBtnCc->setFocusPolicy(TQWidget::NoFocus);
- mBtnBcc->setFocusPolicy(TQWidget::NoFocus);
- //mBtnFrom->setFocusPolicy(TQWidget::NoFocus);
+ mBtnTo->setFocusPolicy(Qt::NoFocus);
+ mBtnCc->setFocusPolicy(Qt::NoFocus);
+ mBtnBcc->setFocusPolicy(Qt::NoFocus);
+ //mBtnFrom->setFocusPolicy(Qt::NoFocus);
connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
@@ -331,9 +331,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
mFixedFontAction = 0;
mTempDir = 0;
// the attachment view is separated from the editor by a splitter
- mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
+ mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" );
mSplitter->setChildrenCollapsible( false );
- mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter");
+ mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter");
mSnippetSplitter->setChildrenCollapsible( false );
TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter );
@@ -386,10 +386,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
setCaption( i18n("Composer") );
setMinimumSize(200,200);
- mBtnIdentity->setFocusPolicy(TQWidget::NoFocus);
- mBtnFcc->setFocusPolicy(TQWidget::NoFocus);
- mBtnTransport->setFocusPolicy(TQWidget::NoFocus);
- mBtnDictionary->setFocusPolicy( TQWidget::NoFocus );
+ mBtnIdentity->setFocusPolicy(Qt::NoFocus);
+ mBtnFcc->setFocusPolicy(Qt::NoFocus);
+ mBtnTransport->setFocusPolicy(Qt::NoFocus);
+ mBtnDictionary->setFocusPolicy( Qt::NoFocus );
mAtmListView = new AttachmentListView( this, mSplitter,
"attachment list view" );
@@ -456,7 +456,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
TQT_SLOT(slotFolderRemoved(KMFolder*)));
connect( kmkernel, TQT_SIGNAL( configChanged() ),
- this, TQT_SLOT( slotConfigChanged() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) );
connect (mEditor, TQT_SIGNAL (spellcheck_done(int)),
this, TQT_SLOT (slotSpellcheckDone (int)));
@@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e)
void KMComposeWin::readColorConfig(void)
{
if ( GlobalSettings::self()->useDefaultColors() ) {
- mForeColor = TQColor(kapp->palette().active().text());
- mBackColor = TQColor(kapp->palette().active().base());
+ mForeColor = TQColor(kapp->tqpalette().active().text());
+ mBackColor = TQColor(kapp->tqpalette().active().base());
} else {
mForeColor = GlobalSettings::self()->foregroundColor();
mBackColor = GlobalSettings::self()->backgroundColor();
@@ -787,7 +787,7 @@ void KMComposeWin::writeConfig(void)
mAutoSpellCheckingAction->isChecked() );
TQStringList transportHistory = GlobalSettings::self()->transportHistory();
transportHistory.remove(mTransport->currentText());
- if (KMTransportInfo::availableTransports().findIndex(mTransport
+ if (KMTransportInfo::availableTransports().tqfindIndex(mTransport
->currentText()) == -1) {
transportHistory.prepend(mTransport->currentText());
}
@@ -817,7 +817,7 @@ void KMComposeWin::autoSaveMessage()
mAutoSaveTimer->stop();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- this, TQT_SLOT( slotContinueAutoSave() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
// This method is called when KMail crashed, so don't try signing/encryption
// and don't disable controls because it is also called from a timer and
// then the disabling is distracting.
@@ -829,7 +829,7 @@ void KMComposeWin::autoSaveMessage()
void KMComposeWin::slotContinueAutoSave()
{
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- this, TQT_SLOT( slotContinueAutoSave() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) );
// Ok, it's done now - continue dead letter saving
if ( mComposedMessages.isEmpty() ) {
@@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave()
i18n("Autosaving the message as %1 "
"failed.\n"
"Reason: %2" )
- .arg( filename, strerror( status ) ),
+ .tqarg( filename, strerror( status ) ),
i18n("Autosaving Failed") );
mLastAutoSaveErrno = status;
}
@@ -888,7 +888,7 @@ void KMComposeWin::slotView(void)
//This sucks awfully, but no, I cannot get an activated(int id) from
// actionContainer()
- if (!sender()->isA("KToggleAction"))
+ if (!TQT_TQOBJECT(sender())->isA("KToggleAction"))
return;
KToggleAction *act = (KToggleAction *) sender();
@@ -1234,13 +1234,13 @@ void KMComposeWin::setupActions(void)
{
//default = send now, alternative = queue
( void ) new KAction( i18n("&Send Mail"), "mail_send", CTRL+Key_Return,
- this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
+ TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send",
actionCollection(), "send_default_via" );
- (void) new KAction (i18n("Send &Later"), "queue", 0, this,
+ (void) new KAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_alternative_via" );
@@ -1251,12 +1251,12 @@ void KMComposeWin::setupActions(void)
//default = queue, alternative = send now
(void) new KAction (i18n("Send &Later"), "queue",
CTRL+Key_Return,
- this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
+ TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_default_via" );
( void ) new KAction( i18n("&Send Mail"), "mail_send", 0,
- this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
+ TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
// FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send",
@@ -1291,78 +1291,78 @@ void KMComposeWin::setupActions(void)
(void) new KAction (i18n("Save as &Draft"), "filesave", 0,
- this, TQT_SLOT(slotSaveDraft()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts");
(void) new KAction (i18n("Save as &Template"), "filesave", 0,
- this, TQT_SLOT(slotSaveTemplate()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()),
actionCollection(), "save_in_templates");
(void) new KAction (i18n("&Insert File..."), "fileopen", 0,
- this, TQT_SLOT(slotInsertFile()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file");
mRecentAction = new KRecentFilesAction (i18n("&Insert File Recent"),
"fileopen", 0,
- this, TQT_SLOT(slotInsertRecentFile(const KURL&)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)),
actionCollection(), "insert_file_recent");
mRecentAction->loadEntries( KMKernel::config() );
(void) new KAction (i18n("&Address Book"), "contents",0,
- this, TQT_SLOT(slotAddrBook()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()),
actionCollection(), "addressbook");
(void) new KAction (i18n("&New Composer"), "mail_new",
KStdAccel::shortcut(KStdAccel::New),
- this, TQT_SLOT(slotNewComposer()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()),
actionCollection(), "new_composer");
(void) new KAction (i18n("New Main &Window"), "window_new", 0,
- this, TQT_SLOT(slotNewMailReader()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
actionCollection(), "open_mailreader");
if ( !mClassicalRecipients ) {
- new KAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor,
+ new KAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor),
TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
- new KAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor,
+ new KAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor),
TQT_SLOT( saveDistributionList() ), actionCollection(),
"save_distribution_list" );
}
- //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message");
- KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection());
- KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection());
+ //KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message");
+ KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
+ KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection());
- KStdAction::undo (this, TQT_SLOT(slotUndo()), actionCollection());
- KStdAction::redo (this, TQT_SLOT(slotRedo()), actionCollection());
- KStdAction::cut (this, TQT_SLOT(slotCut()), actionCollection());
- KStdAction::copy (this, TQT_SLOT(slotCopy()), actionCollection());
- KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection());
- KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
+ KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection());
+ KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection());
+ KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection());
+ KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection());
+ KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection());
+ KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection());
- KStdAction::tqfind (this, TQT_SLOT(slotFind()), actionCollection());
- KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+ KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
+ KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection());
- KStdAction::tqreplace (this, TQT_SLOT(slotReplace()), actionCollection());
- KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
+ KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection());
+ KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
- mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
+ mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
actionCollection(), "paste_quoted");
- (void) new KAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()),
+ (void) new KAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()),
actionCollection(), "paste_att");
- KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, this,
+ KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
addq, TQT_SLOT(setEnabled(bool)) );
- KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, this,
+ KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
remq, TQT_SLOT(setEnabled(bool)) );
- (void) new KAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()),
+ (void) new KAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()),
actionCollection(), "clean_spaces");
- mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, this,
+ mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
@@ -1376,7 +1376,7 @@ void KMComposeWin::setupActions(void)
mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
//----- Message-Encoding Submenu
mEncodingAction = new KSelectAction( i18n( "Se&t Encoding" ), "charset",
- 0, this, TQT_SLOT(slotSetCharset() ),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ),
actionCollection(), "charsets" );
mWordWrapAction = new KToggleAction (i18n("&Wordwrap"), 0,
actionCollection(), "wordwrap");
@@ -1396,7 +1396,7 @@ void KMComposeWin::setupActions(void)
mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking );
slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking );
connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
TQStringList encodings = KMMsgBase::supportedEncodings(true);
encodings.prepend( i18n("Auto-Detect"));
@@ -1404,84 +1404,84 @@ void KMComposeWin::setupActions(void)
mEncodingAction->setCurrentItem( -1 );
//these are checkable!!!
- markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, this,
+ markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleMarkup()),
actionCollection(), "html");
- mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, this,
+ mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_all_fields");
- mIdentityAction = new KToggleAction (i18n("&Identity"), 0, this,
+ mIdentityAction = new KToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_identity");
- mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, this,
+ mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_dictionary");
- mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, this,
+ mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_fcc");
- mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, this,
+ mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_transport");
- mFromAction = new KToggleAction (i18n("&From"), 0, this,
+ mFromAction = new KToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_from");
- mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, this,
+ mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_reply_to");
if ( mClassicalRecipients ) {
- mToAction = new KToggleAction (i18n("&To"), 0, this,
+ mToAction = new KToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_to");
- mCcAction = new KToggleAction (i18n("&CC"), 0, this,
+ mCcAction = new KToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_cc");
- mBccAction = new KToggleAction (i18n("&BCC"), 0, this,
+ mBccAction = new KToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_bcc");
}
- mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, this,
+ mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotView()),
actionCollection(), "show_subject");
//end of checkable
- mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, this,
+ mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAppendSignature()),
actionCollection(), "append_signature");
- mPrependSignatureAction = new KAction (i18n("Prepend S&ignature"), 0, this,
+ mPrependSignatureAction = new KAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPrependSignature()),
actionCollection(), "prepend_signature");
- mInsertSignatureAction = new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this,
+ mInsertSignatureAction = new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInsertSignatureAtCursor()),
actionCollection(), "insert_signature_at_cursor_position");
- mAttachPK = new KAction (i18n("Attach &Public Key..."), 0, this,
+ mAttachPK = new KAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInsertPublicKey()),
actionCollection(), "attach_public_key");
- mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, this,
+ mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotInsertMyPublicKey()),
actionCollection(), "attach_my_public_key");
(void) new KAction (i18n("&Attach File..."), "attach",
- 0, this, TQT_SLOT(slotAttachFile()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()),
actionCollection(), "attach");
- mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, this,
+ mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAttachRemove()),
actionCollection(), "remove");
mAttachSaveAction = new KAction (i18n("&Save Attachment As..."), "filesave",0,
- this, TQT_SLOT(slotAttachSave()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()),
actionCollection(), "attach_save");
- mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, this,
+ mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAttachProperties()),
actionCollection(), "attach_properties");
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
- (void) new KAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()),
+ (void) new KAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()),
actionCollection(), "setup_spellchecker");
if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
@@ -1491,7 +1491,7 @@ void KMComposeWin::setupActions(void)
a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
mEncryptChiasmusAction = a;
connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
} else {
mEncryptChiasmusAction = 0;
}
@@ -1547,7 +1547,7 @@ void KMComposeWin::setupActions(void)
l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
mCryptoModuleAction = new KSelectAction( i18n( "&Cryptographic Message Format" ), 0,
- this, TQT_SLOT(slotSelectCryptoModule()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()),
actionCollection(), "options_select_crypto" );
mCryptoModuleAction->setItems( l );
mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) );
@@ -1581,36 +1581,36 @@ void KMComposeWin::setupActions(void)
TQT_SLOT( slotSizeAction( int ) ) );
alignLeftAction = new KToggleAction (i18n("Align Left"), "text_left", 0,
- this, TQT_SLOT(slotAlignLeft()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(),
"align_left");
alignLeftAction->setChecked( true );
alignRightAction = new KToggleAction (i18n("Align Right"), "text_right", 0,
- this, TQT_SLOT(slotAlignRight()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(),
"align_right");
alignCenterAction = new KToggleAction (i18n("Align Center"), "text_center", 0,
- this, TQT_SLOT(slotAlignCenter()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(),
"align_center");
textBoldAction = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
- this, TQT_SLOT(slotTextBold()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()),
actionCollection(), "text_bold");
textItalicAction = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
- this, TQT_SLOT(slotTextItalic()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()),
actionCollection(), "text_italic");
textUnderAction = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
- this, TQT_SLOT(slotTextUnder()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()),
actionCollection(), "text_under");
actionFormatReset = new KAction( i18n( "Reset Font Settings" ), "eraser", 0,
- this, TQT_SLOT( slotFormatReset() ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ),
actionCollection(), "format_reset");
actionFormatColor = new KAction( i18n( "Text Color..." ), "colorize", 0,
- this, TQT_SLOT( slotTextColor() ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ),
actionCollection(), "format_color");
// editorFocusChanged(false);
createGUI("kmcomposerui.rc");
connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ),
- this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
// In Kontact, this entry would read "Configure Kontact", but bring
// up KMail's config dialog. That's sensible, though, so fix the label.
@@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void)
statusBar()->insertItem("", 0, 1);
statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter);
- statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( " " ), 3, 0, true );
- statusBar()->insertItem(i18n( " Column: %1 ").arg(" "), 2, 0, true);
- statusBar()->insertItem(i18n( " Line: %1 ").arg(" "), 1, 0, true);
+ statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( " " ), 3, 0, true );
+ statusBar()->insertItem(i18n( " Column: %1 ").tqarg(" "), 2, 0, true);
+ statusBar()->insertItem(i18n( " Line: %1 ").tqarg(" "), 1, 0, true);
}
@@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition()
TQString temp;
line = mEditor->currentLine();
col = mEditor->currentColumn();
- temp = i18n(" Line: %1 ").arg(line+1);
+ temp = i18n(" Line: %1 ").tqarg(line+1);
statusBar()->changeItem(temp,1);
- temp = i18n(" Column: %1 ").arg(col+1);
+ temp = i18n(" Column: %1 ").tqarg(col+1);
statusBar()->changeItem(temp,2);
}
@@ -1683,9 +1683,9 @@ void KMComposeWin::setupEditor(void)
updateCursorPosition();
connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition()));
connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
- this, TQT_SLOT( fontChanged( const TQFont & ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) );
connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
- this, TQT_SLOT( tqalignmentChanged( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( tqalignmentChanged( int ) ) );
}
@@ -1876,14 +1876,14 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
// unless the identity is sticky
if ( !stickyIdentity ) {
disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- this, TQT_SLOT(slotIdentityChanged(uint)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
}
// load the mId into the gui, sticky or not, without emitting
mIdentity->setCurrentIdentity( mId );
const uint idToApply = mId;
if ( !stickyIdentity ) {
connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
- this, TQT_SLOT(slotIdentityChanged(uint)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint)));
} else {
// load the message's state into the mId, without applying it to the gui
// that's so we can detect that the id changed (because a sticky was set)
@@ -2345,7 +2345,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
// Make new job and execute it
mComposer = new MessageComposer( this );
connect( mComposer, TQT_SIGNAL( done( bool ) ),
- this, TQT_SLOT( slotComposerDone( bool ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) );
// TODO: Add a cancel button for the following operations?
// Disable any input to the window, so that we have a snapshot of the
@@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl)
if ( !aUrl.isValid() ) {
KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>"
"<p>you have to specify the full path if you wish to attach a file.</p></qt>" )
- .arg( aUrl.prettyURL() ) );
+ .tqarg( aUrl.prettyURL() ) );
return false;
}
const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize();
const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024;
if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) {
- KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) );
+ KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) );
return false;
}
@@ -2422,9 +2422,9 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl;
connect(job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotAttachFileResult(KIO::Job *)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
return true;
}
@@ -2454,9 +2454,9 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart)
}
connect( lvi, TQT_SIGNAL( compress( int ) ),
- this, TQT_SLOT( compressAttach( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) );
connect( lvi, TQT_SIGNAL( uncompress( int ) ),
- this, TQT_SLOT( uncompressAttach( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) );
slotUpdateAttachActions();
}
@@ -2847,7 +2847,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
TQString ext;
if( !patterns.isEmpty() ) {
ext = patterns[0];
- int i = ext.findRev( '.' );
+ int i = ext.tqfindRev( '.' );
if( i == -1 )
ext.prepend( '.' );
else if( i > 0 )
@@ -2998,7 +2998,7 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
KConfigGroupSaver saver( config, "Composer" );
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
- int index = urls.findIndex( u.prettyURL() );
+ int index = urls.tqfindIndex( u.prettyURL() );
if (index != -1) {
TQString encoding = encodings[ index ];
ld.encoding = encoding.latin1();
@@ -3006,9 +3006,9 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
}
mMapAtmLoadData.insert(job, ld);
connect(job, TQT_SIGNAL(result(KIO::Job *)),
- this, TQT_SLOT(slotAttachFileResult(KIO::Job *)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(KIO::Job *)));
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(KIO::Job *, const TQByteArray &)));
}
@@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) {
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the key from the backend:</p>"
"<p><b>%1</b></p></qt>")
- .arg( TQString::fromLocal8Bit( err.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( w, msg, i18n("Key Export Failed") );
}
@@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ
// create message part
KMMessagePart * msgPart = new KMMessagePart();
- msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) );
+ msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) );
msgPart->setTypeStr("application");
msgPart->setSubtypeStr("pgp-keys");
TQValueList<int> dummy;
@@ -3291,7 +3291,7 @@ void KMComposeWin::compressAttach( int idx )
msgPart = mAtmList.at( i );
TQByteArray array;
TQBuffer dev( array );
- KZip zip( &dev );
+ KZip zip( &TQT_TQIODEVICE_OBJECT(dev) );
TQByteArray decoded = msgPart->bodyDecodedBinary();
if ( ! zip.open( IO_WriteOnly ) ) {
KMessageBox::sorry(0, i18n("KMail could not compress the file.") );
@@ -3370,7 +3370,7 @@ void KMComposeWin::uncompressAttach( int idx )
msgPart = mAtmList.at( i );
TQBuffer dev( msgPart->bodyDecodedBinary() );
- KZip zip( &dev );
+ KZip zip( &TQT_TQIODEVICE_OBJECT(dev) );
TQByteArray decoded;
decoded = msgPart->bodyDecodedBinary();
@@ -3562,7 +3562,7 @@ void KMComposeWin::editAttach(int index, bool openWith)
KMail::EditorWatcher *watcher =
new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith,
- this, this );
+ TQT_TQOBJECT(this), this );
connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) );
if ( watcher->start() ) {
mEditorMap.insert( watcher, msgPart );
@@ -3633,7 +3633,7 @@ void KMComposeWin::slotSearchAgain()
//-----------------------------------------------------------------------------
void KMComposeWin::slotReplace()
{
- mEditor->tqreplace();
+ mEditor->replace();
}
//-----------------------------------------------------------------------------
@@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation()
{
if( mEditor->hasFocus() && msg() )
{
- TQString s = TQApplication::clipboard()->text();
+ TQString s = TQApplication::tqclipboard()->text();
if (!s.isEmpty())
mEditor->insert(addQuotesToText(s));
}
@@ -3673,13 +3673,13 @@ void KMComposeWin::slotPasteClipboardAsQuotation()
void KMComposeWin::slotPasteClipboardAsAttachment()
{
- KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
+ KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) );
if ( url.isValid() ) {
- addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) );
+ addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) );
return;
}
- TQMimeSource *mimeSource = TQApplication::clipboard()->data();
+ TQMimeSource *mimeSource = TQApplication::tqclipboard()->data();
if ( TQImageDrag::canDecode(mimeSource) ) {
slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
}
@@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment()
KMMessagePart *msgPart = new KMMessagePart;
msgPart->setName(attName);
TQValueList<int> dummy;
- msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy,
+ msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy,
kmkernel->msgSender()->sendQuotedPrintable());
addAttach(msgPart);
}
@@ -3776,9 +3776,9 @@ void KMComposeWin::slotUndo()
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- if ( ::qt_cast<KEdit*>(fw) )
+ if ( ::tqqt_cast<KEdit*>(fw) )
static_cast<TQTextEdit*>(fw)->undo();
- else if (::qt_cast<TQLineEdit*>(fw))
+ else if (::tqqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->undo();
}
@@ -3787,9 +3787,9 @@ void KMComposeWin::slotRedo()
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- if (::qt_cast<KEdit*>(fw))
+ if (::tqqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->redo();
- else if (::qt_cast<TQLineEdit*>(fw))
+ else if (::tqqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->redo();
}
@@ -3799,9 +3799,9 @@ void KMComposeWin::slotCut()
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- if (::qt_cast<KEdit*>(fw))
+ if (::tqqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->cut();
- else if (::qt_cast<TQLineEdit*>(fw))
+ else if (::tqqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->cut();
}
@@ -3817,7 +3817,7 @@ void KMComposeWin::slotCopy()
#endif
TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton);
- kapp->notify(fw, &k);
+ kapp->notify(TQT_TQOBJECT(fw), TQT_TQEVENT(&k));
}
@@ -3832,7 +3832,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode )
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode );
+ TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode );
if ( mimeSource->provides("image/png") ) {
slotAttachPNGImageData(mimeSource->tqencodedData("image/png"));
} else if ( KURLDrag::canDecode( mimeSource ) ) {
@@ -3875,9 +3875,9 @@ void KMComposeWin::slotMarkAll()
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- if (::qt_cast<TQLineEdit*>(fw))
+ if (::tqqt_cast<TQLineEdit*>(fw))
static_cast<TQLineEdit*>(fw)->selectAll();
- else if (::qt_cast<KEdit*>(fw))
+ else if (::tqqt_cast<KEdit*>(fw))
static_cast<KEdit*>(fw)->selectAll();
}
@@ -4070,14 +4070,14 @@ void KMComposeWin::slotPrint()
{
mMessageWasModified = isModified();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- this, TQT_SLOT( slotContinuePrint( bool ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
applyChanges( true );
}
void KMComposeWin::slotContinuePrint( bool rc )
{
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- this, TQT_SLOT( slotContinuePrint( bool ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) );
if( rc ) {
if ( mComposedMessages.isEmpty() ) {
@@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName,
"identify \"%1\" does not exist (anymore); "
"therefore, the default drafts or templates "
"folder will be used.")
- .arg( id.identityName() ) );
+ .tqarg( id.identityName() ) );
}
}
if ( imapTheFolder && imapTheFolder->noContent() )
@@ -4321,7 +4321,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )"
<< endl;
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
- this, TQT_SLOT( slotContinueDoSend( bool ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) );
if ( !sentOk ) {
mDisableBreaking = false;
@@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const
GlobalSettings::self()->tooManyRecipients() &&
mRecipientsEditor->recipients().count() > thresHold ) {
if ( KMessageBox::questionYesNo( mMainWidget,
- i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold),
+ i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold),
i18n("Too many receipients"),
i18n("&Send as Is"),
i18n("&Edit Recipients")) == KMessageBox::No ) {
@@ -4978,7 +4978,7 @@ void KMComposeWin::slotSpellcheckConfig()
{
KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
- this, 0, true, true );
+ TQT_TQWIDGET(this), 0, true, true );
KWin kwin;
TQTabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd);
@@ -5068,7 +5068,7 @@ void KMComposeWin::updateAutoSave()
if ( !mAutoSaveTimer ) {
mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" );
connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( autoSaveMessage() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) );
}
mAutoSaveTimer->start( autoSaveInterval() );
}
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 5442bef40..dbbb53808 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -241,7 +241,7 @@ KMEdit::KMEdit(TQWidget *tqparent, KMComposeWin* composer,
void KMEdit::createSpellers()
{
delete mSpeller;
- mSpeller = new KMSpell( this, TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
+ mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
}
void KMEdit::initializeAutoSpellChecking()
@@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking()
TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp
TQColor defaultColor2( 0x00, 0x70, 0x00 );
TQColor defaultColor3( 0x00, 0x60, 0x00 );
- TQColor defaultForeground( kapp->palette().active().text() );
+ TQColor defaultForeground( kapp->tqpalette().active().text() );
TQColor c = TQt::red;
KConfigGroup readerConfig( KMKernel::config(), "Reader" );
@@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos )
enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll };
TQPopupMenu *menu = KEdit::createPopupMenu( pos );
- if ( !TQApplication::clipboard()->image().isNull() ) {
+ if ( !TQApplication::tqclipboard()->image().isNull() ) {
int id = menu->idAt(0);
menu->setItemEnabled( id - IdPaste, true);
}
@@ -413,7 +413,7 @@ void KMEdit::spellerReady( KSpell *spell )
bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
{
- if (o == this)
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
KCursor::autoHideEventFilter(o, e);
if (e->type() == TQEvent::KeyPress)
@@ -458,7 +458,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
i18n("Unable to start external editor.") );
killExternalEditor();
} else {
- mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" );
+ mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" );
connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)),
TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() );
@@ -497,7 +497,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
{
//Get word right clicked on
const TQRegExp wordBoundary( "[\\s\\W]" );
- firstSpace = paraText.findRev( wordBoundary, charPos ) + 1;
+ firstSpace = paraText.tqfindRev( wordBoundary, charPos ) + 1;
lastSpace = paraText.tqfind( wordBoundary, charPos );
if( lastSpace == -1 )
lastSpace = paraText.length();
@@ -570,7 +570,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
}
}
} else if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) {
- TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
+ TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
if(! (fe->reason() == TQFocusEvent::ActiveWindow || fe->reason() == TQFocusEvent::Popup) )
emit focusChanged( fe->gotFocus() );
}
@@ -658,7 +658,7 @@ void KMEdit::spellcheck()
// Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own
// spell config, and therefore the two wouldn't be in sync.
- mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this,
+ mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this),
TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
// }
@@ -709,7 +709,7 @@ void KMEdit::paste()
// Roll our own internal flag.
void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
{
- if( e->button() != TQt::MidButton )
+ if( e->button() != Qt::MidButton )
return KEdit::contentsMouseReleaseEvent( e );
mPasteMode = TQClipboard::Selection;
KEdit::contentsMouseReleaseEvent( e );
@@ -719,7 +719,7 @@ void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e )
{
bool handled = false;
- if ( e->button() == TQt::LeftButton ) {
+ if ( e->button() == Qt::LeftButton ) {
// Get the cursor position for the place where the user clicked to
int paragraphPos;
@@ -870,7 +870,7 @@ void KMEdit::slotSpellResult(const TQString &s)
void KMEdit::slotSpellDone()
{
kdDebug(5006)<<" void KMEdit::slotSpellDone()\n";
- KSpell::spelltqStatus status = mKSpellForDialog->status();
+ KSpell::spellStatus status = mKSpellForDialog->status();
delete mKSpellForDialog;
mKSpellForDialog = 0;
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 6d1f50c1d..2f6bbbd78 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -113,7 +113,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
if ( FilterLog::instance()->isLogging() ) {
TQString logText( i18n( "<b>Applying filter action:</b> %1" )
- .arg( (*it)->displayString() ) );
+ .tqarg( (*it)->displayString() ) );
FilterLog::instance()->add( logText, FilterLog::appliedAction );
}
@@ -123,7 +123,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
case KMFilterAction::CriticalError:
if ( FilterLog::instance()->isLogging() ) {
TQString logText = TQString( "<font color=#FF0000>%1</font>" )
- .arg( i18n( "A critical error occurred. Processing stops here." ) );
+ .tqarg( i18n( "A critical error occurred. Processing stops here." ) );
FilterLog::instance()->add( logText, FilterLog::appliedAction );
}
// in case it's a critical error: return immediately!
@@ -131,7 +131,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
case KMFilterAction::ErrorButGoOn:
if ( FilterLog::instance()->isLogging() ) {
TQString logText = TQString( "<font color=#FF0000>%1</font>" )
- .arg( i18n( "A problem was found while applying this action." ) );
+ .tqarg( i18n( "A problem was found while applying this action." ) );
FilterLog::instance()->add( logText, FilterLog::appliedAction );
}
default:
@@ -262,7 +262,7 @@ void KMFilter::readConfig(KConfig* config)
numActions = config->readNumEntry("actions",0);
if (numActions > FILTER_MAX_ACTIONS) {
numActions = FILTER_MAX_ACTIONS ;
- KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").arg( mPattern.name() ) );
+ KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").tqarg( mPattern.name() ) );
}
for ( i=0 ; i < numActions ; i++ ) {
@@ -287,7 +287,7 @@ void KMFilter::readConfig(KConfig* config)
} else
KMessageBox::information( 0 /* app-global modal dialog box */,
i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>")
- .arg( config->readEntry( actName ) ).arg( mPattern.name() ) );
+ .tqarg( config->readEntry( actName ) ).tqarg( mPattern.name() ) );
}
mAccounts = config->readIntListEntry( "accounts-set" );
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index c23a5644a..5c45528eb 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -185,7 +185,7 @@ const TQString KMFilterActionWithUOID::argsAsString() const
const TQString KMFilterActionWithUOID::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -236,7 +236,7 @@ const TQString KMFilterActionWithString::argsAsString() const
const TQString KMFilterActionWithString::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -266,7 +266,7 @@ void KMFilterActionWithStringList::applyParamWidgetValue( TQWidget* paramWidget
void KMFilterActionWithStringList::setParamWidgetValue( TQWidget* paramWidget ) const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
((TQComboBox*)paramWidget)->setCurrentItem( idx >= 0 ? idx : 0 );
}
@@ -277,7 +277,7 @@ void KMFilterActionWithStringList::clearParamWidget( TQWidget* paramWidget ) con
void KMFilterActionWithStringList::argsFromString( const TQString argsStr )
{
- int idx = mParameterList.findIndex( argsStr );
+ int idx = mParameterList.tqfindIndex( argsStr );
if ( idx < 0 ) {
mParameterList.append( argsStr );
idx = mParameterList.count() - 1;
@@ -483,11 +483,11 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
}
tf->close();
}
- // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 )
+ // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 )
// returns "0 and 1 and %1", so we must call .arg as
// many times as there are %n's, regardless of their multiplicity.
if ((*it) == -1) result.tqreplace( "%-1", tempFileName );
- else result = result.arg( tempFileName );
+ else result = result.tqarg( tempFileName );
}
// And finally, replace the %{foo} with the content of the foo
@@ -495,7 +495,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs
TQRegExp header_rx( "%\\{([a-z0-9-]+)\\}", false );
int idx = 0;
while ( ( idx = header_rx.search( result, idx ) ) != -1 ) {
- TQString replacement = KProcess::quote( aMsg->headerField( header_rx.cap(1).latin1() ) );
+ TQString replacement = KProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) );
result.tqreplace( idx, header_rx.matchedLength(), replacement );
idx += replacement.length();
}
@@ -806,7 +806,7 @@ KMFilterActionSetqStatus::KMFilterActionSetqStatus()
KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
if ( idx < 1 ) return ErrorButGoOn;
KMMsgtqStatus status = stati[idx-1] ;
@@ -833,7 +833,7 @@ void KMFilterActionSetqStatus::argsFromString( const TQString argsStr )
const TQString KMFilterActionSetqStatus::argsAsString() const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
if ( idx < 1 ) return TQString();
KMMsgtqStatus status = stati[idx-1];
@@ -843,7 +843,7 @@ const TQString KMFilterActionSetqStatus::argsAsString() const
const TQString KMFilterActionSetqStatus::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -901,7 +901,7 @@ KMFilterActionFakeDisposition::KMFilterActionFakeDisposition()
KMFilterAction::ReturnCode KMFilterActionFakeDisposition::process(KMMessage* msg) const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
if ( idx < 1 ) return ErrorButGoOn;
if ( idx == 1 ) // ignore
@@ -929,7 +929,7 @@ void KMFilterActionFakeDisposition::argsFromString( const TQString argsStr )
const TQString KMFilterActionFakeDisposition::argsAsString() const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
if ( idx < 1 ) return TQString();
return TQString( TQChar( idx < 2 ? 'I' : char(mdns[idx-2]) ) );
@@ -938,7 +938,7 @@ const TQString KMFilterActionFakeDisposition::argsAsString() const
const TQString KMFilterActionFakeDisposition::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -996,7 +996,7 @@ void KMFilterActionRemoveHeader::setParamWidgetValue( TQWidget* paramWidget ) co
TQComboBox * cb = dynamic_cast<TQComboBox*>(paramWidget);
Q_ASSERT( cb );
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
cb->clear();
cb->insertStringList( mParameterList );
if ( idx < 0 ) {
@@ -1074,7 +1074,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* tqparent ) const
void KMFilterActionAddHeader::setParamWidgetValue( TQWidget* paramWidget ) const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
TQComboBox *cb = (TQComboBox*)paramWidget->child("combo");
Q_ASSERT( cb );
cb->clear();
@@ -1123,7 +1123,7 @@ const TQString KMFilterActionAddHeader::argsAsString() const
const TQString KMFilterActionAddHeader::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -1139,7 +1139,7 @@ void KMFilterActionAddHeader::argsFromString( const TQString argsStr )
mValue = l[1];
}
- int idx = mParameterList.findIndex( s );
+ int idx = mParameterList.tqfindIndex( s );
if ( idx < 0 ) {
mParameterList.append( s );
idx = mParameterList.count() - 1;
@@ -1233,7 +1233,7 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) c
void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) const
{
- int idx = mParameterList.findIndex( mParameter );
+ int idx = mParameterList.tqfindIndex( mParameter );
TQComboBox *cb = (TQComboBox*)paramWidget->child("combo");
Q_ASSERT( cb );
@@ -1299,7 +1299,7 @@ const TQString KMFilterActionRewriteHeader::argsAsString() const
const TQString KMFilterActionRewriteHeader::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -1312,7 +1312,7 @@ void KMFilterActionRewriteHeader::argsFromString( const TQString argsStr )
mRegExp.setPattern( l[1] );
mReplacementString = l[2];
- int idx = mParameterList.findIndex( s );
+ int idx = mParameterList.tqfindIndex( s );
if ( idx < 0 ) {
mParameterList.append( s );
idx = mParameterList.count() - 1;
@@ -1617,9 +1617,9 @@ const TQString KMFilterActionForward::argsAsString() const
const TQString KMFilterActionForward::displayString() const
{
if ( mTemplate.isEmpty() )
- return i18n( "Forward to %1 with default template " ).arg( mParameter );
+ return i18n( "Forward to %1 with default template " ).tqarg( mParameter );
else
- return i18n( "Forward to %1 with template %2" ).arg( mParameter, mTemplate );
+ return i18n( "Forward to %1 with template %2" ).tqarg( mParameter, mTemplate );
}
//=============================================================================
@@ -1732,7 +1732,7 @@ class PipeJob : public KPIM::ThreadWeaver::Job
if (! fgets( buffer, len, p ) ) break;
int oldsize = ba.size();
ba.resize( oldsize + strlen(buffer) );
- qmemmove( ba.begin() + oldsize, buffer, strlen(buffer) );
+ tqmemmove( ba.begin() + oldsize, buffer, strlen(buffer) );
}
pclose(p);
if ( !ba.isEmpty() ) {
@@ -1878,7 +1878,7 @@ const TQString KMFilterActionWithTest::argsAsString() const
const TQString KMFilterActionWithTest::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
@@ -1955,7 +1955,7 @@ const TQString KMFilterActionWithUrl::argsAsString() const
const TQString KMFilterActionWithUrl::displayString() const
{
// FIXME after string freeze:
- // return i18n("").arg( );
+ // return i18n("").tqarg( );
return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\"";
}
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index a83b6eec6..02abff7bf 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -185,11 +185,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* tqparent, const char* name, bool popFilter, b
vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop );
}
else {
- TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Vertical, i18n("Filter Actions"), page1 );
+ TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Qt::Vertical, i18n("Filter Actions"), page1 );
mActionLister = new KMFilterActionWidgetLister( agb );
vbl->addWidget( agb, 0, TQt::AlignTop );
- mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Vertical,
+ mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Qt::Vertical,
i18n("Advanced Options"), page2);
{
TQWidget *adv_w = new TQWidget( mAdvOptsGroup );
@@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList()
TQCheckListItem *listItem =
new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox );
listItem->setText( 1, a->type() );
- listItem->setText( 2, TQString( "%1" ).arg( a->id() ) );
+ listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) );
if ( mFilter )
listItem->setOn( mFilter->applyOnAccount( a->id() ) );
top = listItem;
@@ -578,7 +578,7 @@ void KMFilterDlg::slotUpdateAccountList()
//=============================================================================
KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *tqparent, const char* name, bool popFilter )
- : TQGroupBox( 1, Horizontal, title, tqparent, name ),
+ : TQGroupBox( 1, Qt::Horizontal, title, tqparent, name ),
bPopFilter(popFilter)
{
mFilterList.setAutoDelete( true );
@@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field,
KMFilter *newFilter = new KMFilter(0, bPopFilter);
newFilter->pattern()->append( newRule );
- newFilter->pattern()->setName( TQString("<%1>:%2").arg( field ).arg( value) );
+ newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) );
KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"];
if ( desc )
@@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName()
if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) {
// auto-naming of patterns
if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() )
- shouldBeName = TQString( "<%1>: %2" ).arg( p->first()->field() ).arg( p->first()->contents() );
+ shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) );
else
shouldBeName = "<" + i18n("unnamed") + ">";
p->setName( shouldBeName );
@@ -946,7 +946,7 @@ void KMFilterListBox::slotRename()
(
i18n("Rename Filter"),
i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)")
- .arg( filter->pattern()->name() ) /*label*/,
+ .tqarg( filter->pattern()->name() ) /*label*/,
filter->pattern()->name() /* initial value */,
&okPressed, tqtopLevelWidget(), 0, validator
);
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 307823c96..a1b53aee7 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName,
dirinfo.setFile( mStorage->location() );
if ( !dirinfo.exists() ) {
int rc = mStorage->create();
- TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").arg(aFolderName).arg(strerror(rc));
+ TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").tqarg(aFolderName).tqarg(strerror(rc));
if ( rc ) {
KMessageBox::information(0, msg);
}
@@ -272,7 +272,7 @@ KMFolderDir* KMFolder::createChildFolder()
{
if (mkdir(TQFile::encodeName(childDir), S_IRWXU) != 0
&& chmod(TQFile::encodeName(childDir), S_IRWXU) != 0) {
- TQString wmsg = TQString(" '%1': %2").arg(childDir).arg(strerror(errno));
+ TQString wmsg = TQString(" '%1': %2").tqarg(childDir).tqarg(strerror(errno));
KMessageBox::information(0,i18n("Failed to create folder") + wmsg);
return 0;
}
@@ -929,7 +929,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message )
}
}
if ( !delimiter.isEmpty() && folderName.tqfind( delimiter ) != -1 ) {
- message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter );
+ message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter );
return false;
}
}
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index f0b3f0cec..94bd09b20 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName )
KMessageBox::error( 0,
i18n( "The UID cache file for folder %1 could not be read. There "
"could be a problem with file system permission, or it is corrupted."
- ).arg( folder->prettyURL() ) );
+ ).tqarg( folder->prettyURL() ) );
// try to unlink it, in case it was corruped. If it couldn't be read
// because of permissions, this will fail, which is fine
unlink( TQFile::encodeName( uidCacheLocation() ) );
@@ -442,14 +442,14 @@ int KMFolderCachedImap::readUidCache()
if( cacheVersion == UIDCACHE_VERSION ) {
len = uidcache.readLine( buf, sizeof(buf) );
if( len > 0 ) {
- setUidValidity( TQString::fromLocal8Bit(buf).stripWhiteSpace() );
+ setUidValidity( TQString(TQString::fromLocal8Bit(buf)).stripWhiteSpace() );
len = uidcache.readLine( buf, sizeof(buf) );
if( len > 0 ) {
#if MAIL_LOSS_DEBUGGING
kdDebug(5006) << "Reading in last uid from cache: " << TQString::fromLocal8Bit(buf).stripWhiteSpace() << " in " << folder()->prettyURL() << endl;
#endif
// load the last known highest uid from the on disk cache
- setLastUid( TQString::fromLocal8Bit(buf).stripWhiteSpace().toULong() );
+ setLastUid( TQString(TQString::fromLocal8Bit(buf)).stripWhiteSpace().toULong() );
return 0;
}
}
@@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache()
}
KMessageBox::error( 0,
i18n( "The UID cache file for folder %1 could not be written. There "
- "could be a problem with file system permission." ).arg( folder()->prettyURL() ) );
+ "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) );
return -1;
}
@@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot()
TQString str = i18n("Are you sure you want to refresh the IMAP cache of "
"the folder %1 and all its subfolders?\nThis will "
"remove all changes you have done locally to your "
- "folders.").arg( label() );
+ "folders.").tqarg( label() );
TQString s1 = i18n("Refresh IMAP Cache");
TQString s2 = i18n("&Refresh");
if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) ==
@@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot()
void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly )
{
if( mSyncState != SYNC_STATE_INITIAL ) {
- if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
+ if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
mSyncState = SYNC_STATE_INITIAL;
} else return;
}
@@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal()
// Cancelled by user, or slave can't start
// kdDebug(5006) << "makeConnection said Error, aborting." << endl;
// We stop here. We're already in SYNC_STATE_INITIAL for the next time.
- newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) );
+ newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) );
close("cachedimap");
emit folderComplete(this, false);
break;
} else if ( cs == ImapAccountBase::Connecting ) {
mAccount->setAnnotationCheckPassed( false );
// kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl;
- newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) );
+ newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) );
// We'll wait for the connectionResult signal from the account.
connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
@@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages()
&& !(mUserRights & KMail::ACLJobs::Insert) ) {
// write access revoked
KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, "
- "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ),
+ "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ),
i18n("Acces rights revoked"), "KMailACLRevocationNotification" );
}
}
@@ -1511,7 +1511,7 @@ void KMFolderCachedImap::uploadFlags()
if( !msg || msg->UID() == 0 )
// Either not a valid message or not one that is on the server yet
continue;
- if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+ if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
&& !mStatusChangedLocally ) {
// This message has not had its status changed locally
continue;
@@ -1559,7 +1559,7 @@ void KMFolderCachedImap::uploadSeenFlags()
// Either not a valid message or not one that is on the server yet
continue;
- if ( mUIDsOfLocallyChangedStatuses.tqfind( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
+ if ( mUIDsOfLocallyChangedStatuses.find( msg->UID() ) == mUIDsOfLocallyChangedStatuses.end()
&& !mStatusChangedLocally ) {
// This message has not had its status changed locally
continue;
@@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages()
if ( KMessageBox::warningYesNo(
0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
"Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
- .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
+ .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes )
#endif
removeMsg( msgsForDeletion );
}
@@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces()
mNamespacesToList.pop_front();
mSyncState = SYNC_STATE_LIST_SUBFOLDERS2;
- newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns));
+ newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns));
KMail::ListJob* job = new KMail::ListJob( mAccount, type, this,
mAccount->addPathToNamespace( ns ) );
job->setNamespace( ns );
@@ -2184,7 +2184,7 @@ void KMFolderCachedImap::slotListResult( const TQStringList& folderNames,
if (!node->isDir() ) {
KMFolderCachedImap *f = static_cast<KMFolderCachedImap*>(static_cast<KMFolder*>(node)->storage());
- if ( mSubfolderNames.findIndex(node->name()) == -1 ) {
+ if ( mSubfolderNames.tqfindIndex(node->name()) == -1 ) {
TQString name = node->name();
// as more than one namespace can be listed in the root folder we need to make sure
// that the folder is within the current namespace
@@ -2207,7 +2207,7 @@ void KMFolderCachedImap::slotListResult( const TQStringList& folderNames,
/**
* Store the folder attributes for every subfolder.
*/
- int index = mSubfolderNames.findIndex( node->name() );
+ int index = mSubfolderNames.tqfindIndex( node->name() );
f->mFolderAttributes = folderAttributes[ index ];
}
} else {
@@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2()
// (could be that the folder was deleted & recreated meanwhile from another client...)
if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) {
locallyDeleted = KMessageBox::warningYesNo(
- 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
+ 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes;
}
if ( locallyDeleted ) {
@@ -2618,7 +2618,7 @@ void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
if ( mAccount->imapFolder() == this )
str = synctqStatus;
else
- str = TQString( "%1: %2" ).arg( label() ).arg( synctqStatus );
+ str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus );
if( progressItem )
progressItem->setqStatus( str );
emit statusMsg( str );
@@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job )
// that's when the imap server doesn't support annotations
if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
&& (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
- KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) );
+ KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) );
mAccount->setHasNoAnnotationSupport();
}
else
@@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
// that's when the imap server doesn't support annotations
if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML
&& (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() )
- KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) );
+ KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) );
mAccount->setHasNoAnnotationSupport();
}
else
@@ -2856,7 +2856,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job )
if ( dot != -1 ) type.truncate( dot );
type = type.simplifyWhiteSpace();
- const int idx = mSubfolderPaths.findIndex( folderPath );
+ const int idx = mSubfolderPaths.tqfindIndex( folderPath );
const bool isNoContent = mSubfolderMimeTypes[idx] == "inode/directory";
if ( ( isNoContent && type.isEmpty() )
|| ( !type.isEmpty() && type != KMailICalIfaceImpl::annotationForContentsType( ContentsTypeMail ) ) ) {
@@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
bool manualMove = true;
while ( GlobalSettings::autoLostFoundMove() ) {
// find the inbox of this account
- KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) );
+ KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) );
if ( !inboxFolder ) {
kdWarning(5006) << k_funcinfo << "inbox not found!" << endl;
break;
@@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
"on the server or you do not "
"have sufficient access rights on the folder to upload them.</p>"
"<p>All affected messages will therefore be moved to <b>%2</b> "
- "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ),
+ "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ),
i18n("Insufficient access rights") );
manualMove = false;
break;
@@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
"have sufficient access rights on the folder now to upload them. "
"Please contact your administrator to allow upload of new messages "
"to you, or move them out of this folder.</p> "
- "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) );
+ "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) );
if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) {
KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(),
i18n("Move Messages to Folder"), true );
diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp
index 1135b25b7..e85144f0a 100644
--- a/kmail/kmfoldercombobox.cpp
+++ b/kmail/kmfoldercombobox.cpp
@@ -114,9 +114,9 @@ void KMFolderComboBox::setFolder( KMFolder *aFolder )
TQValueList<TQGuardedPtr<KMFolder> > folders;
createFolderList( &names, &folders );
- int idx = folders.findIndex( aFolder );
+ int idx = folders.tqfindIndex( aFolder );
if (idx == -1)
- idx = folders.findIndex( kmkernel->draftsFolder() );
+ idx = folders.tqfindIndex( kmkernel->draftsFolder() );
setCurrentItem( idx >= 0 ? idx : 0 );
mFolder = aFolder;
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 1f6019b00..f6edcaf1b 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -206,7 +206,7 @@ bool KMFolderDir::reload(void)
if (!dir.cd(fldPath, TRUE))
{
- TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath);
+ TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").tqarg(fldPath);
KMessageBox::information(0, msg);
return FALSE;
}
@@ -214,7 +214,7 @@ bool KMFolderDir::reload(void)
TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList();
if (!fiList)
{
- TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath);
+ TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").tqarg(fldPath);
KMessageBox::information(0, msg);
return FALSE;
}
@@ -258,7 +258,7 @@ bool KMFolderDir::reload(void)
// For this to be a cached IMAP folder, it must be in the KMail dimap
// subdir and must be have a uidcache file or be a maildir folder
TQString maildir(fname + "/new");
- TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").arg(fname);
+ TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").tqarg(fname);
if ( dir.exists( imapcachefile) || dir.exists( maildir ) )
{
folder = new KMFolder( this, fname, KMFolderTypeCachedImap );
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 28ba493c2..38e025bc4 100644
--- a/kmail/kmfolderimap.cpp
+++ b/kmail/kmfolderimap.cpp
@@ -245,7 +245,7 @@ void KMFolderImap::remove()
jd.progressItem = ProgressManager::createProgressItem(
"ImapFolderRemove" + ProgressManager::getUniqueID(),
i18n("Removing folder"),
- i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+ i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
false,
account()->useSSL() || account()->useTLS() );
account()->insertJob(job, jd);
@@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex
mAddMessageProgressItem = ProgressManager::createProgressItem(
"Uploading"+ProgressManager::getUniqueID(),
i18n("Uploading message data"),
- i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+ i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
true,
account()->useSSL() || account()->useTLS() );
mAddMessageProgressItem->setTotalItems( msgList.count() );
@@ -544,8 +544,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList)
TQPtrList<KMMessage> KMFolderImap::splitMessageList(const TQString& set,
TQPtrList<KMMessage>& msgList)
{
- int lastcomma = set.findRev(",");
- int lastdub = set.findRev(":");
+ int lastcomma = set.tqfindRev(",");
+ int lastdub = set.tqfindRev(":");
int last = 0;
if (lastdub > lastcomma) last = lastdub;
else last = lastcomma;
@@ -946,7 +946,7 @@ void KMFolderImap::checkFolders( const TQStringList& subfolderNames,
KMFolderNode *node = folder()->child()->first();
while ( node )
{
- if ( !node->isDir() && subfolderNames.findIndex(node->name()) == -1 )
+ if ( !node->isDir() && subfolderNames.tqfindIndex(node->name()) == -1 )
{
KMFolder* fld = static_cast<KMFolder*>(node);
KMFolderImap* imapFld = static_cast<KMFolderImap*>( fld->storage() );
@@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
if (job->error())
{
account()->handleJobError( job,
- i18n("Error while listing the contents of the folder %1.").arg( label() ) );
+ i18n("Error while listing the contents of the folder %1.").tqarg( label() ) );
account()->removeJob(it);
finishMailCheck( "listfolder", imapNoInformation );
return;
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 635afae52..d41f6bca1 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv)
"The mail index for '%1' is from an unknown version of KMail (%2).\n"
"This index can be regenerated from your mail folder, but some "
"information, including status flags, may be lost. Do you wish "
- "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
+ "to downgrade your index file?") .tqarg(name()) .tqarg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") );
kapp->restoreOverrideCursor();
if (r == KMessageBox::Yes)
createIndexFromContents();
@@ -527,7 +527,7 @@ void KMFolderIndex::recreateIndex( bool readIndexAfterwards )
kapp->setOverrideCursor(KCursor::arrowCursor());
KMessageBox::information(0,
i18n("The mail index for '%1' is corrupted and will be regenerated now, "
- "but some information, like status flags, might get lost.").arg(name()));
+ "but some information, like status flags, might get lost.").tqarg(name()));
kapp->restoreOverrideCursor();
createIndexFromContents();
if ( readIndexAfterwards ) {
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index ace5a6ddc..684af395d 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess()
KCursorSaver idle(KBusyPtr::idle());
if ( nRetVal == ENOENT )
KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.")
- .arg(sBadFolderName));
+ .tqarg(sBadFolderName));
else
KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid "
"maildir folder, or you do not have sufficient access permissions.")
- .arg(sBadFolderName));
+ .tqarg(sBadFolderName));
return nRetVal;
}
@@ -122,7 +122,7 @@ int KMFolderMaildir::open(const char *)
TQString str;
mIndexStream = 0;
str = i18n("Folder `%1' changed; recreating index.")
- .arg(name());
+ .tqarg(name());
emit statusMsg(str);
} else {
mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file
@@ -605,7 +605,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
// open the file and get a pointer to it
TQFile f(file);
if ( f.open( IO_ReadOnly ) == false ) {
- kdWarning(5006) << "The file '" << TQFile::encodeName(dir) << "/" << file
+ kdWarning(5006) << "The file '" << TQString(TQFile::encodeName(dir)) << "/" << file
<< "' could not be opened for reading the message. "
"Please check ownership and permissions."
<< endl;
@@ -652,7 +652,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
referencesStr = referencesStr.stripWhiteSpace();
if( !referencesStr.isEmpty() ) {
int leftAngle, rightAngle;
- leftAngle = referencesStr.findRev( '<' );
+ leftAngle = referencesStr.tqfindRev( '<' );
if( ( leftAngle != -1 )
&& ( replyToIdStr.isEmpty() || ( replyToIdStr[0] != '<' ) ) ) {
// use the last reference, instead of missing In-Reply-To
@@ -660,10 +660,10 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
}
// find second last reference
- leftAngle = referencesStr.findRev( '<', leftAngle - 1 );
+ leftAngle = referencesStr.tqfindRev( '<', leftAngle - 1 );
if( leftAngle != -1 )
referencesStr = referencesStr.mid( leftAngle );
- rightAngle = referencesStr.findRev( '>' );
+ rightAngle = referencesStr.tqfindRev( '>' );
if( rightAngle != -1 )
referencesStr.truncate( rightAngle + 1 );
@@ -729,7 +729,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
dateStr = dateStr.stripWhiteSpace();
if (!dateStr.isEmpty())
- mi->setDate(dateStr);
+ mi->setDate(dateStr.data());
if ( !uidStr.isEmpty() )
mi->setUID( uidStr.toULong() );
mi->setDirty(false);
@@ -1046,7 +1046,7 @@ TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
if (!suffix_regex)
suffix_regex_sd.setObject(suffix_regex, new TQRegExp(":2,?R?S?$"));
- aFileName.truncate(aFileName.findRev(*suffix_regex));
+ aFileName.truncate(aFileName.tqfindRev(*suffix_regex));
// only add status suffix if the message is neither new nor unread
if (! ((status & KMMsgStatusNew) || (status & KMMsgStatusUnread)) )
@@ -1123,7 +1123,7 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const
item = new KFileItem( S_IFDIR, -1, location() + "/tmp" );
list.append( item );
s_DirSizeJobQueue.append(
- qMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
+ tqMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) );
// if there's only one entry in the queue then we can start
// a dirSizeJob right away
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 287ce5766..b9bbd1a67 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner)
if (!mStream)
{
KNotifyClient::event( 0, "warning",
- i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno)));
+ i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno)));
kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl;
mOpenCount = 0;
return errno;
@@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner)
"of KMail</a> for "
"information about how to prevent this "
"problem from happening again.</p></qt>")
- .arg("help:/kmail/faq.html#faq-index-regeneration")
- .arg(name());
+ .tqarg("help:/kmail/faq.html#faq-index-regeneration")
+ .tqarg(name());
// When KMail is starting up we have to show a non-blocking message
// box so that the initialization can continue. We don't show a
// queued message box when KMail isn't starting up because queued
@@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner)
TQString str;
mIndexStream = 0;
str = i18n("Folder `%1' changed. Recreating index.")
- .arg(name());
+ .tqarg(name());
emit statusMsg(str);
} else {
mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file
@@ -297,7 +297,7 @@ void KMFolderMbox::sync()
if (mOpenCount > 0)
if (!mStream || fsync(fileno(mStream)) ||
!mIndexStream || fsync(fileno(mIndexStream))) {
- kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
+ kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug.")));
}
}
@@ -625,7 +625,7 @@ int KMFolderMbox::createIndexFromContents()
referencesStr = referencesStr.stripWhiteSpace();
if( !referencesStr.isEmpty() ) {
int leftAngle, rightAngle;
- leftAngle = referencesStr.findRev( '<' );
+ leftAngle = referencesStr.tqfindRev( '<' );
if( ( leftAngle != -1 )
&& ( replyToIdStr.isEmpty() || ( replyToIdStr[0] != '<' ) ) ) {
// use the last reference, instead of missing In-Reply-To
@@ -633,10 +633,10 @@ int KMFolderMbox::createIndexFromContents()
}
// find second last reference
- leftAngle = referencesStr.findRev( '<', leftAngle - 1 );
+ leftAngle = referencesStr.tqfindRev( '<', leftAngle - 1 );
if( leftAngle != -1 )
referencesStr = referencesStr.mid( leftAngle );
- rightAngle = referencesStr.findRev( '>' );
+ rightAngle = referencesStr.tqfindRev( '>' );
if( rightAngle != -1 )
referencesStr.truncate( rightAngle + 1 );
@@ -683,7 +683,7 @@ int KMFolderMbox::createIndexFromContents()
KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid );
mi->setqStatus(status, xstatus);
- mi->setDate( dateStr.stripWhiteSpace() );
+ mi->setDate( dateStr.stripWhiteSpace().data() );
mi->setDirty(false);
mMsgList.append(mi, mExportsSernums );
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 3d42a2d38..a37f9136d 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -146,7 +146,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
if ( !info.isDir() ) {
KMessageBox::sorry(0, i18n("'%1' does not appear to be a folder.\n"
"Please move the file out of the way.")
- .arg( mBasePath ) );
+ .tqarg( mBasePath ) );
::exit(-1);
}
if ( !info.isReadable() || !info.isWritable() ) {
@@ -154,7 +154,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
"incorrect;\n"
"please make sure that you can view and modify "
"the content of this folder.")
- .arg( mBasePath ) );
+ .tqarg( mBasePath ) );
::exit(-1);
}
} else {
@@ -163,7 +163,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath)
KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n"
"please make sure that you can view and "
"modify the content of the folder '%2'.")
- .arg( mBasePath ).arg( TQDir::homeDirPath() ) );
+ .tqarg( mBasePath ).tqarg( TQDir::homeDirPath() ) );
::exit(-1);
}
}
@@ -326,7 +326,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr,
folder = createFolder(aFolderName, sysFldr, type);
if (!folder) {
- KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(aFolderName).arg(mBasePath)));
+ KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(aFolderName).tqarg(mBasePath)));
exit(-1);
}
if ( id > 0 )
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 5ebc8b2c4..fa36bde51 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -452,7 +452,7 @@ void KMFolderSearch::addSerNum(TQ_UINT32 serNum)
<< ": folder is " << aFolder << ", index is " << idx << endl;
return;
}
- if(mFolders.findIndex(aFolder) == -1) {
+ if(mFolders.tqfindIndex(aFolder) == -1) {
aFolder->open("foldersearch");
mFolders.append(aFolder);
}
@@ -856,7 +856,7 @@ bool KMFolderSearch::readIndex()
return false;
}
mSerNums.push_back(serNum);
- if(mFolders.findIndex(folder) == -1) {
+ if(mFolders.tqfindIndex(folder) == -1) {
if (mInvalid) //exceptional case for when folder has invalid ids
return false;
folder->open("foldersearch");
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index edd641cc9..c8bde2b63 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -918,7 +918,7 @@ bool KMFolderTree::checkUnreadFolder (KMFolderTreeItem* fti, bool confirm)
// parameter (kept in the config file for kmail)
if ( KMessageBox::questionYesNo( this,
i18n( "<qt>Go to the next unread message in folder <b>%1</b>?</qt>" )
- .arg( fti->folder()->label() ),
+ .tqarg( fti->folder()->label() ),
i18n( "Go to Next Unread Message" ),
i18n("Go To"), i18n("Do Not Go To"), // defaults
"AskNextFolder",
@@ -1115,13 +1115,13 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
// copy folder
TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu );
+ folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu );
folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu );
if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() )
{
TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu );
- folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu );
+ folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu );
folderMenu->insertItem( i18n("&Move Folder To"), moveMenu );
}
@@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me)
}
// react on middle-button only
- if (btn != TQt::MidButton) {
+ if (btn != Qt::MidButton) {
KFolderTree::contentsMouseReleaseEvent(me);
return;
}
@@ -1280,7 +1280,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * tqparent )
const TQString message = i18n( "<qt>Cannot create folder under <b>%1</b> because of insufficient "
"permissions on the server. If you think you should be able to create "
"subfolders here, ask your administrator to grant you rights to do so."
- "</qt> " ).arg(aFolder->label());
+ "</qt> " ).tqarg(aFolder->label());
KMessageBox::error( this, message );
return;
}
@@ -1753,10 +1753,10 @@ void KMFolderTree::slotToggleSizeColumn()
bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
- static_cast<TQMouseEvent*>(e)->button() == RightButton &&
+ TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
- mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
+ mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
return true;
}
return KFolderTree::eventFilter(o, e);
@@ -1851,7 +1851,7 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver,
{
while ( menu->count() )
{
- TQPopupMenu *popup = menu->findItem( menu->idAt( 0 ) )->popup();
+ TQPopupMenu *popup = menu->tqfindItem( menu->idAt( 0 ) )->popup();
if ( popup )
delete popup;
else
@@ -1987,7 +1987,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
if ( tqparent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.tqcontains( sourceFolderName ) ) {
KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>")
- .arg( sourceFolderName ) );
+ .tqarg( sourceFolderName ) );
setDragEnabled( true );
return;
}
@@ -1998,7 +1998,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
while ( f ) {
if ( f->moveInProgress() ) {
KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied itself.</qt>")
- .arg( sourceFolderName ) );
+ .tqarg( sourceFolderName ) );
setDragEnabled( true );
return;
}
@@ -2016,7 +2016,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
while ( folderDir && ( folderDir != &kmkernel->folderMgr()->dir() ) &&
( folderDir != source->tqparent() ) )
{
- if ( folderDir->findRef( source ) != -1 )
+ if ( folderDir->tqfindRef( source ) != -1 )
{
KMessageBox::error( this, message );
setDragEnabled( true );
@@ -2051,7 +2051,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source
continue;
KMFolderDir *childDir = (*it2)->tqparent();
do {
- if ( tqparentDir == childDir || tqparentDir->findRef( childDir->owner() ) != -1 ) {
+ if ( tqparentDir == childDir || tqparentDir->tqfindRef( childDir->owner() ) != -1 ) {
KMessageBox::error( this, i18n("Moving the selected folders is not possible") );
setDragEnabled( true );
return;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index f20ceb994..fc282fec3 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -144,7 +144,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *tqparent,
connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int)));
setShowSortIndicator(true);
- setFocusPolicy( WheelFocus );
+ setFocusPolicy( Qt::WheelFocus );
if (!pixmapsLoaded)
{
@@ -236,7 +236,7 @@ KMHeaders::~KMHeaders ()
bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
- static_cast<TQMouseEvent*>(e)->button() == RightButton &&
+ TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton &&
o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
// if we currently only show one of either sender/receiver column
@@ -249,7 +249,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
else
mPopup->changeItem(KPaintInfo::COL_RECEIVER, i18n("Receiver"));
- mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
+ mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() );
return true;
}
return KListView::eventFilter(o, e);
@@ -429,10 +429,10 @@ void KMHeaders::readColorConfig (void)
KConfig* config = KMKernel::config();
// Custom/System colors
KConfigGroupSaver saver(config, "Reader");
- TQColor c1=TQColor(kapp->palette().active().text());
+ TQColor c1=TQColor(kapp->tqpalette().active().text());
TQColor c2=TQColor("red");
TQColor c3=TQColor("blue");
- TQColor c4=TQColor(kapp->palette().active().base());
+ TQColor c4=TQColor(kapp->tqpalette().active().base());
TQColor c5=TQColor(0,0x7F,0);
TQColor c6=TQColor(0,0x98,0);
TQColor c7=KGlobalSettings::alternateBackgroundColor();
@@ -1163,11 +1163,11 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
}
if ((!tqparent || sci->isImperfectlyThreaded())
- && !mImperfectlyThreadedList.containsRef(item))
+ && !mImperfectlyThreadedList.tqcontainsRef(item))
mImperfectlyThreadedList.append(item);
if (tqparent && !sci->isImperfectlyThreaded()
- && mImperfectlyThreadedList.containsRef(item))
+ && mImperfectlyThreadedList.tqcontainsRef(item))
mImperfectlyThreadedList.removeRef(item);
}
}
@@ -1178,7 +1178,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId )
mImperfectlyThreadedList.removeRef( removedItem );
#ifdef DEBUG
// This should never happen, in this case the folders are inconsistent.
- while ( mImperfectlyThreadedList.findRef( removedItem ) != -1 ) {
+ while ( mImperfectlyThreadedList.tqfindRef( removedItem ) != -1 ) {
mImperfectlyThreadedList.remove();
kdDebug(5006) << "Remove doubled item from mImperfectlyThreadedList: " << removedItem << endl;
}
@@ -1371,10 +1371,10 @@ void KMHeaders::setStyleDependantFrameWidth()
{
// set the width of the frame to a reasonable value for the current GUI style
int frameWidth;
- if( style().isA("KeramikStyle") )
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+ if( tqstyle().isA("KeramikStyle") )
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
else
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
if ( frameWidth < 0 )
frameWidth = 0;
if ( frameWidth != lineWidth() )
@@ -1399,10 +1399,10 @@ void KMHeaders::setFolderInfotqStatus ()
else
str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" );
const int count = mFolder->count();
- str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str )
+ str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str )
: i18n( "0 messages" ); // no need for "0 unread" to be added here
if ( mFolder->isReadOnly() )
- str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str );
+ str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str );
BroadcastqStatus::instance()->seStatusMsg(str);
}
@@ -1451,7 +1451,7 @@ void KMHeaders::applyFiltersOnMsg()
if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
progressItem->updateProgress();
TQString statusMsg = i18n("Filtering message %1 of %2");
- statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+ statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
}
@@ -2333,12 +2333,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
if ( e->state() & ControlButton )
setSelected( lvi, !wasSelected );
- if ((e->button() == LeftButton) )
+ if ((e->button() == Qt::LeftButton) )
mMousePressed = true;
}
// check if we are on a status column and toggle it
- if ( lvi && e->button() == LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) {
+ if ( lvi && e->button() == Qt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) {
bool flagsToggleable = GlobalSettings::self()->allowLocalFlags() || !(mFolder ? mFolder->isReadOnly() : true);
int section = header()->sectionAt( e->pos().x() );
HeaderItem *item = static_cast<HeaderItem*>( lvi );
@@ -2366,7 +2366,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e)
//-----------------------------------------------------------------------------
void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e)
{
- if (e->button() != RightButton)
+ if (e->button() != Qt::RightButton)
KListView::contentsMouseReleaseEvent(e);
mMousePressed = false;
@@ -2465,7 +2465,7 @@ void KMHeaders::slotRMB()
menu->insertSeparator();
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
&mMenuToFolder, msgCopyMenu );
menu->insertItem(i18n("&Copy To"), msgCopyMenu);
@@ -2474,7 +2474,7 @@ void KMHeaders::slotRMB()
menu->setItemEnabled( id, false );
} else {
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
- mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
+ mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
&mMenuToFolder, msgMoveMenu );
menu->insertItem(i18n("&Move To"), msgMoveMenu);
}
@@ -2815,7 +2815,7 @@ bool KMHeaders::writeSortOrder()
unlink(TQFile::encodeName(sortFile));
kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
- kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile ));
+ kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
}
fclose(sortStream);
::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile));
@@ -2855,7 +2855,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi)
unlink(TQFile::encodeName(sortFile));
kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl;
kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl;
- kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").arg( sortFile ));
+ kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile ));
}
fclose(sortStream);
} else {
@@ -3557,7 +3557,7 @@ void KMHeaders::cutMessages()
void KMHeaders::pasteMessages()
{
- new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this );
+ new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) );
if ( mMoveMessages ) {
mCopiedMessages.clear();
updateActions();
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 0eb1a1166..1d302c261 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -207,7 +207,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
// process args:
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- if (args->getOption("subject"))
+ if (!args->getOption("subject").isNull())
{
subj = TQString::fromLocal8Bit(args->getOption("subject"));
// if kmail is called with 'kmail -session abc' then this doesn't mean
@@ -225,25 +225,25 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
mailto = true;
}
- if (args->getOption("cc"))
+ if (!args->getOption("cc").isNull())
{
mailto = true;
cc = TQString::fromLocal8Bit(args->getOption("cc"));
}
- if (args->getOption("bcc"))
+ if (!args->getOption("bcc").isNull())
{
mailto = true;
bcc = TQString::fromLocal8Bit(args->getOption("bcc"));
}
- if (args->getOption("msg"))
+ if (!args->getOption("msg").isNull())
{
mailto = true;
messageFile.setPath( TQString::fromLocal8Bit(args->getOption("msg")) );
}
- if (args->getOption("body"))
+ if (!args->getOption("body").isNull())
{
mailto = true;
body = TQString::fromLocal8Bit(args->getOption("body"));
@@ -266,7 +266,7 @@ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
if (args->isSet("check"))
checkMail = true;
- if ( args->getOption( "view" ) ) {
+ if ( !args->getOption( "view" ).isNull() ) {
viewOnly = true;
const TQString filename =
TQString::fromLocal8Bit( args->getOption( "view" ) );
@@ -404,7 +404,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc,
if (!messageFile.isEmpty() && messageFile.isLocalFile()) {
TQCString str = KPIM::kFileToString( messageFile.path(), true, false );
if( !str.isEmpty() ) {
- msg->setBody( TQString::fromLocal8Bit( str ).utf8() );
+ msg->setBody( TQString(TQString::fromLocal8Bit( str )).utf8() );
} else {
TemplateParser parser( msg, TemplateParser::NewMessage );
parser.process( NULL, NULL );
@@ -937,7 +937,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl,
msgId += msg->dateStr();
}
- int k = mAddMessageMsgIds.findIndex( msgId );
+ int k = mAddMessageMsgIds.tqfindIndex( msgId );
//fprintf(stderr,"tqfind %s = %d\n",(const char *) msgId,k);
if ( k == -1 ) {
@@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber )
msg = folder->getMsgBase( idx );
if (msg) {
res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" )
- .arg( msg->subject() )
- .arg( msg->fromStrip() )
- .arg( msg->dateStr() ) );
+ .tqarg( msg->subject() )
+ .tqarg( msg->fromStrip() )
+ .tqarg( msg->dateStr() ) );
} else {
res.append( TQString( "Invalid serial number." ) );
}
@@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name)
KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n"
"please make sure that you can view and "
"modify the content of the folder '%2'.")
- .arg( foldersPath ).arg( TQDir::homeDirPath() ) );
+ .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) );
::exit(-1);
}
}
@@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name)
"incorrect;\n"
"please make sure that you can view and modify "
"the content of this folder.")
- .arg( foldersPath ) );
+ .tqarg( foldersPath ) );
::exit(-1);
}
}
@@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders()
cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()),
false, KMFolderTypeCachedImap)->storage());
if (!cfld) {
- KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath())));
+ KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath())));
exit(-1);
}
cfld->folder()->setId( acct->id() );
@@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
"the same name in <i>%7</i>.<p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
- .arg( kmailName, kmailName, kmailName )
- .arg( dir, destinationDir, dir, destinationDir );
+ .tqarg( kmailName, kmailName, kmailName )
+ .tqarg( dir, destinationDir, dir, destinationDir );
} else {
msg = i18n( "%1-%3 is the application name, %4-%6 are folder path",
"<qt>The <i>%4</i> folder exists. "
@@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir )
"this folder for you.<p>"
"<strong>Would you like %3 to move the mail "
"files now?</strong></qt>" )
- .arg( kmailName, kmailName, kmailName )
- .arg( dir, destinationDir, dir );
+ .tqarg( kmailName, kmailName, kmailName )
+ .tqarg( dir, destinationDir, dir );
}
TQString title = i18n( "Migrate Mail Files?" );
TQString buttonText = i18n( "Move" );
@@ -1968,7 +1968,7 @@ void KMKernel::dumpDeadLetters()
return;
for ( TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList) ; it.current() != 0; ++it ) {
- if ( KMail::Composer * win = ::qt_cast<KMail::Composer*>( it.current() ) ) {
+ if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) {
win->autoSaveMessage();
// saving the message has to be finished right here, we are called from a dtor,
// therefore we have no chance to finish this later
@@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job)
{
if (KMessageBox::warningContinueCancel(0,
i18n("File %1 exists.\nDo you want to replace it?")
- .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+ .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace"))
== KMessageBox::Continue)
byteArrayToRemoteFile((*it).data, (*it).url, true);
}
@@ -2108,7 +2108,7 @@ bool KMKernel::haveSystemTrayApplet()
bool KMKernel::registerSystemTrayApplet( const KSystemTray* applet )
{
- if ( systemTrayApplets.findIndex( applet ) == -1 ) {
+ if ( systemTrayApplets.tqfindIndex( applet ) == -1 ) {
systemTrayApplets.append( applet );
return true;
}
@@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason )
mesg = i18n("KMail encountered a fatal error and will terminate now");
} else {
mesg = i18n("KMail encountered a fatal error and will "
- "terminate now.\nThe error was:\n%1").arg( reason );
+ "terminate now.\nThe error was:\n%1").tqarg( reason );
}
kdWarning() << mesg << endl;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index de50cd782..86acaef78 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -132,7 +132,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event )
KIO::NetAccess::removeTempFile( fileName );
} else {
TQString caption( i18n( "vCard Import Failed" ) );
- TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() );
+ TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() );
KMessageBox::error( tqparentWidget(), text, caption );
}
}
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index e573af2a8..1311de1c9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -204,7 +204,7 @@ KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name,
activatePanners();
- TQTimer::singleShot( 0, this, TQT_SLOT( slotShowStartupFolder() ));
+ TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() ));
connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) );
@@ -252,7 +252,7 @@ KMMainWidget::KMMainWidget(TQWidget *tqparent, const char *name,
mVacationScriptIndicator->hide();
connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) );
if ( GlobalSettings::checkOutOfOfficeOnStartup() )
- TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckVacation()) );
+ TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) );
}
@@ -469,7 +469,7 @@ void KMMainWidget::readConfig(void)
bool check = config->readBoolEntry("checkmail-startup", false);
if (check)
// do it after building the kmmainwin, so that the progressdialog is available
- TQTimer::singleShot( 0, this, TQT_SLOT( slotCheckMail() ) );
+ TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) );
}
}
@@ -559,9 +559,9 @@ void KMMainWidget::createWidgets(void)
if ( mLongFolderList ) {
// superior splitter: folder tree vs. rest
// inferior splitter: headers vs. message vs. mime tree
- mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" );
+ mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" );
mPanner1->setOpaqueResize( opaqueResize );
- Qt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal;
+ Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal;
mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" );
mPanner2->setOpaqueResize( opaqueResize );
mPanner2->setChildrenCollapsible( false );
@@ -570,10 +570,10 @@ void KMMainWidget::createWidgets(void)
} else /* !mLongFolderList */ {
// superior splitter: ( folder tree + headers ) vs. message vs. mime
// inferior splitter: folder tree vs. headers
- mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" );
+ mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" );
mPanner1->setOpaqueResize( opaqueResize );
mPanner1->setChildrenCollapsible( false );
- mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" );
+ mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" );
mPanner2->setOpaqueResize( opaqueResize );
headerParent = mFolderViewParent = mPanner2;
mimeParent = messageParent = mPanner1;
@@ -606,7 +606,7 @@ void KMMainWidget::createWidgets(void)
mQuickSearchLine = new KListViewIndexedSearchLine( mSearchToolBar, mHeaders,
actionCollection(), "headers quick search line" );
#else
- mQuickSearchLine = new HeaderListQuickSearch( mSearchToolBar, mHeaders,
+ mQuickSearchLine = new HeaderListQuickSearch( mSearchToolBar, TQT_TQOBJECT(mHeaders),
actionCollection(), "headers quick search line" );
#endif
label->setBuddy( mQuickSearchLine );
@@ -632,7 +632,7 @@ void KMMainWidget::createWidgets(void)
mHeaders, TQT_SLOT(selectNextMessage()));
if (mReaderWindowActive) {
- mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 );
+ mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 );
if ( mMsgActions ) {
mMsgActions->setMessageView( mMsgView );
}
@@ -661,23 +661,23 @@ void KMMainWidget::createWidgets(void)
KAction *action;
- mMoveMsgToFolderAction = new KAction( i18n("Move Message to Folder"), Key_M, this,
+ mMoveMsgToFolderAction = new KAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this),
TQT_SLOT(slotMoveMsg()), actionCollection(),
"move_message_to_folder" );
mMoveMsgToFolderAction->plugAccel( actionCollection()->kaccel() );
- action = new KAction( i18n("Copy Message to Folder"), Key_C, this,
+ action = new KAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this),
TQT_SLOT(slotCopyMsg()), actionCollection(),
"copy_message_to_folder" );
action->plugAccel( actionCollection()->kaccel() );
- action = new KAction( i18n("Jump to Folder"), Key_J, this,
+ action = new KAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this),
TQT_SLOT(slotJumpToFolder()), actionCollection(),
"jump_to_folder" );
action->plugAccel( actionCollection()->kaccel() );
// create list of folders
- mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent );
+ mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent );
mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter );
if ( mFavoritesCheckMailAction )
@@ -714,7 +714,7 @@ void KMMainWidget::createWidgets(void)
//Commands not worthy of menu items, but that deserve configurable keybindings
mRemoveDuplicatesAction = new KAction(
- i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this,
+ i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this),
TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
action->plugAccel( actionCollection()->kaccel() );
@@ -724,32 +724,32 @@ void KMMainWidget::createWidgets(void)
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree,
+ i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree),
TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree,
+ i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree),
TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree,
+ i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree),
TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Focus on Next Message"), ALT+Key_Right, mHeaders,
+ i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders),
TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders,
+ i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders),
TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
action->plugAccel( actionCollection()->kaccel() );
action = new KAction(
- i18n("Select Message with Focus"), ALT+Key_Space, mHeaders,
+ i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders),
TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
action->plugAccel( actionCollection()->kaccel() );
@@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
summary += "<br>" + i18n( "1 new message in %1",
"%n new messages in %1",
newInFolder.tqfind( *it ).data() )
- .arg( folder->prettyURL() );
+ .tqarg( folder->prettyURL() );
}
}
}
@@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
if ( GlobalSettings::self()->verboseNewMailNotification() ) {
summary = i18n( "%1 is a list of the number of new messages per folder",
"<b>New mail arrived</b><br>%1" )
- .arg( summary );
+ .tqarg( summary );
}
else {
summary = i18n( "New mail arrived" );
@@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
KMFolder* folder = folderItem->folder();
KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
KMFolderDialog props( folder, folder->tqparent(), folderTree,
- i18n("Properties of Folder %1").arg( folder->label() ) );
+ i18n("Properties of Folder %1").tqarg( folder->label() ) );
props.exec();
updateFolderMenu();
//Kolab issue 2152
@@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder()
KConfigGroupSaver saver(config, "General");
if (config->readBoolEntry("warn-before-expire", true)) {
- str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() ));
+ str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape( mFolder->label() ));
if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"),
i18n("&Expire"))
!= KMessageBox::Continue) return;
@@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder()
TQString text = (isTrash) ?
i18n("Are you sure you want to empty the trash folder?") :
i18n("<qt>Are you sure you want to move all messages from "
- "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) );
+ "folder <b>%1</b> to the trash?</qt>").tqarg( TQStyleSheet::escape( mFolder->label() ) );
if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash"))
!= KMessageBox::Continue) return;
@@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder()
title = i18n("Delete Search");
str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>"
"Any messages it shows will still be available in their original folder.</qt>")
- .arg( TQStyleSheet::escape( mFolder->label() ) );
+ .tqarg( TQStyleSheet::escape( mFolder->label() ) );
} else {
title = i18n("Delete Folder");
if ( mFolder->count() == 0 ) {
if ( !mFolder->child() || mFolder->child()->isEmpty() ) {
str = i18n("<qt>Are you sure you want to delete the empty folder "
"<b>%1</b>?</qt>")
- .arg( TQStyleSheet::escape( mFolder->label() ) );
+ .tqarg( TQStyleSheet::escape( mFolder->label() ) );
}
else {
str = i18n("<qt>Are you sure you want to delete the empty folder "
@@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder()
"not be empty and their contents will be discarded as well. "
"<p><b>Beware</b> that discarded messages are not saved "
"into your Trash folder and are permanently deleted.</qt>")
- .arg( TQStyleSheet::escape( mFolder->label() ) );
+ .tqarg( TQStyleSheet::escape( mFolder->label() ) );
}
} else {
if ( !mFolder->child() || mFolder->child()->isEmpty() ) {
@@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder()
"<b>%1</b>, discarding its contents? "
"<p><b>Beware</b> that discarded messages are not saved "
"into your Trash folder and are permanently deleted.</qt>")
- .arg( TQStyleSheet::escape( mFolder->label() ) );
+ .tqarg( TQStyleSheet::escape( mFolder->label() ) );
}
else {
str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> "
"and all its subfolders, discarding their contents? "
"<p><b>Beware</b> that discarded messages are not saved "
"into your Trash folder and are permanently deleted.</qt>")
- .arg( TQStyleSheet::escape( mFolder->label() ) );
+ .tqarg( TQStyleSheet::escape( mFolder->label() ) );
}
}
}
@@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction()
mListFilterAction->setEnabled( false );
else {
mListFilterAction->setEnabled( true );
- mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) );
+ mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) );
}
}
@@ -1717,7 +1717,7 @@ void KMMainWidget::slotCheckVacation()
if ( !kmkernel->askToGoOnline() )
return;
- Vacation *vac = new Vacation( this, true /* check only */ );
+ Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ );
connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
}
@@ -1730,7 +1730,7 @@ void KMMainWidget::slotEditVacation()
if ( mVacation )
return;
- mVacation = new Vacation( this );
+ mVacation = new Vacation( TQT_TQOBJECT(this) );
connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) );
if ( mVacation->isUsable() ) {
connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
@@ -1848,7 +1848,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardAttachedAction, 1 );
mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
+ connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
TQT_SLOT(slotForwardInlineMsg()) );
} else {
@@ -1856,7 +1856,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardInlineAction, 1 );
mForwardInlineAction->setShortcut( SHIFT+Key_F );
mForwardAttachedAction->setShortcut( Key_F );
- connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
+ connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
TQT_SLOT(slotForwardAttachedMsg()) );
}
}
@@ -2060,7 +2060,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
// Set a timer to show a splash screen if fetching folder contents
// takes more than the amount of seconds configured in the kmailrc (default 1000 msec)
mShowBusySplashTimer = new TQTimer( this );
- connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotShowBusySplash() ) );
+ connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) );
mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true );
return;
} else {
@@ -2191,7 +2191,7 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
TQString prefix("DecryptedMsg.");
int oldIdx = msgId.tqfind(prefix, 0, false);
if( -1 == oldIdx ) {
- int leftAngle = msgId.findRev( '<' );
+ int leftAngle = msgId.tqfindRev( '<' );
msgId = msgId.insert( (-1 == leftAngle) ? 0 : ++leftAngle, prefix );
}
else {
@@ -2508,26 +2508,26 @@ void KMMainWidget::updateCustomTemplateMenus()
new KActionMenu( i18n("Forward With Custom Template"),
"mail_custom_forward",
actionCollection(), "custom_forward" );
- TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this );
+ TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( slotCustomForwardMsg( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) );
mForwardActionMenu->insert( mCustomForwardActionMenu );
mCustomReplyActionMenu =
new KActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
actionCollection(), "custom_reply" );
- TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this );
+ TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( slotCustomReplyToMsg( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyActionMenu );
mCustomReplyAllActionMenu =
new KActionMenu( i18n("Reply to All With Custom Template"),
"mail_custom_reply_all",
actionCollection(), "custom_reply_all" );
- TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this );
+ TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ),
- this, TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu );
mCustomTemplates.clear();
@@ -2644,21 +2644,21 @@ void KMMainWidget::setupActions()
//----- File Menu
mSaveAsAction = new KAction( i18n("Save &As..."), "filesave",
KStdAccel::shortcut(KStdAccel::Save),
- this, TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
+ TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
- mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
+ mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ),
actionCollection() );
(void) new KAction( i18n("&Compact All Folders"), 0,
- this, TQT_SLOT(slotCompactAll()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()),
actionCollection(), "compact_all_folders" );
(void) new KAction( i18n("&Expire All Folders"), 0,
- this, TQT_SLOT(slotExpireAll()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()),
actionCollection(), "expire_all_folders" );
(void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
- this, TQT_SLOT(slotInvalidateIMAPFolders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()),
actionCollection(), "file_tqinvalidate_imap_cache" );
(void) new KAction( i18n("Empty All &Trash Folders"), 0,
@@ -2666,7 +2666,7 @@ void KMMainWidget::setupActions()
actionCollection(), "empty_trash" );
(void) new KAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
- this, TQT_SLOT(slotCheckMail()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()),
actionCollection(), "check_mail" );
mFavoritesCheckMailAction = new KAction( i18n("Check Mail in Favorite Folders"),
@@ -2686,10 +2686,10 @@ void KMMainWidget::setupActions()
connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int)));
connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu()));
- (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, this,
+ (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
- (void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, this,
+ (void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status");
KActionMenu *sendActionMenu = new
@@ -2698,165 +2698,165 @@ void KMMainWidget::setupActions()
sendActionMenu->setDelayed(true);
mSendMenu = sendActionMenu->popupMenu();
- connect(mSendMenu,TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSendQueuedVia(int)));
+ connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int)));
connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu()));
KAction *act;
//----- Tools menu
if (tqparent()->inherits("KMMainWin")) {
- act = new KAction( i18n("&Address Book..."), "contents", 0, this,
+ act = new KAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
}
- act = new KAction( i18n("Certificate Manager..."), "pgp-keys", 0, this,
+ act = new KAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
// disable action if no certman binary is around
if (KStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false);
- act = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
+ act = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around
if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
- act = new KAction( i18n("&Import Messages..."), "fileopen", 0, this,
+ act = new KAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotImport()), actionCollection(), "import" );
if (KStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
#if !defined(NDEBUG)
(void) new KAction( i18n("&Debug Sieve..."),
- "idea", 0, this, TQT_SLOT(slotDebugSieve()),
+ "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()),
actionCollection(), "tools_debug_sieve" );
#endif
if ( GlobalSettings::allowOutOfOfficeSettings() ) {
(void) new KAction( i18n("Edit \"Out of Office\" Replies..."),
- "configure", 0, this, TQT_SLOT(slotEditVacation()),
+ "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()),
actionCollection(), "tools_edit_vacation" );
}
- (void) new KAction( i18n("Filter &Log Viewer..."), 0, this,
+ (void) new KAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
- (void) new KAction( i18n("&Anti-Spam Wizard..."), 0, this,
+ (void) new KAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
- (void) new KAction( i18n("&Anti-Virus Wizard..."), 0, this,
+ (void) new KAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
//----- Edit Menu
mTrashAction = new KAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
i18n("Move message to trashcan") ),
- Key_Delete, this, TQT_SLOT(slotTrashMsg()),
+ Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()),
actionCollection(), "move_to_trash" );
/* The delete action is nowhere in the gui, by default, so we need to make
* sure it is plugged into the KAccel now, since that won't happen on
* XMLGui construction or manual ->plug(). This is only a problem when run
* as a part, though. */
- mDeleteAction = new KAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, this,
+ mDeleteAction = new KAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
mDeleteAction->plugAccel( actionCollection()->kaccel() );
mTrashThreadAction = new KAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
i18n("Move thread to trashcan") ),
- CTRL+Key_Delete, this, TQT_SLOT(slotTrashThread()),
+ CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()),
actionCollection(), "move_thread_to_trash" );
- mDeleteThreadAction = new KAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, this,
+ mDeleteThreadAction = new KAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
- (void) new KAction( i18n("&Find Messages..."), "mail_tqfind", Key_S, this,
+ (void) new KAction( i18n("&Find Messages..."), "mail_tqfind", Key_S, TQT_TQOBJECT(this),
TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
- mFindInMessageAction = new KAction( i18n("&Find in Message..."), "tqfind", KStdAccel::shortcut(KStdAccel::Find), this,
+ mFindInMessageAction = new KAction( i18n("&Find in Message..."), "tqfind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this),
TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
- (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), this,
+ (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), TQT_TQOBJECT(this),
TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
//----- Folder Menu
- mNewFolderAction = new KAction( i18n("&New Folder..."), "folder_new", 0, mFolderTree,
+ mNewFolderAction = new KAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree),
TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
- mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, this,
+ mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" );
mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management..."),
- /*"folder_mailinglist_properties",*/ 0, this, TQT_SLOT( slotFolderMailingListProperties() ),
+ /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ),
actionCollection(), "folder_mailinglist_properties" );
mFolderShortCutCommandAction = new KAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
- 0, this, TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
"folder_shortcut_command" );
- mMarkAllAsReadAction = new KAction( i18n("Mark All Messages as &Read"), "goto", 0, this,
+ mMarkAllAsReadAction = new KAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
- mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, this, TQT_SLOT(slotExpireFolder()),
+ mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()),
actionCollection(), "expire");
- mCompactFolderAction = new KAction( i18n("&Compact Folder"), 0, this,
+ mCompactFolderAction = new KAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" );
mRefreshFolderAction = new KAction( i18n("Check Mail &in This Folder"), "reload",
- KStdAccel::shortcut( KStdAccel::Reload ), this,
+ KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this),
TQT_SLOT(slotRefreshFolder()),
actionCollection(), "refresh_folder" );
mTroubleshootFolderAction = 0; // set in initializeIMAPActions
- mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this,
+ mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
- mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, this,
+ mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
- mArchiveFolderAction = new KAction( i18n( "&Archive Folder..." ), "filesave", 0, this,
+ mArchiveFolderAction = new KAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotArchiveFolder() ), actionCollection(),
"archive_folder" );
- mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
+ mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
- mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, this,
+ mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
- mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, this,
+ mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
- mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
+ mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
- new KAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, folderTree(),
+ new KAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()),
TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
- new KAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, folderTree(),
+ new KAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()),
TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
- new KAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, folderTree(),
+ new KAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()),
TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
- new KAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, headers(),
+ new KAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()),
TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
- new KAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, headers(),
+ new KAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()),
TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
- new KAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, headers(),
+ new KAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()),
TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
//----- Message Menu
- (void) new KAction( i18n("&New Message..."), "mail_new", KStdAccel::shortcut(KStdAccel::New), this,
+ (void) new KAction( i18n("&New Message..."), "mail_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this),
TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
mTemplateMenu =
new KActionMenu( i18n("New Message From &Template"), "filenew",
actionCollection(), "new_from_template" );
mTemplateMenu->setDelayed( true );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this,
+ connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this),
TQT_SLOT( slotShowNewFromTemplate() ) );
- connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), this,
+ connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this),
TQT_SLOT( slotNewFromTemplate(int) ) );
KAction* newToML = new KAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
- CTRL+SHIFT+Key_N, this,
+ CTRL+SHIFT+Key_N, TQT_TQOBJECT(this),
TQT_SLOT(slotPostToML()), actionCollection(), "post_message" );
newToML->plugAccel( actionCollection()->kaccel() );
@@ -2865,25 +2865,25 @@ void KMMainWidget::setupActions()
"message_forward" );
mForwardInlineAction = new KAction( i18n("&Inline..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
- "mail_forward", Key_E, this,
+ "mail_forward", Key_E, TQT_TQOBJECT(this),
TQT_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -2894,38 +2894,38 @@ void KMMainWidget::setupActions()
mForwardActionMenu->insert( mForwardDigestAction );
mForwardActionMenu->insert( mRedirectAction );
- mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, this,
+ mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" );
//----- Create filter actions
mFilterMenu = new KActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
- connect( mFilterMenu, TQT_SIGNAL(activated()), this,
+ connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this),
TQT_SLOT(slotFilter()) );
- mSubjectFilterAction = new KAction( i18n("Filter on &Subject..."), 0, this,
+ mSubjectFilterAction = new KAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSubjectFilter()),
actionCollection(), "subject_filter");
mFilterMenu->insert( mSubjectFilterAction );
- mFromFilterAction = new KAction( i18n("Filter on &From..."), 0, this,
+ mFromFilterAction = new KAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFromFilter()),
actionCollection(), "from_filter");
mFilterMenu->insert( mFromFilterAction );
- mToFilterAction = new KAction( i18n("Filter on &To..."), 0, this,
+ mToFilterAction = new KAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToFilter()),
actionCollection(), "to_filter");
mFilterMenu->insert( mToFilterAction );
- mListFilterAction = new KAction( i18n("Filter on Mailing-&List..."), 0, this,
+ mListFilterAction = new KAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMailingListFilter()), actionCollection(),
"mlist_filter");
mFilterMenu->insert( mListFilterAction );
- mPrintAction = KStdAction::print (this, TQT_SLOT(slotPrintMsg()), actionCollection());
+ mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection());
mUseAction = new KAction( i18n("New Message From &Template"), "filenew",
- Key_N, this, TQT_SLOT( slotUseTemplate() ),
+ Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ),
actionCollection(), "use_template" );
mUseAction->plugAccel( actionCollection()->kaccel() );
@@ -2935,52 +2935,52 @@ void KMMainWidget::setupActions()
mMarkThreadAsReadAction = new KAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
i18n("Mark all messages in the selected thread as read")),
- 0, this, TQT_SLOT(slotSetThreadStatusRead()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()),
actionCollection(), "thread_read");
mThreadStatusMenu->insert( mMarkThreadAsReadAction );
mMarkThreadAsNewAction = new KAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
i18n("Mark all messages in the selected thread as new")),
- 0, this, TQT_SLOT(slotSetThreadStatusNew()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()),
actionCollection(), "thread_new");
mThreadStatusMenu->insert( mMarkThreadAsNewAction );
mMarkThreadAsUnreadAction = new KAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
i18n("Mark all messages in the selected thread as unread")),
- 0, this, TQT_SLOT(slotSetThreadStatusUnread()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()),
actionCollection(), "thread_unread");
mThreadStatusMenu->insert( mMarkThreadAsUnreadAction );
- mThreadStatusMenu->insert( new KActionSeparator( this ) );
+ mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
//----- "Mark Thread" toggle actions
mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
- 0, this, TQT_SLOT(slotSetThreadStatusFlag()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()),
actionCollection(), "thread_flag");
mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadFlagAction );
mToggleThreadTodoAction = new KToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
- 0, this, TQT_SLOT(slotSetThreadStatusTodo()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()),
actionCollection(), "thread_todo");
mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadTodoAction );
//------- "Watch and ignore thread" actions
mWatchThreadAction = new KToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
- 0, this, TQT_SLOT(slotSetThreadStatusWatched()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()),
actionCollection(), "thread_watched");
mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "mail_ignore",
- 0, this, TQT_SLOT(slotSetThreadStatusIgnored()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()),
actionCollection(), "thread_ignored");
- mThreadStatusMenu->insert( new KActionSeparator( this ) );
+ mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) );
mThreadStatusMenu->insert( mWatchThreadAction );
mThreadStatusMenu->insert( mIgnoreThreadAction );
mSaveAttachmentsAction = new KAction( i18n("Save A&ttachments..."), "attach",
- 0, this, TQT_SLOT(slotSaveAttachments()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()),
actionCollection(), "file_save_attachments" );
mMoveActionMenu = new KActionMenu( i18n("&Move To" ),
@@ -2990,7 +2990,7 @@ void KMMainWidget::setupActions()
actionCollection(), "copy_to" );
mApplyAllFiltersAction = new KAction( i18n("Appl&y All Filters"), "filter",
- CTRL+Key_J, this,
+ CTRL+Key_J, TQT_TQOBJECT(this),
TQT_SLOT(slotApplyFilters()),
actionCollection(), "apply_filters" );
@@ -3005,25 +3005,25 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread" );
unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") );
- mUnreadColumnToggle = new KRadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this,
+ mUnreadColumnToggle = new KRadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_column" );
mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadColumnToggle );
- mUnreadTextToggle = new KRadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this,
+ mUnreadTextToggle = new KRadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_text" );
mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadTextToggle );
// toggle for total column
- mTotalColumnToggle = new KToggleAction( i18n("View->", "&Total Column"), 0, this,
+ mTotalColumnToggle = new KToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleTotalColumn()),
actionCollection(), "view_columns_total" );
mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total number of messages in folders.") );
- mSizeColumnToggle = new KToggleAction( i18n("View->", "&Size Column"), 0, this,
+ mSizeColumnToggle = new KToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotToggleSizeColumn()),
actionCollection(), "view_columns_size" );
mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
@@ -3031,33 +3031,33 @@ void KMMainWidget::setupActions()
(void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
i18n("Expand the current thread") ),
- Key_Period, this,
+ Key_Period, TQT_TQOBJECT(this),
TQT_SLOT(slotExpandThread()),
actionCollection(), "expand_thread" );
(void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
i18n("Collapse the current thread") ),
- Key_Comma, this,
+ Key_Comma, TQT_TQOBJECT(this),
TQT_SLOT(slotCollapseThread()),
actionCollection(), "collapse_thread" );
(void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
i18n("Expand all threads in the current folder") ),
- CTRL+Key_Period, this,
+ CTRL+Key_Period, TQT_TQOBJECT(this),
TQT_SLOT(slotExpandAllThreads()),
actionCollection(), "expand_all_threads" );
(void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
i18n("Collapse all threads in the current folder") ),
- CTRL+Key_Comma, this,
+ CTRL+Key_Comma, TQT_TQOBJECT(this),
TQT_SLOT(slotCollapseAllThreads()),
actionCollection(), "collapse_all_threads" );
- mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
+ mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
- KAction* dukeOfMonmoth = new KAction( i18n("&Display Message"), Key_Return, this,
+ KAction* dukeOfMonmoth = new KAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this),
TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
"display_message" );
dukeOfMonmoth->plugAccel( actionCollection()->kaccel() );
@@ -3065,44 +3065,44 @@ void KMMainWidget::setupActions()
//----- Go Menu
new KAction( KGuiItem( i18n("&Next Message"), TQString(),
i18n("Go to the next message") ),
- "N;Right", this, TQT_SLOT(slotNextMessage()),
+ "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()),
actionCollection(), "go_next_message" );
new KAction( KGuiItem( i18n("Next &Unread Message"),
TQApplication::reverseLayout() ? "previous" : "next",
i18n("Go to the next unread message") ),
- Key_Plus, this, TQT_SLOT(slotNextUnreadMessage()),
+ Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()),
actionCollection(), "go_next_unread_message" );
/* ### needs better support from folders:
new KAction( KGuiItem( i18n("Next &Important Message"), TQString(),
i18n("Go to the next important message") ),
- 0, this, TQT_SLOT(slotNextImportantMessage()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()),
actionCollection(), "go_next_important_message" );
*/
new KAction( KGuiItem( i18n("&Previous Message"), TQString(),
i18n("Go to the previous message") ),
- "P;Left", this, TQT_SLOT(slotPrevMessage()),
+ "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()),
actionCollection(), "go_prev_message" );
new KAction( KGuiItem( i18n("Previous Unread &Message"),
TQApplication::reverseLayout() ? "next" : "previous",
i18n("Go to the previous unread message") ),
- Key_Minus, this, TQT_SLOT(slotPrevUnreadMessage()),
+ Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()),
actionCollection(), "go_prev_unread_message" );
/* needs better support from folders:
new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
i18n("Go to the previous important message") ),
- 0, this, TQT_SLOT(slotPrevImportantMessage()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()),
actionCollection(), "go_prev_important_message" );
*/
KAction *action =
new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
i18n("Go to the next folder with unread messages") ),
- ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()),
+ ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()),
actionCollection(), "go_next_unread_folder" );
KShortcut shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Plus ) );
@@ -3111,7 +3111,7 @@ void KMMainWidget::setupActions()
action =
new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
i18n("Go to the previous folder with unread messages") ),
- ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()),
+ ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()),
actionCollection(), "go_prev_unread_folder" );
shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Minus ) );
@@ -3122,33 +3122,33 @@ void KMMainWidget::setupActions()
i18n("Scroll down current message. "
"If at end of current message, "
"go to next unread message.") ),
- Key_Space, this, TQT_SLOT(slotReadOn()),
+ Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()),
actionCollection(), "go_next_unread_text" );
//----- Settings Menu
mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString(),
- 0, this, TQT_SLOT(slotToggleShowQuickSearch()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()),
actionCollection(), "show_quick_search");
mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
mToggleShowQuickSearchAction->setWhatsThis(
i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) );
- (void) new KAction( i18n("Configure &Filters..."), 0, this,
+ (void) new KAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFilter()), actionCollection(), "filter" );
- (void) new KAction( i18n("Configure &POP Filters..."), 0, this,
+ (void) new KAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
- (void) new KAction( i18n("Manage &Sieve Scripts..."), 0, this,
+ (void) new KAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
(void) new KAction( KGuiItem( i18n("KMail &Introduction"), 0,
i18n("Display KMail's Welcome Page") ),
- 0, this, TQT_SLOT(slotIntro()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()),
actionCollection(), "help_kmail_welcomepage" );
// ----- Standard Actions
// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection());
(void) new KAction( i18n("Configure &Notifications..."),
- "knotify", 0, this,
+ "knotify", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditNotifications()), actionCollection(),
"kmail_configure_notifications" );
// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection());
@@ -3157,14 +3157,14 @@ void KMMainWidget::setupActions()
TQT_SLOT(slotShowConfigurationDialog()), actionCollection(),
"kmail_configure_kmail" );
- KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
+ KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
- KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
+ KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
menutimer = new TQTimer( this, "menutimer" );
connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) );
connect( kmkernel->undoStack(),
- TQT_SIGNAL( undoStackChanged() ), this, TQT_SLOT( slotUpdateUndo() ));
+ TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() ));
initializeIMAPActions( false ); // don't set state, config not read yet
updateMessageActions();
@@ -3287,9 +3287,9 @@ void KMMainWidget::copySelectedToFolder(int menuId )
void KMMainWidget::updateMessageMenu()
{
mMenuToFolder.clear();
- folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
+ folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this),
&mMenuToFolder, mMoveActionMenu->popupMenu() );
- folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
+ folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
&mMenuToFolder, mCopyActionMenu->popupMenu() );
updateMessageActions();
}
@@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() {
"Memory allocated, not used: %3\n"
"Memory total allocated : %4\n"
"Max. freeable memory : %5\n")
- .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks))
- .arg(fmt(mi.arena)).arg(fmt(mi.keepcost));
+ .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks))
+ .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost));
KMessageBox::information(0, s, "Malloc information", s);
#endif
}
@@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions()
TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin();
for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
- filterName = TQString("Filter %1").arg((*it)->name());
+ filterName = TQString("Filter %1").tqarg((*it)->name());
normalizedName = filterName.tqreplace(" ", "_");
if (action(normalizedName.utf8()))
continue;
filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
mFilterCommands.append(filterCommand);
- TQString as = i18n("Filter %1").arg((*it)->name());
+ TQString as = i18n("Filter %1").tqarg((*it)->name());
TQString icon = (*it)->icon();
if ( icon.isEmpty() )
icon = "gear";
@@ -3769,7 +3769,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
if ( !mTroubleshootFolderAction ) {
mTroubleshootFolderAction = new KAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
- this, TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
+ TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
if ( setState )
updateFolderMenu(); // set initial state of the action
} else {
@@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
FolderShortcutCommand *c = new FolderShortcutCommand( this, folder );
mFolderShortcutCommands.insert( folder->idString(), c );
- TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() );
- TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() );
+ TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() );
+ TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() );
TQString normalizedName = actionname.tqreplace(" ", "_");
KAction* action =
new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 21879c55e..fb2b28b27 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -36,10 +36,10 @@ KMMainWin::KMMainWin(TQWidget *)
kapp->ref();
(void) new KAction( i18n("New &Window"), "window_new", 0,
- this, TQT_SLOT(slotNewMailReader()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()),
actionCollection(), "new_mail_client" );
- mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
+ mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() );
mKMMainWidget->resize( 450, 600 );
setCentralWidget(mKMMainWidget);
setupStatusBar();
@@ -51,13 +51,13 @@ KMMainWin::KMMainWin(TQWidget *)
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()),
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()),
actionCollection());
- KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()),
+ KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()),
actionCollection());
- KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
createGUI( "kmmainwin.rc", false );
// Don't use conserveMemory() because this renders dynamic plugging
// of actions unusable!
@@ -96,7 +96,7 @@ KMMainWin::~KMMainWin()
if ( !it.current()->isHidden() &&
it.current()->isTopLevel() &&
it.current() != this &&
- ::qt_cast<KMMainWin *>( it.current() )
+ ::tqqt_cast<KMMainWin *>( it.current() )
)
not_withdrawn++;
}
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 6501c9e5e..04af3d65b 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -201,7 +201,7 @@ KMMessage::~KMMessage()
//-----------------------------------------------------------------------------
void KMMessage::setReferences(const TQCString& aStr)
{
- if (!aStr) return;
+ if (aStr.isNull()) return;
mMsg->Headers().References().FromString(aStr);
mNeedsAssembly = true;
}
@@ -413,7 +413,7 @@ void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
setqStatus(headerField("tqStatus").latin1(), headerField("X-tqStatus").latin1());
setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) );
- setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) );
+ setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) );
}
if ( invitationState() == KMMsgInvitationUnknown && readyToShow() )
updateInvitationState();
@@ -641,9 +641,9 @@ static bool flushPart(TQString &msg, TQStringList &part,
static TQString stripSignature( const TQString & msg, bool clearSigned ) {
if ( clearSigned )
- return msg.left( msg.findRev( TQRegExp( "\n--\\s?\n" ) ) );
+ return msg.left( msg.tqfindRev( TQRegExp( "\n--\\s?\n" ) ) );
else
- return msg.left( msg.findRev( "\n-- \n" ) );
+ return msg.left( msg.tqfindRev( "\n-- \n" ) );
}
TQString KMMessage::smartQuote( const TQString & msg, int maxLineLength )
@@ -846,7 +846,7 @@ TQString KMMessage::asQuotedString( const TQString& aHeaderStr,
// Remove blank lines at the beginning:
const int firstNonWS = content.tqfind( TQRegExp( "\\S" ) );
- const int lineStart = content.findRev( '\n', firstNonWS );
+ const int lineStart = content.tqfindRev( '\n', firstNonWS );
if ( lineStart >= 0 )
content.remove( 0, static_cast<unsigned int>( lineStart ) );
@@ -1114,8 +1114,8 @@ TQCString KMMessage::getRefStr() const
if (!firstRef.isEmpty())
retRefStr = firstRef + ' ';
- i = refStr.findRev('<');
- j = refStr.findRev('>');
+ i = refStr.tqfindRev('<');
+ j = refStr.tqfindRev('>');
lastRef = refStr.mid(i, j-i+1);
if (!lastRef.isEmpty() && lastRef != firstRef)
@@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr )
// X-KMail-Redirect-From: content
TQString strByWayOf = TQString("%1 (by way of %2 <%3>)")
- .arg( from() )
- .arg( ident.fullName() )
- .arg( ident.primaryEmailAddress() );
+ .tqarg( from() )
+ .tqarg( ident.fullName() )
+ .tqarg( ident.primaryEmailAddress() );
// Resent-From: content
TQString strFrom = TQString("%1 <%2>")
- .arg( ident.fullName() )
- .arg( ident.primaryEmailAddress() );
+ .tqarg( ident.fullName() )
+ .tqarg( ident.primaryEmailAddress() );
// format the current date to be used in Resent-Date:
TQString origDate = msg->headerField( "Date" );
@@ -1623,7 +1623,7 @@ TQString KMMessage::replaceHeadersInString( const TQString & s ) const {
idx = 0;
while ( ( idx = rx.search( result, idx ) ) != -1 ) {
- TQString replacement = headerField( rx.cap(1).latin1() );
+ TQString replacement = headerField( TQString(rx.cap(1)).latin1() );
result.tqreplace( idx, rx.matchedLength(), replacement );
idx += replacement.length();
}
@@ -2085,7 +2085,7 @@ TQString KMMessage::replyToId() const
if (rightAngle != -1)
replyTo.truncate( rightAngle + 1 );
// now search the start of the message id
- leftAngle = replyTo.findRev( '<' );
+ leftAngle = replyTo.tqfindRev( '<' );
if (leftAngle != -1)
replyTo = replyTo.mid( leftAngle );
@@ -2098,7 +2098,7 @@ TQString KMMessage::replyToId() const
return replyTo;
references = headerField("References");
- leftAngle = references.findRev( '<' );
+ leftAngle = references.tqfindRev( '<' );
if (leftAngle != -1)
references = references.mid( leftAngle );
rightAngle = references.tqfind( '>' );
@@ -2126,11 +2126,11 @@ TQString KMMessage::references() const
TQString references = headerField( "References" );
// keep the last two entries for threading
- leftAngle = references.findRev( '<' );
- leftAngle = references.findRev( '<', leftAngle - 1 );
+ leftAngle = references.tqfindRev( '<' );
+ leftAngle = references.tqfindRev( '<', leftAngle - 1 );
if( leftAngle != -1 )
references = references.mid( leftAngle );
- rightAngle = references.findRev( '>' );
+ rightAngle = references.tqfindRev( '>' );
if( rightAngle != -1 )
references.truncate( rightAngle + 1 );
@@ -2186,7 +2186,7 @@ TQString KMMessage::msgId() const
if (rightAngle != -1)
msgId.truncate( rightAngle + 1 );
// now search the start of the message id
- const int leftAngle = msgId.findRev( '<' );
+ const int leftAngle = msgId.tqfindRev( '<' );
if (leftAngle != -1)
msgId = msgId.mid( leftAngle );
return msgId;
@@ -2367,11 +2367,11 @@ void KMMessage::setHeaderField( const TQCString& aName, const TQString& bValue,
kdDebug(5006) << "aValue: \"" << aValue << "\"" << endl;
#endif
}
- str = aName;
+ str = TQString(aName);
if (str[str.length()-1] != ':') str += ": ";
else str += ' ';
if ( !aValue.isEmpty() )
- str += aValue;
+ str += TQString(aValue);
if (str[str.length()-1] != '\n') str += '\n';
field = new DwField(str, mMsg);
@@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const
if ( DwBodyPart *part = dwBodyPart( aIdx ) ) {
KMMessage::bodyPart(part, aPart);
if( aPart->name().isEmpty() )
- aPart->setName( i18n("Attachment: %1").arg( aIdx ) );
+ aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) );
}
}
@@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex )
dummyPart.duplicate( part );
TQString comment = i18n("This attachment has been deleted.");
if ( !part.fileName().isEmpty() )
- comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() );
+ comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() );
dummyPart.setContentDescription( comment );
dummyPart.setBodyEncodedBinary( TQByteArray() );
TQCString cd = dummyPart.contentDisposition();
@@ -3261,8 +3261,8 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
iM = parAV.tqfind('=');
if( -1 < iM )
{
- parA = parAV.left( iM );
- parV = parAV.right( parAV.length() - iM - 1 );
+ parA = TQString(parAV.left( iM ));
+ parV = TQString(parAV.right( parAV.length() - iM - 1 ));
if( ('"' == parV.at(0)) && ('"' == parV.at(parV.length()-1)) )
{
parV.erase( 0, 1);
@@ -3271,7 +3271,7 @@ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
}
else
{
- parA = parAV;
+ parA = TQString(parAV);
parV = "";
}
DwParameter *param;
@@ -3495,7 +3495,7 @@ TQCString KMMessage::stripEmailAddr( const TQCString& aStr )
bool inQuotedString = false;
int commentLevel = 0;
- for ( char* p = aStr.data(); *p; ++p ) {
+ for ( const char* p = aStr.data(); *p; ++p ) {
switch ( context ) {
case TopLevel : {
switch ( *p ) {
@@ -4037,7 +4037,7 @@ void KMMessage::readConfig()
int languageNr = config->readNumEntry("reply-current-language",0);
{ // area for config group "KMMessage #n"
- KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr));
+ KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr));
sReplyLanguage = config->readEntry("language",KGlobal::locale()->language());
sReplyStr = config->readEntry("phrase-reply",
i18n("On %D, you wrote:"));
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index c0b791892..730ad54d5 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -213,10 +213,10 @@ void KMMimePartTree::setStyleDependantFrameWidth()
{
// set the width of the frame to a reasonable value for the current GUI style
int frameWidth;
- if( style().isA("KeramikStyle") )
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+ if( tqstyle().isA("KeramikStyle") )
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
else
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
if ( frameWidth < 0 )
frameWidth = 0;
if ( frameWidth != lineWidth() )
@@ -309,7 +309,7 @@ void KMMimePartTree::slotCopy()
if ( !url.isValid() ) return;
urls.append( url );
KURLDrag* drag = new KURLDrag( urls, this );
- TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
}
//=============================================================================
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index aed324580..eb8ed59e0 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok)
TQString result = _str;
int len = result.length();
for (int i = 0; i < len; i++)
- if (result.at(i).tqunicode() >= 128) {
- result.at(i) = '?';
+ if (result.tqat(i).tqunicode() >= 128) {
+ result.tqat(i) = '?';
all_ok = false;
}
if (ok)
@@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
unsigned int nonAscii = 0;
unsigned int strLength(_str.length());
for (unsigned int i = 0; i < strLength; i++)
- if (_str.at(i).tqunicode() >= 128) nonAscii++;
+ if (_str.tqat(i).tqunicode() >= 128) nonAscii++;
bool useBase64 = (nonAscii * 6 > strLength);
unsigned int start, stop, p, pos = 0, encLength;
@@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
start = pos; p = pos;
while (p < strLength)
{
- if (!breakLine && (_str.at(p) == ' ' || dontQuote.tqfind(_str.at(p)) != -1))
+ if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.tqfind(_str.tqat(p)) != -1))
start = p + 1;
- if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32)
+ if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32)
break;
p++;
}
if (breakLine || p < strLength)
{
- while (dontQuote.tqfind(_str.at(start)) != -1) start++;
+ while (dontQuote.tqfind(_str.tqat(start)) != -1) start++;
stop = start;
- while (stop < strLength && dontQuote.tqfind(_str.at(stop)) == -1)
+ while (stop < strLength && dontQuote.tqfind(_str.tqat(stop)) == -1)
stop++;
result += _str.mid(pos, start - pos).latin1();
encLength = encodeRFC2047Quoted(codec->fromUnicode(_str.
@@ -843,13 +843,13 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
stop = start + dif;
}
p = stop;
- while (p > start && _str.at(p) != ' ') p--;
+ while (p > start && _str.tqat(p) != ' ') p--;
if (p > start) stop = p;
if (result.right(3) == "?= ") start--;
if (result.right(5) == "?=\n ") {
start--; result.truncate(result.length() - 1);
}
- int lastNewLine = result.findRev("\n ");
+ int lastNewLine = result.tqfindRev("\n ");
if (!result.mid(lastNewLine).stripWhiteSpace().isEmpty()
&& result.length() - lastNewLine + encLength + 2 > maxLen)
result += "\n ";
@@ -951,18 +951,18 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str)
TQCString charset = _str.left(p);
- TQCString st = _str.mid(_str.findRev('\'') + 1);
+ TQCString st = _str.mid(_str.tqfindRev('\'') + 1);
char ch, ch2;
p = 0;
while (p < (int)st.length())
{
- if (st.at(p) == 37)
+ if (st.tqat(p) == 37)
{
- ch = st.at(p+1) - 48;
+ ch = st.tqat(p+1) - 48;
if (ch > 16) ch -= 7;
- ch2 = st.at(p+2) - 48;
+ ch2 = st.tqat(p+2) - 48;
if (ch2 > 16) ch2 -= 7;
- st.at(p) = ch * 16 + ch2;
+ st.tqat(p) = ch * 16 + ch2;
st.remove( p+1, 2 );
}
p++;
@@ -1477,7 +1477,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
// 1. is anchored to the beginning of str (sans whitespace)
// 2. matches at least one of the part regexps in prefixRegExps
TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*")
- .arg( prefixRegExps.join(")|(?:") );
+ .tqarg( prefixRegExps.join(")|(?:") );
TQRegExp rx( bigRegExp, false /*case insens.*/ );
if ( !rx.isValid() ) {
kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \""
diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp
index 2d678bf19..8ce5f7cf3 100644
--- a/kmail/kmmsginfo.cpp
+++ b/kmail/kmmsginfo.cpp
@@ -707,7 +707,7 @@ void KMMsgInfo::setTo( const TQString &to )
//--- For compatability with old index files
void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8)
{
- char *start, *offset;
+ const char *start, *offset;
if(!kd)
kd = new KMMsgInfoPrivate;
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index 386f4af60..a56bee17d 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
// row 0: Type combobox:
mMimeType = new KComboBox( true, plainPage() );
mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
- mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
+ mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) );
mMimeType->insertStringList( TQStringList()
<< TQString::tqfromLatin1("text/html")
<< TQString::tqfromLatin1("text/plain")
@@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
"<p>normally, you do not need to touch this setting, since the "
"type of the file is automatically checked; but, sometimes, %1 "
"may not detect the type correctly -- here is where you can fix "
- "that.</p></qt>").arg( kapp->aboutData()->programName() );
+ "that.</p></qt>").tqarg( kapp->aboutData()->programName() );
TQWhatsThis::add( mMimeType, msg );
// row 1: Size label:
@@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
"because calculating the exact size would take too much time; "
"when this is the case, it will be made visible by adding "
"\"(est.)\" to the size displayed.</p></qt>")
- .arg( kapp->aboutData()->programName() );
+ .tqarg( kapp->aboutData()->programName() );
TQWhatsThis::add( mSize, msg );
// row 2: "Name" lineedit and label:
@@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
"binary data, but consists of pure text -- in this case, choosing "
"\"quoted-printable\" over the default \"base64\" will save up "
"to 25% in resulting message size.</p></qt>")
- .arg( kapp->aboutData()->programName() );
+ .tqarg( kapp->aboutData()->programName() );
TQWhatsThis::add( label, msg );
TQWhatsThis::add( mEncoding, msg );
@@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) {
void KMMsgPartDialog::setMimeType( const TQString & type,
const TQString & subtype ) {
- setMimeType( TQString::tqfromLatin1("%1/%2").arg(type).arg(subtype) );
+ setMimeType( TQString::tqfromLatin1("%1/%2").tqarg(type).tqarg(subtype) );
}
void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) {
@@ -221,7 +221,7 @@ void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) {
TQString text = KIO::convertSize( size );
if ( estimated )
text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")",
- "%1 (est.)").arg( text );
+ "%1 (est.)").tqarg( text );
mSize->setText( text );
}
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index 0936df8a2..987485969 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -292,7 +292,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons
TQLabel *l = new TQLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>"
"The messages shown exceed the maximum size limit you defined for this account.<br>You can select "
- "what you want to do with them by checking the appropriate button.").arg(aAccount), w);
+ "what you want to do with them by checking the appropriate button.").tqarg(aAccount), w);
vbl->addWidget(l);
TQVGroupBox *upperBox = new TQVGroupBox(i18n("Messages Exceeding Size"), w);
@@ -360,7 +360,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons
}
if(rulesetCount)
- lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount));
+ lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").tqarg(rulesetCount));
// connect signals and slots
connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)),
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 840608178..f07ba8fe3 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -348,29 +348,29 @@ void KMReaderMainWin::setupAccel()
// this, TQT_SLOT( slotSaveMsg() ),
// actionCollection(), "file_save_as" );
- mSaveAsAction = KStdAction::saveAs( mReaderWin, TQT_SLOT( slotSaveMsg() ),
+ mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ),
actionCollection() );
mSaveAsAction->setShortcut( KStdAccel::shortcut( KStdAccel::Save ) );
- mPrintAction = KStdAction::print( this, TQT_SLOT( slotPrintMsg() ),
+ mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ),
actionCollection() );
- KAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
+ KAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
KShortcut closeShortcut = closeAction->shortcut();
closeShortcut.append( KKey(Key_Escape));
closeAction->setShortcut(closeShortcut);
//----- Edit Menu
- KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
- KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
- KStdAction::tqfind( this, TQT_SLOT(slotFind()), actionCollection() );
- KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
+ KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() );
+ KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() );
+ KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() );
+ KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() );
mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
i18n( "Move message to trashcan" ) ),
- Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
+ Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ),
actionCollection(), "move_to_trash" );
//----- View Menu
- mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
+ mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this),
TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" );
@@ -379,25 +379,25 @@ void KMReaderMainWin::setupAccel()
"mail_forward", actionCollection(),
"message_forward" );
mForwardInlineAction = new KAction( i18n("&Inline..."),
- "mail_forward", SHIFT+Key_F, this,
+ "mail_forward", SHIFT+Key_F, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardInlineMsg()),
actionCollection(),
"message_forward_inline" );
mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
- "mail_forward", Key_F, this,
+ "mail_forward", Key_F, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(),
"message_forward_as_attachment" );
mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardDigestMsg()),
actionCollection(),
"message_forward_as_digest" );
mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
- "mail_forward", Key_E, this,
+ "mail_forward", Key_E, TQT_TQOBJECT(this),
TQT_SLOT(slotRedirectMsg()),
actionCollection(),
"message_forward_redirect" );
@@ -435,7 +435,7 @@ void KMReaderMainWin::setupAccel()
mReaderWin, TQT_SLOT(slotUrlClicked()));
setStandardToolBarMenuEnabled(true);
- KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
}
@@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
TQPopupMenu* copyMenu = new TQPopupMenu(menu);
KMMainWidget* mainwin = kmkernel->getKMMainWidget();
if ( mainwin )
- mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
+ mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this),
&mMenuToFolder, copyMenu );
menu->insertItem( i18n("&Copy To" ), copyMenu );
menu->insertSeparator();
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index a6b3c1d51..5b80dc0ab 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -150,7 +150,7 @@ NewByteArray& NewByteArray::appendNULL()
{
TQByteArray::detach();
uint len1 = size();
- if ( !TQByteArray::resize( len1 + 1 ) )
+ if ( !TQByteArray::tqresize( len1 + 1 ) )
return *this;
*(data() + len1) = '\0';
return *this;
@@ -162,7 +162,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData )
TQByteArray::detach();
uint len1 = size();
uint len2 = tqstrlen( newData );
- if ( !TQByteArray::resize( len1 + len2 ) )
+ if ( !TQByteArray::tqresize( len1 + len2 ) )
return *this;
memcpy( data() + len1, newData, len2 );
return *this;
@@ -174,7 +174,7 @@ NewByteArray& NewByteArray::operator+=( const TQByteArray & newData )
TQByteArray::detach();
uint len1 = size();
uint len2 = newData.size();
- if ( !TQByteArray::resize( len1 + len2 ) )
+ if ( !TQByteArray::tqresize( len1 + len2 ) )
return *this;
memcpy( data() + len1, newData.data(), len2 );
return *this;
@@ -186,7 +186,7 @@ NewByteArray& NewByteArray::operator+=( const TQCString & newData )
TQByteArray::detach();
uint len1 = size();
uint len2 = newData.length(); // forget about the trailing 0x00 !
- if ( !TQByteArray::resize( len1 + len2 ) )
+ if ( !TQByteArray::tqresize( len1 + len2 ) )
return *this;
memcpy( data() + len1, newData.data(), len2 );
return *this;
@@ -207,7 +207,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node,
int recCount )
{
kdDebug(5006) << TQString("-------------------------------------------------" ) << endl;
- kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").arg( recCount ) << endl;
+ kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").tqarg( recCount ) << endl;
if( node ) {
kdDebug(5006) << node->typeString() << '/' << node->subTypeString() << endl;
@@ -360,7 +360,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl
recCount + 1 );
}
}
- kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").arg( recCount ) << endl;
+ kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").tqarg( recCount ) << endl;
}
@@ -386,7 +386,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl
void KMReaderWin::createWidgets() {
TQVBoxLayout * vlay = new TQVBoxLayout( this );
- mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" );
+ mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" );
vlay->addWidget( mSplitter );
mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" );
mBox = new TQHBox( mSplitter, "mBox" );
@@ -467,11 +467,11 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1;
connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(updateReaderWin()) );
+ TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) );
connect( &mResizeTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotDelayedResize()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) );
connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(slotTouchMessage()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) );
}
@@ -487,45 +487,45 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
headerMenu->setToolTip( i18n("Choose display style of message headers") );
connect( headerMenu, TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotCycleHeaderStyles()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) );
raction = new KRadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
- this, TQT_SLOT(slotEnterpriseHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()),
ac, "view_headers_enterprise" );
raction->setToolTip( i18n("Show the list of headers in Enterprise style") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert(raction);
raction = new KRadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
- this, TQT_SLOT(slotFancyHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()),
ac, "view_headers_fancy" );
raction->setToolTip( i18n("Show the list of headers in a fancy format") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new KRadioAction( i18n("View->headers->", "&Brief Headers"), 0,
- this, TQT_SLOT(slotBriefHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()),
ac, "view_headers_brief" );
raction->setToolTip( i18n("Show brief list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new KRadioAction( i18n("View->headers->", "&Standard Headers"), 0,
- this, TQT_SLOT(slotStandardHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()),
ac, "view_headers_standard" );
raction->setToolTip( i18n("Show standard list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new KRadioAction( i18n("View->headers->", "&Long Headers"), 0,
- this, TQT_SLOT(slotLongHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()),
ac, "view_headers_long" );
raction->setToolTip( i18n("Show long list of message headers") );
raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction );
raction = new KRadioAction( i18n("View->headers->", "&All Headers"), 0,
- this, TQT_SLOT(slotAllHeaders()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()),
ac, "view_headers_all" );
raction->setToolTip( i18n("Show all message headers") );
raction->setExclusiveGroup( "view_headers_group" );
@@ -536,38 +536,38 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
new KActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
attachmentMenu->setToolTip( i18n("Choose display style of attachments") );
connect( attachmentMenu, TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotCycleAttachmentStrategy()) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) );
raction = new KRadioAction( i18n("View->attachments->", "&As Icons"), 0,
- this, TQT_SLOT(slotIconicAttachments()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()),
ac, "view_attachments_as_icons" );
raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new KRadioAction( i18n("View->attachments->", "&Smart"), 0,
- this, TQT_SLOT(slotSmartAttachments()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()),
ac, "view_attachments_smart" );
raction->setToolTip( i18n("Show attachments as suggested by sender.") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new KRadioAction( i18n("View->attachments->", "&Inline"), 0,
- this, TQT_SLOT(slotInlineAttachments()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()),
ac, "view_attachments_inline" );
raction->setToolTip( i18n("Show all attachments inline (if possible)") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
raction = new KRadioAction( i18n("View->attachments->", "&Hide"), 0,
- this, TQT_SLOT(slotHideAttachments()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()),
ac, "view_attachments_hide" );
raction->setToolTip( i18n("Do not show attachments in the message viewer") );
raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction );
mHeaderOnlyAttachmentsAction = new KRadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
- this, TQT_SLOT( slotHeaderOnlyAttachments() ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ),
ac, "view_attachments_headeronly" );
mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" );
@@ -575,7 +575,7 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
// Set Encoding submenu
mSelectEncodingAction = new KSelectAction( i18n( "&Set Encoding" ), "charset", 0,
- this, TQT_SLOT( slotSetEncoding() ),
+ TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ),
ac, "encoding" );
TQStringList encodings = KMMsgBase::supportedEncodings( false );
encodings.prepend( i18n( "Auto" ) );
@@ -583,39 +583,39 @@ void KMReaderWin::createActions( KActionCollection * ac ) {
mSelectEncodingAction->setCurrentItem( 0 );
mMailToComposeAction = new KAction( i18n("New Message To..."), "mail_new",
- 0, this, TQT_SLOT(slotMailtoCompose()), ac,
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac,
"mailto_compose" );
mMailToReplyAction = new KAction( i18n("Reply To..."), "mail_reply",
- 0, this, TQT_SLOT(slotMailtoReply()), ac,
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac,
"mailto_reply" );
mMailToForwardAction = new KAction( i18n("Forward To..."), "mail_forward",
- 0, this, TQT_SLOT(slotMailtoForward()), ac,
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac,
"mailto_forward" );
mAddAddrBookAction = new KAction( i18n("Add to Address Book"),
- 0, this, TQT_SLOT(slotMailtoAddAddrBook()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()),
ac, "add_addr_book" );
mOpenAddrBookAction = new KAction( i18n("Open in Address Book"),
- 0, this, TQT_SLOT(slotMailtoOpenAddrBook()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()),
ac, "openin_addr_book" );
- mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
- mSelectAllAction = new KAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this,
+ mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
+ mSelectAllAction = new KAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this),
TQT_SLOT(selectAll()), ac, "mark_all_text" );
- mCopyURLAction = new KAction( i18n("Copy Link Address"), 0, this,
+ mCopyURLAction = new KAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
- mUrlOpenAction = new KAction( i18n("Open URL"), 0, this,
+ mUrlOpenAction = new KAction( i18n("Open URL"), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUrlOpen()), ac, "open_url" );
mAddBookmarksAction = new KAction( i18n("Bookmark This Link"),
"bookmark_add",
- 0, this, TQT_SLOT(slotAddBookmarks()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()),
ac, "add_bookmarks" );
- mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, this,
+ mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"),
- Key_X, this, TQT_SLOT(slotToggleFixedFont()),
+ Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()),
ac, "toggle_fixedfont" );
- mStartIMChatAction = new KAction( i18n("Chat &With..."), 0, this,
+ mStartIMChatAction = new KAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this),
TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
}
@@ -988,7 +988,7 @@ void KMReaderWin::writeConfig( bool sync ) const {
//-----------------------------------------------------------------------------
void KMReaderWin::initHtmlWidget(void)
{
- mViewer->widget()->setFocusPolicy(WheelFocus);
+ mViewer->widget()->setFocusPolicy(Qt::WheelFocus);
// Let's better be paranoid and disable plugins (it defaults to enabled):
mViewer->setPluginsEnabled(false);
mViewer->setJScriptEnabled(false); // just make this explicit
@@ -1017,9 +1017,9 @@ void KMReaderWin::initHtmlWidget(void)
connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
- this, TQT_SLOT( contacStatusChanged( const TQString & ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( contacStatusChanged( const TQString & ) ) );
connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
- this, TQT_SLOT( updateReaderWin() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
}
void KMReaderWin::contacStatusChanged( const TQString &uid)
@@ -1285,11 +1285,11 @@ void KMReaderWin::displaySplashPage( const TQString &info )
TQString location = locate("data", "kmail/about/main.html");
TQString content = KPIM::kFileToString(location);
- content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+ content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+ content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
else
- content = content.arg( "" );
+ content = content.tqarg( "" );
mViewer->begin(KURL( location ));
@@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info )
TQString appTitle = i18n("KMail");
TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
TQString quickDescription = i18n("The email client for the K Desktop Environment.");
- mViewer->write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
+ mViewer->write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
mViewer->end();
}
@@ -1345,41 +1345,41 @@ void KMReaderWin::displayAboutPage()
"<p>We hope that you will enjoy KMail.</p>\n"
"<p>Thank you,</p>\n"
"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>")
- .arg(KMAIL_VERSION) // KMail version
- .arg("help:/kmail/index.html") // KMail help:// URL
- .arg("http://kontact.kde.org/kmail/") // KMail homepage URL
- .arg("1.8").arg("3.4"); // prior KMail and KDE version
+ .tqarg(KMAIL_VERSION) // KMail version
+ .tqarg("help:/kmail/index.html") // KMail help:// URL
+ .tqarg("http://kontact.kde.org/kmail/") // KMail homepage URL
+ .tqarg("1.8").tqarg("3.4"); // prior KMail and KDE version
TQString featureItems;
for ( int i = 0 ; i < numKMailNewFeatures ; i++ )
- featureItems += i18n("<li>%1</li>\n").arg( i18n( kmailNewFeatures[i] ) );
+ featureItems += i18n("<li>%1</li>\n").tqarg( i18n( kmailNewFeatures[i] ) );
- info = info.arg( featureItems );
+ info = info.tqarg( featureItems );
if( kmkernel->firstStart() ) {
- info = info.arg( i18n("<p>Please take a moment to fill in the KMail "
+ info = info.tqarg( i18n("<p>Please take a moment to fill in the KMail "
"configuration panel at Settings-&gt;Configure "
"KMail.\n"
"You need to create at least a default identity and "
"an incoming as well as outgoing mail account."
"</p>\n") );
} else {
- info = info.arg( TQString() );
+ info = info.tqarg( TQString() );
}
if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) {
TQString changesText =
i18n("<p><span style='font-size:125%; font-weight:bold;'>"
"Important changes</span> (compared to KMail %1):</p>\n")
- .arg("1.8");
+ .tqarg("1.8");
changesText += "<ul>\n";
for ( int i = 0 ; i < numKMailChanges ; i++ )
- changesText += i18n("<li>%1</li>\n").arg( i18n( kmailChanges[i] ) );
+ changesText += i18n("<li>%1</li>\n").tqarg( i18n( kmailChanges[i] ) );
changesText += "</ul>\n";
- info = info.arg( changesText );
+ info = info.tqarg( changesText );
}
else
- info = info.arg(""); // remove the %8
+ info = info.tqarg(""); // remove the %8
displaySplashPage( info );
}
@@ -1480,7 +1480,7 @@ void KMReaderWin::displayMessage() {
htmlWriter()->queue("</body></html>");
htmlWriter()->flush();
- TQTimer::singleShot( 1, this, TQT_SLOT(injectAttachments()) );
+ TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) );
}
static bool message_was_saved_decrypted_before( const KMMessage * msg ) {
@@ -1694,7 +1694,7 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart,
return TQString();
// strip off a leading path
- int slashPos = fileName.findRev( '/' );
+ int slashPos = fileName.tqfindRev( '/' );
if( -1 != slashPos )
fileName = fileName.mid( slashPos + 1 );
if( fileName.isEmpty() )
@@ -1764,8 +1764,8 @@ int KMReaderWin::msgPartFromUrl(const KURL &aUrl)
if (!aUrl.isLocalFile()) return -1;
TQString path = aUrl.path();
- uint right = path.findRev('/');
- uint left = path.findRev('.', right);
+ uint right = path.tqfindRev('/');
+ uint left = path.tqfindRev('.', right);
bool ok;
int res = path.mid(left + 1, right - left - 1).toInt(&ok);
@@ -1916,7 +1916,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &)
return;
kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl;
- emit urlClicked( aUrl, TQt::LeftButton );
+ emit urlClicked( aUrl, Qt::LeftButton );
}
//-----------------------------------------------------------------------------
@@ -1955,8 +1955,8 @@ static bool hasParentDivWithId( const DOM::Node &start, const TQString &id )
}
}
- if ( !start.tqparentNode().isNull() )
- return hasParentDivWithId( start.tqparentNode(), id );
+ if ( !start.parentNode().isNull() )
+ return hasParentDivWithId( start.parentNode(), id );
else return false;
}
@@ -1976,7 +1976,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 );
if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange )
menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 );
- if ( name.endsWith( ".xia", false ) &&
+ if ( name.tqendsWith( ".xia", false ) &&
Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) )
menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 );
menu->insertItem(i18n("Properties"), 5);
@@ -1987,7 +1987,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
menu->insertItem( i18n("Scroll To"), 10 );
}
- connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHandleAttachment(int)));
+ connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int)));
menu->exec( p ,0 );
delete menu;
}
@@ -1999,10 +1999,10 @@ void KMReaderWin::setStyleDependantFrameWidth()
return;
// set the width of the frame to a reasonable value for the current GUI style
int frameWidth;
- if( style().isA("KeramikStyle") )
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
+ if( tqstyle().isA("KeramikStyle") )
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1;
else
- frameWidth = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
+ frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth );
if ( frameWidth < 0 )
frameWidth = 0;
if ( frameWidth != mBox->lineWidth() )
@@ -2028,7 +2028,7 @@ void KMReaderWin::slotHandleAttachment( int choice )
node, message(), mAtmCurrent, mAtmCurrentName,
KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else if ( choice == 7 ) {
slotDeleteAttachment( node );
@@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice )
if (!url.isValid() ) return;
urls.append( url );
KURLDrag* drag = new KURLDrag( urls, this );
- TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
} else if ( choice == 10 ) { // Scroll To
scrollToAttachment( node );
}
@@ -2142,7 +2142,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
}
htmlWriter()->queue("</body></html>");
htmlWriter()->flush();
- mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname));
+ mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname));
} else if (kasciistricmp(aMsgPart->typeStr(), "image")==0 ||
(kasciistricmp(aMsgPart->typeStr(), "application")==0 &&
kasciistricmp(aMsgPart->subtypeStr(), "postscript")==0))
@@ -2178,7 +2178,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
"\" border=\"0\">\n"
"</body></html>\n" );
htmlWriter()->end();
- setCaption( i18n("View Attachment: %1").arg( pname ) );
+ setCaption( i18n("View Attachment: %1").tqarg( pname ) );
show();
delete iio;
} else {
@@ -2198,7 +2198,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML,
htmlWriter()->queue( "</pre>" );
htmlWriter()->queue("</body></html>");
htmlWriter()->flush();
- mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname));
+ mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname));
}
// ---Sven's view text, html and image attachments in html widget end ---
}
@@ -2287,14 +2287,14 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
if ( filenameText.isEmpty() )
filenameText = msgPart.name();
if ( offer ) {
- open_text = i18n("&Open with '%1'").arg( offer->name() );
+ open_text = i18n("&Open with '%1'").tqarg( offer->name() );
} else {
open_text = i18n("&Open With...");
}
const TQString text = i18n("Open attachment '%1'?\n"
"Note that opening an attachment may compromise "
"your system's security.")
- .arg( filenameText );
+ .tqarg( filenameText );
const int choice = KMessageBox::questionYesNoCancel( this, text,
i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text,
TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName
@@ -2305,7 +2305,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save,
offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
}
else if( choice == KMessageBox::No ) { // Open
@@ -2315,7 +2315,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
message(), mAtmCurrent, mAtmCurrentName, action, offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
- this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start();
} else { // Cancel
kdDebug(5006) << "Canceled opening attachment" << endl;
@@ -2577,8 +2577,8 @@ KURL KMReaderWin::tempFileUrlFromPartNode( const partNode * node )
while ( it != end ) {
TQString path = *it;
it++;
- uint right = path.findRev('/');
- uint left = path.findRev('.', right);
+ uint right = path.tqfindRev('/');
+ uint left = path.tqfindRev('.', right);
bool ok;
int res = path.mid(left + 1, right - left - 1).toInt(&ok);
@@ -2636,8 +2636,8 @@ static TQString linkForNode( const DOM::Node &node )
return href.nodeValue().string();
}
}
- if ( !node.tqparentNode().isNull() ) {
- return linkForNode( node.tqparentNode() );
+ if ( !node.parentNode().isNull() ) {
+ return linkForNode( node.parentNode() );
} else {
return TQString();
}
@@ -2651,14 +2651,14 @@ static TQString linkForNode( const DOM::Node &node )
bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress ) {
- TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
- if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) {
+ TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+ if ( me->button() == Qt::LeftButton && ( me->state() & ShiftButton ) ) {
// special processing for shift+click
URLHandlerManager::instance()->handleShiftClick( mHoveredUrl, this );
return true;
}
- if ( me->button() == LeftButton ) {
+ if ( me->button() == Qt::LeftButton ) {
TQString imagePath;
const DOM::Node nodeUnderMouse = mViewer->nodeUnderMouse();
@@ -2683,7 +2683,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
}
if ( e->type() == TQEvent::MouseMove ) {
- TQMouseEvent* me = static_cast<TQMouseEvent*>( e );
+ TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
// Handle this ourselves instead of connecting to mViewer::onURL(), since KHTML misses some
// notifications in case we started a drag ourselves
@@ -2698,8 +2698,8 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
// HACK: Send a mouse release event to the KHTMLView, as otherwise that will be missed in
// case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen.
- TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton );
- static_cast<TQObject*>( mViewer->view() )->eventFilter( mViewer->view()->viewport(),
+ TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton );
+ TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(),
&mouseEvent );
return true;
}
@@ -2751,9 +2751,9 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this );
command->start();
connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( updateReaderWin() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) );
connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
- this, TQT_SLOT( disconnectMsgAdded() ) );
+ TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) );
// ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't
// want the selection to change. Therefore, as soon as a new message arrives, select it, and then
@@ -2762,7 +2762,7 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
// And it won't work properly with multiple main windows
const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers();
connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
}
// If we are operating on a copy of parts of the message, make sure to update the copy as well.
@@ -2788,7 +2788,7 @@ void KMReaderWin::disconnectMsgAdded()
{
const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers();
disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
- this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+ TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) );
}
void KMReaderWin::slotEditAttachment(partNode * node)
@@ -2828,12 +2828,12 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
DOM::Document doc = mViewer->htmlDocument();
// The anchors for this are created in ObjectTreeParser::parseObjectTree()
- mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).arg( node->nodeId() ) );
+ mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) );
// Remove any old color markings which might be there
const partNode *root = node->topLevelParent();
for ( int i = 0; i <= root->totalChildCount() + 1; i++ ) {
- DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( i + 1 ) );
+ DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( i + 1 ) );
if ( !attachmentDiv.isNull() )
attachmentDiv.removeAttribute( "style" );
}
@@ -2845,14 +2845,14 @@ void KMReaderWin::scrollToAttachment( const partNode *node )
// Now, color the div of the attachment in yellow, so that the user sees what happened.
// We created a special marked div for this in writeAttachmentMarkHeader() in ObjectTreeParser,
// find and modify that now.
- DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( node->nodeId() ) );
+ DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( node->nodeId() ) );
if ( attachmentDiv.isNull() ) {
kdWarning( 5006 ) << "Could not find attachment div for attachment " << node->nodeId() << endl;
return;
}
attachmentDiv.setAttribute( "style", TQString( "border:2px solid %1" )
- .arg( cssHelper()->pgpWarnColor().name() ) );
+ .tqarg( cssHelper()->pgpWarnColor().name() ) );
// Update rendering, otherwise the rendering is not updated when the user clicks on an attachment
// that causes scrolling and the open attachment dialog
@@ -2880,7 +2880,7 @@ void KMReaderWin::injectAttachments()
imgSrc.append( "attachmentQuicklistOpened.png" );
}
- TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() );
+ TQString html = renderAttachments( mRootNode, TQApplication::tqpalette().active().background() );
if ( html.isEmpty() )
return;
@@ -2931,8 +2931,8 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
align = "right";
if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
html += TQString::tqfromLatin1("<div style=\"background:%1; %2"
- "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin )
- .arg( align ).arg( visibility );
+ "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin )
+ .tqarg( align ).tqarg( visibility );
html += subHtml;
if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode )
html += "</div>";
@@ -2941,7 +2941,7 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor
partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo();
if ( info.displayInHeader ) {
html += "<div style=\"float:left;\">";
- html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() );
+ html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() );
TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() );
TQString href = node->asHREF( "header" );
html += TQString::tqfromLatin1( "<a href=\"" ) + href +
@@ -3000,7 +3000,7 @@ void KMReaderWin::setBodyPartMemento( const partNode * node, const TQCString & w
BodyPartMemento * KMReaderWin::bodyPartMemento( const partNode * node, const TQCString & which ) const
{
const TQCString index = node->path() + ':' + which.lower();
- const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( index );
+ const std::map<TQCString,BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( index );
if ( it == mBodyPartMementoMap.end() ) {
return 0;
}
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index 84005f2b7..55df4d5eb 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -86,7 +86,7 @@ void KMSearchRuleWidget::setHeadersOnly( bool headersOnly )
if (( currentText != "<message>") &&
( currentText != "<body>"))
- mRuleField->changeItem( TQString::fromAscii( currentText ), 0 );
+ mRuleField->changeItem( TQString(TQString::fromAscii( currentText )), 0 );
else
mRuleField->changeItem( TQString(), 0 );
}
@@ -117,7 +117,7 @@ void KMSearchRuleWidget::initWidget()
RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack,
mValueStack,
- this );
+ TQT_TQOBJECT(this) );
// redirect focus to the header field combo box
setFocusProxy( mRuleField );
@@ -392,14 +392,14 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets()
//=============================================================================
KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates )
- : TQGroupBox( 1/*columns*/, Horizontal, tqparent, name )
+ : TQGroupBox( 1/*columns*/, Qt::Horizontal, tqparent, name )
{
setTitle( i18n("Search Criteria") );
initLayout( headersOnly, absoluteDates );
}
KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *tqparent, const char *name, bool headersOnly, bool absoluteDates)
- : TQGroupBox( 1/*column*/, Horizontal, title, tqparent, name )
+ : TQGroupBox( 1/*column*/, Qt::Horizontal, title, tqparent, name )
{
initLayout( headersOnly, absoluteDates );
}
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 1d267d88c..add465642 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -387,7 +387,7 @@ void KMSender::doSendMsg()
"\"outbox\" to the \"sent-mail\" folder failed.\n"
"Possible reasons are lack of disk space or write permission. "
"Please try to fix the problem and move the message manually.")
- .arg(mCurrentMsg->subject()));
+ .tqarg(mCurrentMsg->subject()));
cleanup();
return;
}
@@ -435,7 +435,7 @@ void KMSender::doSendMsg()
"identity '%1' in the Identities "
"section of the configuration dialog "
"and then try again." )
- .arg( id.identityName() ) );
+ .tqarg( id.identityName() ) );
mOutboxFolder->unGetMsg( mFailedMessages );
mCurrentMsg = 0;
}
@@ -455,7 +455,7 @@ void KMSender::doSendMsg()
mSentMessages));
} else {
seStatusMsg(i18n("%1 of %2 queued messages successfully sent.")
- .arg(mSentMessages).arg( mTotalMessages ));
+ .tqarg(mSentMessages).tqarg( mTotalMessages ));
}
}
cleanup();
@@ -536,7 +536,7 @@ void KMSender::doSendMsg()
}
bool KMSender::runPrecommand( const TQString & cmd ) {
- seStatusMsg( i18n("Executing precommand %1").arg( cmd ) );
+ seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) );
mPrecommand = new KMPrecommand( cmd );
connect( mPrecommand, TQT_SIGNAL(finished(bool)),
TQT_SLOT(slotPrecommandFinished(bool)) );
@@ -596,8 +596,8 @@ void KMSender::doSendMsgAux()
// start sending the current message
seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3")
- .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages)
- .arg(mCurrentMsg->subject()));
+ .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages)
+ .tqarg(mCurrentMsg->subject()));
TQStringList to, cc, bcc;
TQString sender;
extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc );
@@ -696,8 +696,8 @@ void KMSender::slotIdle()
"fix the problem (e.g. a broken address) or remove the message "
"from the 'outbox' folder.\n"
"The following transport protocol was used:\n %2")
- .arg(errString)
- .arg(mMethodStr);
+ .tqarg(errString)
+ .tqarg(mMethodStr);
if (!errString.isEmpty()) KMessageBox::error(0,msg);
seStatusMsg( i18n( "Sending aborted." ) );
} else {
@@ -724,8 +724,8 @@ void KMSender::slotIdle()
"from the 'outbox' folder.</p>"
"<p>The following transport protocol was used: %2</p>"
"<p>Do you want me to continue sending the remaining messages?</p>")
- .arg(errString)
- .arg(mMethodStr);
+ .tqarg(errString)
+ .tqarg(mMethodStr);
res = KMessageBox::warningYesNo( 0 , msg ,
i18n( "Continue Sending" ), i18n( "&Continue Sending" ),
i18n("&Abort Sending") );
@@ -735,8 +735,8 @@ void KMSender::slotIdle()
"fix the problem (e.g. a broken address) or remove the message "
"from the 'outbox' folder.\n"
"The following transport protocol was used:\n %2")
- .arg(errString)
- .arg(mMethodStr);
+ .tqarg(errString)
+ .tqarg(mMethodStr);
KMessageBox::error(0,msg);
}
if (res == KMessageBox::Yes) {
@@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() {
"Please remove it from there if you do not want the message to "
"be resent.\n"
"The following transport protocol was used:\n %2")
- .arg(str + "\n")
- .arg("sendmail://");
+ .tqarg(str + "\n")
+ .tqarg("sendmail://");
KMessageBox::information(0,msg);
return false;
}
@@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c
if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
KMessageBox::information( 0, i18n("Failed to execute mailer program %1")
- .arg( mSender->transportInfo()->host ) );
+ .tqarg( mSender->transportInfo()->host ) );
return false;
}
mMsgPos = mMsgStr.data();
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index b99e1cc95..67dc0f2d5 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(KIO::Slave *aSlave, int error,
if ( error )
{
mJob = 0;
- KMessageBox::error( kapp->activeWindow(),
+ KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()),
KIO::buildErrorString( error, errorText ),
i18n("Error") );
emit capabilities( mListNormal, mListSSL );
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 943a3a2d7..fd3d7bd7e 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -165,7 +165,7 @@ void lockOrDie() {
// On linux with /proc we can even check that it's really kmail and not something else
char path_buffer[MAXPATHLEN + 1];
path_buffer[MAXPATHLEN] = 0;
- const TQString procPath = TQString("/proc/%1/exe").arg(oldPid);
+ const TQString procPath = TQString("/proc/%1/exe").tqarg(oldPid);
const int length = readlink (procPath.latin1(), path_buffer, MAXPATHLEN);
if ( length == -1 ) // not such pid
first_instance = true;
@@ -173,7 +173,7 @@ void lockOrDie() {
path_buffer[length] = '\0';
const TQString path = TQFile::decodeName(path_buffer);
kdDebug() << k_funcinfo << path << endl;
- const int pos = path.findRev('/');
+ const int pos = path.tqfindRev('/');
const TQString fileName = path.mid(pos+1);
kdDebug() << "Found process " << oldPid << " running. It's: " << fileName << endl;
first_instance = fileName != "kmail" && fileName != "kontact";
@@ -199,17 +199,17 @@ void lockOrDie() {
"this machine. Running %2 more than once "
"can cause the loss of mail. You should not start %1 "
"unless you are sure that it is not already running.")
- .arg( programName, programName );
+ .tqarg( programName, programName );
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
- // even think about changing the above to .arg( programName ).
+ // even think about changing the above to .tqarg( programName ).
else
msg = i18n("%1 seems to be running on another display on this "
"machine. Running %1 and %2 at the same "
"time can cause the loss of mail. You should not start %2 "
"unless you are sure that %1 is not running.")
- .arg( oldProgramName, programName );
+ .tqarg( oldProgramName, programName );
}
else {
if ( oldAppName == appName )
@@ -217,19 +217,19 @@ void lockOrDie() {
"than once can cause the loss of mail. You should not "
"start %1 on this computer unless you are sure that it is "
"not already running on %2.")
- .arg( programName, oldHostName );
+ .tqarg( programName, oldHostName );
else
msg = i18n("%1 seems to be running on %3. Running %1 and %2 at the "
"same time can cause the loss of mail. You should not "
"start %2 on this computer unless you are sure that %1 is "
"not running on %3.")
- .arg( oldProgramName, programName, oldHostName );
+ .tqarg( oldProgramName, programName, oldHostName );
}
KCursorSaver idle( KBusyPtr::idle() );
if ( KMessageBox::No ==
KMessageBox::warningYesNo( 0, msg, TQString(),
- i18n("Start %1").arg( programName ),
+ i18n("Start %1").tqarg( programName ),
i18n("Exit") ) ) {
exit(1);
}
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 3a5840a85..a066fc86e 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu()
action->plug( mPopupMenu );
mPopupMenu->insertSeparator();
- KMainWindow *mainWin = ::qt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget());
+ KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget());
mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) );
}
@@ -305,7 +305,7 @@ void KMSystemTray::foldersChanged()
void KMSystemTray::mousePressEvent(TQMouseEvent *e)
{
// switch to kmail on left mouse button
- if( e->button() == LeftButton )
+ if( e->button() == Qt::LeftButton )
{
if( mParentVisible && mainWindowIsOnCurrentDesktop() )
hideKMail();
@@ -314,7 +314,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e)
}
// open popup menu on right mouse button
- if( e->button() == RightButton )
+ if( e->button() == Qt::RightButton )
{
mPopupFolders.clear();
mPopupFolders.reserve( mFoldersWithUnread.count() );
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 335025b7d..46ed0efc9 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -145,7 +145,7 @@ void KMTransportInfo::writeConfig(int id)
"but should not be considered secure from decryption efforts "
"if access to the configuration file is obtained.\n"
"Do you want to store the password for account '%1' in the "
- "configuration file?").arg( name ),
+ "configuration file?").tqarg( name ),
i18n("KWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
@@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage()
label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 );
mSmtp.portEdit = new KLineEdit( page1 );
- mSmtp.portEdit->setValidator( new TQIntValidator(this) );
+ mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) );
TQWhatsThis::add(mSmtp.portEdit,
i18n("The port number that the SMTP server "
"is listening on. The default port is 25."));
@@ -498,7 +498,7 @@ void KMTransportDialog::makeSmtpPage()
TQWidget *page2 = new TQWidget( tabWidget );
tabWidget->addTab( page2, i18n("S&ecurity") );
TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() );
- mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Encryption"), page2 );
mSmtp.encryptionNone =
new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup );
@@ -510,7 +510,7 @@ void KMTransportDialog::makeSmtpPage()
TQT_SLOT(slotSmtpEncryptionChanged(int)));
vlay->addWidget( mSmtp.encryptionGroup );
- mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal,
+ mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Authentication Method"), page2 );
mSmtp.authLogin = new TQRadioButton( i18n("Please translate this "
"authentication method only if you have a good reason", "&LOGIN"),
@@ -756,7 +756,7 @@ void KMTransportDialog::slotSmtpCapabilities( const TQStringList & capaNormal,
<< authNone << ", " << authSSL << ", " << authTLS << " )" << endl;
mSmtp.encryptionNone->setEnabled( !capaNormal.isEmpty() );
mSmtp.encryptionSSL->setEnabled( !capaSSL.isEmpty() );
- mSmtp.encryptionTLS->setEnabled( capaNormal.findIndex("STARTTLS") != -1 );
+ mSmtp.encryptionTLS->setEnabled( capaNormal.tqfindIndex("STARTTLS") != -1 );
if ( authNone.isEmpty() && authSSL.isEmpty() && authTLS.isEmpty() ) {
// slave doesn't seem to support "* AUTH METHODS" metadata (or server can't do AUTH)
mAuthNone = authMethodsFromStringList( capaNormal );
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index 3c1e1304a..e126f3e56 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -174,7 +174,7 @@ void ListJob::slotListResult( KIO::Job* job )
if ( job->error() )
{
mAccount->handleJobError( job,
- i18n( "Error while listing folder %1: " ).arg((*it).path),
+ i18n( "Error while listing folder %1: " ).tqarg((*it).path),
true );
} else
{
@@ -230,7 +230,7 @@ void ListJob::slotListEntries( KIO::Job* job, const KIO::UDSEntryList& uds )
// Some servers send _lots_ of duplicates
// This check is too slow for huge lists
if ( mSubfolderPaths.count() > 100 ||
- mSubfolderPaths.findIndex(url.path()) == -1 )
+ mSubfolderPaths.tqfindIndex(url.path()) == -1 )
{
mSubfolderNames.append( name );
mSubfolderPaths.append( url.path() );
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index d05d64135..2fb6203db 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -59,13 +59,13 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
"topLayout" );
TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this );
- mlGroup->setColumnLayout( 0, TQt::Vertical );
+ mlGroup->setColumnLayout( 0, Qt::Vertical );
TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() );
topLayout->addWidget( mlGroup );
setMainWidget( mlGroup );
mHoldsMailingList = new TQCheckBox( i18n("&Folder holds a mailing list"), mlGroup );
- TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
+ connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(slotHoldsML(bool)) );
groupLayout->addMultiCellWidget( mHoldsMailingList, 0, 0, 0, 2 );
@@ -73,14 +73,14 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
mDetectButton = new TQPushButton( i18n("Detect Automatically"), mlGroup );
mDetectButton->setEnabled( false );
- TQObject::connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) );
+ connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) );
groupLayout->addWidget( mDetectButton, 2, 1 );
groupLayout->addItem( new TQSpacerItem( 0, 10 ), 3, 0 );
label = new TQLabel( i18n("Mailing list description:"), mlGroup );
label->setEnabled( false );
- TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
+ connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
label, TQT_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 4, 0 );
mMLId = new TQLabel( label, "", mlGroup );
@@ -90,7 +90,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
//FIXME: add TQWhatsThis
label = new TQLabel( i18n("Preferred handler:"), mlGroup );
label->setEnabled(false);
- TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
+ connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
label, TQT_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 5, 0 );
mMLHandlerCombo = new TQComboBox( mlGroup );
@@ -98,13 +98,13 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
mMLHandlerCombo->insertItem( i18n("Browser"), MailingList::Browser );
mMLHandlerCombo->setEnabled( false );
groupLayout->addMultiCellWidget( mMLHandlerCombo, 5, 5, 1, 2 );
- TQObject::connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)),
+ connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)),
TQT_SLOT(slotMLHandling(int)) );
label->setBuddy( mMLHandlerCombo );
label = new TQLabel( i18n("&Address type:"), mlGroup );
label->setEnabled(false);
- TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
+ connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
label, TQT_SLOT(setEnabled(bool)) );
groupLayout->addWidget( label, 6, 0 );
mAddressCombo = new TQComboBox( mlGroup );
@@ -119,9 +119,9 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
handleButton->setEnabled( false );
if( mFolder)
{
- TQObject::connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
+ connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)),
handleButton, TQT_SLOT(setEnabled(bool)) );
- TQObject::connect( handleButton, TQT_SIGNAL(clicked()),
+ connect( handleButton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotInvokeHandler()) );
}
groupLayout->addWidget( handleButton, 6, 2 );
@@ -140,7 +140,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget*
<< i18n( "List Archives" )
<< i18n( "List Help" );
mAddressCombo->insertStringList( el );
- TQObject::connect( mAddressCombo, TQT_SIGNAL(activated(int)),
+ connect( mAddressCombo, TQT_SIGNAL(activated(int)),
TQT_SLOT(slotAddressChanged(int)) );
load();
diff --git a/kmail/mailserviceimpl.h b/kmail/mailserviceimpl.h
index 0fbb415a9..9e25a4278 100644
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@@ -30,13 +30,12 @@
#ifndef MAILSERVICEIMPL_H
#define MAILSERVICEIMPL_H
+#include <tqcstring.h>
+
#include "interfaces/MailTransportServiceIface.h"
class TQString;
class KURL;
-template <typename T> class TQMemArray;
-typedef TQMemArray<char> TQByteArray;
-
namespace KMail {
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index b3018fea8..e306c7772 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -253,7 +253,7 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
u.setFileName( mContextMenuItem->text( 0 ) );
- if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).arg( u.fileName() ),
+ if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).tqarg( u.fileName() ),
i18n( "Delete Sieve Script Confirmation" ),
KStdGuiItem::del() )
!= KMessageBox::Continue )
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 897b03e67..c7c4af6ed 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -599,7 +599,7 @@ void MessageComposer::chiasmusEncryptAllAttachments() {
for ( TQValueVector<Attachment>::iterator it = mAttachments.begin(), end = mAttachments.end() ; it != end ; ++it ) {
KMMessagePart * part = it->part;
const TQString filename = part->fileName();
- if ( filename.endsWith( ".xia", false ) )
+ if ( filename.tqendsWith( ".xia", false ) )
continue; // already encrypted
const TQByteArray body = part->bodyDecodedBinary();
TQByteArray resultData;
@@ -1855,7 +1855,7 @@ void MessageComposer::addBodyAndAttachments( KMMessage* msg,
(void)msg->asDwMessage(); // Assemble the message. One gets a completely empty message otherwise :/
}
} else { // no attachments in the final message
- if( ourFineBodyPart.originalContentTypeStr() ) {
+ if( !ourFineBodyPart.originalContentTypeStr().isNull() ) {
msg->headers().ContentType().FromString( ourFineBodyPart.originalContentTypeStr() );
msg->headers().ContentType().Parse();
kdDebug(5006) << "MessageComposer::addBodyAndAttachments() : set top level Content-Type from originalContentTypeStr()=" << ourFineBodyPart.originalContentTypeStr() << endl;
@@ -1952,7 +1952,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
//kdDebug(5006) << "processStructuringInfo: mainHeader=" << mainHeader << endl;
DwString mainDwStr;
- mainDwStr = mainHeader + "\n\n";
+ mainDwStr = TQString(mainHeader + "\n\n");
DwBodyPart mainDwPa( mainDwStr, 0 );
mainDwPa.Parse();
KMMessage::bodyPart( &mainDwPa, &resultingPart );
@@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL,
i18n( "<qt><p>Error: The backend did not return "
"any encoded data.</p>"
"<p>Please report this bug:<br>%2</p></qt>" )
- .arg( bugURL ) );
+ .tqarg( bugURL ) );
bOk = false;
}
resultingPart.setBodyEncodedBinary( resultingBody );
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index b0d56a509..b400b52a6 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -224,7 +224,7 @@ namespace KMail {
"but should not be considered secure from decryption efforts "
"if access to the configuration file is obtained.\n"
"Do you want to store the password for account '%1' in the "
- "configuration file?").arg( name() ),
+ "configuration file?").tqarg( name() ),
i18n("KWallet Not Available"),
KGuiItem( i18n("Store Password") ),
KGuiItem( i18n("Do Not Store Password") ) )
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 6d1de7cda..d1e7de22f 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -66,7 +66,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* tqparent, KMFolder *folder )
{
setWFlags( getWFlags() | WDestructiveClose );
if ( mFolder ) {
- setCaption( i18n("New Subfolder of %1").arg( mFolder->prettyURL() ) );
+ setCaption( i18n("New Subfolder of %1").tqarg( mFolder->prettyURL() ) );
}
TQWidget* privateLayoutWidget = new TQWidget( this, "mTopLevelLayout" );
privateLayoutWidget->setGeometry( TQRect( 10, 10, 260, 80 ) );
@@ -213,14 +213,14 @@ void NewFolderDialog::slotOk()
&& ( selectedFolderDir == mFolder->tqparent() )
&& ( mFolder->storage()->name() == fldName ) ) ) )
{
- const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName);
+ const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName);
KMessageBox::error( this, message );
return;
}
/* Ok, obvious errors caught, let's try creating it for real. */
const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>."
- "</qt> " ).arg(fldName);
+ "</qt> " ).tqarg(fldName);
TQString namespaceName;
if ( mNamespacesComboBox ) {
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 80c182d98..2cb44ab9b 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -272,7 +272,7 @@ namespace KMail {
ProcessResult processResult;
if ( mReader ) {
- htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) );
+ htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) );
}
if ( const Interface::BodyPartFormatter * formatter
@@ -686,11 +686,11 @@ namespace KMail {
switch ( cryptPlugError ) {
case NOT_INITIALIZED:
errorMsg = i18n( "Crypto plug-in \"%1\" is not initialized." )
- .arg( cryptPlugLibName );
+ .tqarg( cryptPlugLibName );
break;
case CANT_VERIFY_SIGNATURES:
errorMsg = i18n( "Crypto plug-in \"%1\" cannot verify signatures." )
- .arg( cryptPlugLibName );
+ .tqarg( cryptPlugLibName );
break;
case NO_PLUGIN:
if ( cryptPlugDisplayName.isEmpty() )
@@ -698,14 +698,14 @@ namespace KMail {
else
errorMsg = i18n( "%1 is either 'OpenPGP' or 'S/MIME'",
"No %1 plug-in was found." )
- .arg( cryptPlugDisplayName );
+ .tqarg( cryptPlugDisplayName );
break;
}
messagePart.errorText = i18n( "The message is signed, but the "
"validity of the signature cannot be "
"verified.<br />"
"Reason: %1" )
- .arg( errorMsg );
+ .tqarg( errorMsg );
}
if ( mReader )
@@ -887,9 +887,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
+ "</div>";
if ( !passphraseError )
aErrorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.")
- .arg( cryptPlugLibName )
+ .tqarg( cryptPlugLibName )
+ "<br />"
- + i18n("Error: %1").arg( aErrorText );
+ + i18n("Error: %1").tqarg( aErrorText );
}
}
}
@@ -901,11 +901,11 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
switch ( cryptPlugError ) {
case NOT_INITIALIZED:
aErrorText = i18n( "Crypto plug-in \"%1\" is not initialized." )
- .arg( cryptPlugLibName );
+ .tqarg( cryptPlugLibName );
break;
case CANT_DECRYPT:
aErrorText = i18n( "Crypto plug-in \"%1\" cannot decrypt messages." )
- .arg( cryptPlugLibName );
+ .tqarg( cryptPlugLibName );
break;
case NO_PLUGIN:
aErrorText = i18n( "No appropriate crypto plug-in was found." );
@@ -944,7 +944,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
while ( httpPos >= 0 ) {
// look backwards for "href"
if ( httpPos > 5 ) {
- int hrefPos = str.findRev( "href", httpPos - 5, true );
+ int hrefPos = str.tqfindRev( "href", httpPos - 5, true );
// if no 'href' is found or the distance between 'href' and '"http[s]:'
// is larger than 7 (7 is the distance in 'href = "http[s]:') then
// we assume that we have found an external reference
@@ -979,12 +979,12 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data,
// We must fo this, or else we will see only 1st inlined html
// attachment. It is IMHO enough to search only for </BODY> and
// put \0 there.
- int i = cstr.findRev("</body>", -1, false); //case insensitive
+ int i = cstr.tqfindRev("</body>", -1, false); //case insensitive
if ( 0 <= i )
cstr.truncate(i);
else // just in case - search for </html>
{
- i = cstr.findRev("</html>", -1, false); //case insensitive
+ i = cstr.tqfindRev("</html>", -1, false); //case insensitive
if ( 0 <= i ) cstr.truncate(i);
}
// ---Sven's strip </BODY> and </HTML> from end of attachment end-
@@ -1047,21 +1047,21 @@ namespace KMail {
const TQCString delimZ2("--__--__--\n\n_____________");
const TQCString delimZ1("--__--__--\r\n\r\n_____________");
TQCString partStr, digestHeaderStr;
- int thisDelim = cstr.tqfind(delim1, 0, false);
+ int thisDelim = cstr.tqfind(TQString(delim1), 0, false);
if ( thisDelim == -1 )
- thisDelim = cstr.tqfind(delim2, 0, false);
+ thisDelim = cstr.tqfind(TQString(delim2), 0, false);
if ( thisDelim == -1 ) {
kdDebug(5006) << " Sorry: Old style Mailman message but no delimiter found." << endl;
return false;
}
- int nextDelim = cstr.tqfind(delim1, thisDelim+1, false);
+ int nextDelim = cstr.tqfind(TQString(delim1), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delim2, thisDelim+1, false);
+ nextDelim = cstr.tqfind(TQString(delim2), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delimZ1, thisDelim+1, false);
+ nextDelim = cstr.tqfind(TQString(delimZ1), thisDelim+1, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delimZ2, thisDelim+1, false);
+ nextDelim = cstr.tqfind(TQString(delimZ2), thisDelim+1, false);
if ( nextDelim < 0)
return false;
@@ -1101,7 +1101,7 @@ namespace KMail {
partStr += cstr.mid( thisDelim, nextDelim-thisDelim );
TQCString subject("embedded message");
TQCString subSearch("\nSubject:");
- int subPos = partStr.tqfind(subSearch, 0, false);
+ int subPos = partStr.tqfind(TQString(subSearch), 0, false);
if ( -1 < subPos ){
subject = partStr.mid(subPos+subSearch.length());
thisEoL = subject.tqfind('\n');
@@ -1114,13 +1114,13 @@ namespace KMail {
subject, true );
//mReader->queueHtml("<br><hr><br>");
thisDelim = nextDelim+1;
- nextDelim = cstr.tqfind(delim1, thisDelim, false);
+ nextDelim = cstr.tqfind(TQString(delim1), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delim2, thisDelim, false);
+ nextDelim = cstr.tqfind(TQString(delim2), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delimZ1, thisDelim, false);
+ nextDelim = cstr.tqfind(TQString(delimZ1), thisDelim, false);
if ( -1 == nextDelim )
- nextDelim = cstr.tqfind(delimZ2, thisDelim, false);
+ nextDelim = cstr.tqfind(TQString(delimZ2), thisDelim, false);
}
// reset curent node's Content-Type
curNode->setType( DwMime::kTypeText );
@@ -1656,7 +1656,7 @@ namespace KMail {
const GpgME::ImportResult res = import->exec( certData );
if ( res.error() ) {
htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>"
- "Reason: %1").arg( TQString::fromLocal8Bit( res.error().asString() ) ) );
+ "Reason: %1").tqarg( TQString::fromLocal8Bit( res.error().asString() ) ) );
return true;
}
@@ -1696,14 +1696,14 @@ namespace KMail {
for ( std::vector<GpgME::Import>::const_iterator it = imports.begin() ; it != imports.end() ; ++it ) {
if ( (*it).error() )
htmlWriter()->queue( i18n( "Failed: %1 (%2)" )
- .arg( (*it).fingerprint(),
+ .tqarg( (*it).fingerprint(),
TQString::fromLocal8Bit( (*it).error().asString() ) ) );
else if ( (*it).status() & ~GpgME::Import::ContainedSecretKey ) {
if ( (*it).status() & GpgME::Import::ContainedSecretKey ) {
- htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).arg( (*it).fingerprint() ) );
+ htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).tqarg( (*it).fingerprint() ) );
}
else {
- htmlWriter()->queue( i18n( "New or changed: %1" ).arg( (*it).fingerprint() ) );
+ htmlWriter()->queue( i18n( "New or changed: %1" ).tqarg( (*it).fingerprint() ) );
}
}
htmlWriter()->queue( "<br>" );
@@ -2054,7 +2054,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR
TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum );
- TQString href = TQString( "attachment:%1?place=body" ).arg( partNum );
+ TQString href = TQString( "attachment:%1?place=body" ).tqarg( partNum );
TQString iconName;
if( inlineImage )
@@ -2280,7 +2280,7 @@ static TQString writeSimpleSigstatHeader( const PartMetaData &block )
if ( addr.isEmpty() ) {
html += i18n( "Signature is valid." );
} else {
- html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).arg( addr, name );
+ html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).tqarg( addr, name );
}
} else {
// should not happen
@@ -2307,7 +2307,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString &
//kdDebug(5006) << "makeShowAuditLogLink: not showing link (not available)" << endl;
return i18n("No Audit Log available");
} else {
- return i18n("Error Retrieving Audit Log: %1").arg( TQString::fromLocal8Bit( err.asString() ) );
+ return i18n("Error Retrieving Audit Log: %1").tqarg( TQString::fromLocal8Bit( err.asString() ) );
}
}
@@ -2371,7 +2371,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
else {
htmlStr += i18n("Encrypted message (decryption not possible)");
if( !block.errorText.isEmpty() )
- htmlStr += "<br />" + i18n("Reason: %1").arg( block.errorText );
+ htmlStr += "<br />" + i18n("Reason: %1").tqarg( block.errorText );
}
htmlStr += "</td></tr><tr class=\"encrB\"><td>";
}
@@ -2428,13 +2428,13 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
if( isSMIME )
startKeyHREF =
TQString("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">")
- .arg( cryptProto->displayName(),
+ .tqarg( cryptProto->displayName(),
cryptProto->name(),
block.keyId );
TQString keyWithWithoutURL
= isSMIME
? TQString("%1%2</a>")
- .arg( startKeyHREF,
+ .tqarg( startKeyHREF,
cannotCheckSignature ? i18n("[Details]") : ("0x" + block.keyId) )
: "0x" + TQString::fromUtf8( block.keyId );
@@ -2486,7 +2486,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
i18n("Warning:") +
"</u> " +
i18n("Sender's mail address is not stored "
- "in the %1 used for signing.").arg(certificate) +
+ "in the %1 used for signing.").tqarg(certificate) +
"<br />" +
i18n("sender: ") +
msgFrom +
@@ -2512,7 +2512,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
"</u> " +
i18n("No mail address is stored in the %1 used for signing, "
"so we cannot compare it to the sender's address %2.")
- .arg(certificate,msgFrom);
+ .tqarg(certificate,msgFrom);
}
if( !greenCaseWarning.isEmpty() ) {
if( !statusStr.isEmpty() )
@@ -2535,7 +2535,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
if( cannotCheckSignature ) {
htmlStr += i18n( "Not enough information to check "
"signature. %1" )
- .arg( keyWithWithoutURL );
+ .tqarg( keyWithWithoutURL );
}
else {
@@ -2553,26 +2553,26 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
htmlStr += i18n( "Message was signed with unknown key." );
else
htmlStr += i18n( "Message was signed by %1." )
- .arg( signer );
+ .tqarg( signer );
} else {
TQDateTime created = block.creationTime;
if( created.isValid() ) {
if( signer.isEmpty() ) {
if( onlyShowKeyURL )
htmlStr += i18n( "Message was signed with key %1." )
- .arg( keyWithWithoutURL );
+ .tqarg( keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed on %1 with key %2." )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .tqarg( KGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL );
}
else {
if( onlyShowKeyURL )
htmlStr += i18n( "Message was signed with key %1." )
- .arg( keyWithWithoutURL );
+ .tqarg( keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed by %3 on %1 with key %2" )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .tqarg( KGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL,
signer );
}
@@ -2580,10 +2580,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
else {
if( signer.isEmpty() || onlyShowKeyURL )
htmlStr += i18n( "Message was signed with key %1." )
- .arg( keyWithWithoutURL );
+ .tqarg( keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed by %2 with key %1." )
- .arg( keyWithWithoutURL,
+ .tqarg( keyWithWithoutURL,
signer );
}
}
@@ -2621,11 +2621,11 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
TQDateTime created = block.creationTime;
if ( created.isValid() )
htmlStr += i18n( "Message was signed on %1 with unknown key %2." )
- .arg( KGlobal::locale()->formatDateTime( created ),
+ .tqarg( KGlobal::locale()->formatDateTime( created ),
keyWithWithoutURL );
else
htmlStr += i18n( "Message was signed with unknown key %1." )
- .arg( keyWithWithoutURL );
+ .tqarg( keyWithWithoutURL );
}
else
htmlStr += i18n( "Message was signed with unknown key." );
@@ -2663,10 +2663,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
simpleHtmlStr += writeSimpleSigstatHeader( block );
if( !block.keyId.isEmpty() )
htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." )
- .arg( keyWithWithoutURL,
+ .tqarg( keyWithWithoutURL,
signer );
else
- htmlStr += i18n( "Message was signed by %1." ).arg( signer );
+ htmlStr += i18n( "Message was signed by %1." ).tqarg( signer );
htmlStr += "<br />";
switch( block.keyTrust )
@@ -2707,10 +2707,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
simpleHtmlStr += writeSimpleSigstatHeader( block );
if( !block.keyId.isEmpty() )
htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." )
- .arg( keyWithWithoutURL,
+ .tqarg( keyWithWithoutURL,
signer );
else
- htmlStr += i18n( "Message was signed by %1." ).arg( signer );
+ htmlStr += i18n( "Message was signed by %1." ).tqarg( signer );
htmlStr += "<br />";
htmlStr += i18n("Warning: The signature is bad.");
frame = "</td></tr>"
@@ -2763,7 +2763,7 @@ void ObjectTreeParser::writeAttachmentMarkHeader( partNode *node )
if ( !mReader )
return;
- htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).arg( node->nodeId() ) );
+ htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).tqarg( node->nodeId() ) );
}
//-----------------------------------------------------------------------------
@@ -2798,7 +2798,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a
bool isPgpMessage = false; // true if the message contains at least one
// PGP MESSAGE or one PGP SIGNED MESSAGE block
TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" );
- TQString headerStr = TQString("<div dir=\"%1\">").arg(dir);
+ TQString headerStr = TQString("<div dir=\"%1\">").tqarg(dir);
inlineSignatureState = KMMsgNotSigned;
inlineEncryptionState = KMMsgNotEncrypted;
@@ -2970,7 +2970,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
const unsigned int length = s.length();
// skip leading empty lines
- for ( pos = 0; pos < length && s[pos] <= ' '; pos++ ) { ; }
+ for ( pos = 0; pos < length && s.tqat(pos) <= TQChar(' '); pos++ ) { ; }
while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--;
beg = pos;
@@ -3051,8 +3051,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
htmlStr += "<div class=\"quotelevelmark\" >" ;
htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">"
"<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
- .arg(-1)
- .arg( mExpandIcon );
+ .tqarg(-1)
+ .tqarg( mExpandIcon );
htmlStr += "</div><br/>";
htmlStr += quoteEnd;
}
@@ -3060,8 +3060,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
htmlStr += "<div class=\"quotelevelmark\" >" ;
htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">"
"<img src=\"%2\" alt=\"\" title=\"\"/></a>" )
- .arg(actQuoteLevel)
- .arg( mCollapseIcon);
+ .tqarg(actQuoteLevel)
+ .tqarg( mCollapseIcon);
htmlStr += "</div>";
if ( actQuoteLevel < 3 )
htmlStr += quoteFontTag[actQuoteLevel];
@@ -3085,7 +3085,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate )
// ignore ^M DOS linebreaks
if( !line.tqreplace('\015', "").isEmpty() )
{
- htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" );
+ htmlStr +=TQString( "<div dir=\"%1\">" ).tqarg( line.isRightToLeft() ? "rtl":"ltr" );
htmlStr += LinkLocator::convertToHtml( line, convertFlags );
htmlStr += TQString( "</div>" );
}
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 96bb32c59..de5e2d89e 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -2,7 +2,7 @@
partNode.cpp A node in a MIME tree.
This file is part of KMail, the KDE mail client.
- Copyright (c) 2002 Klarälvdalens Datakonsult AB
+ Copyright (c) 2002 Klar�lvdalens Datakonsult AB
KMail is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
@@ -167,7 +167,7 @@ partNode::~partNode() {
#ifndef NDEBUG
void partNode::dump( int chars ) const {
- kdDebug(5006) << nodeId() << " " << TQString().fill( ' ', chars ) << "+ "
+ kdDebug(5006) << nodeId() << " " << TQString(TQString().fill( ' ', chars )) << "+ "
<< typeString() << '/' << subTypeString() << " embedded:" << mDisplayedEmbedded
<< " address:" << this << endl;
if ( mChild )
@@ -693,7 +693,7 @@ KMail::Interface::BodyPartMemento * partNode::internalBodyPartMemento( const TQC
{
assert( !reader() );
- const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.tqfind( which.lower() );
+ const std::map<TQCString,KMail::Interface::BodyPartMemento*>::const_iterator it = mBodyPartMementoMap.find( which.lower() );
return it != mBodyPartMementoMap.end() ? it->second : 0 ;
}
@@ -746,7 +746,7 @@ void partNode::setDisplayedHidden( bool displayedHidden )
TQString partNode::asHREF( const TQString &place ) const
{
- return TQString( "attachment:%1?place=%2" ).arg( nodeId() ).arg( place );
+ return TQString( "attachment:%1?place=%2" ).tqarg( nodeId() ).tqarg( place );
}
partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const
diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp
index 45ce28620..d7e6c95d0 100644
--- a/kmail/partnodebodypart.cpp
+++ b/kmail/partnodebodypart.cpp
@@ -49,8 +49,8 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const {
static const int utf8 = 106;
// FIXME: use a PRNG for the first arg, instead of a serial number
return TQString( "x-kmail:/bodypart/%1/%2/%3" )
- .arg( serial++ ).arg( mPartNode.nodeId() )
- .arg( KURL::encode_string_no_slash( path, utf8 ) );
+ .tqarg( serial++ ).tqarg( mPartNode.nodeId() )
+ .tqarg( KURL::encode_string_no_slash( path, utf8 ) );
}
TQString KMail::PartNodeBodyPart::asText() const {
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index b2f55528f..99befb43b 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive)
}
TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
- mHost + ":" + TQString("%1").arg(mPort) );
+ mHost + ":" + TQString("%1").tqarg(mPort) );
KConfig config( seenUidList );
TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" );
TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" );
@@ -370,7 +370,7 @@ void PopAccount::startJob()
if (!runPrecommand(precommand()))
{
KMessageBox::sorry(0,
- i18n("Could not execute precommand: %1").arg(precommand()),
+ i18n("Could not execute precommand: %1").tqarg(precommand()),
i18n("KMail Error Message"));
checkDone( false, CheckError );
return;
@@ -401,7 +401,7 @@ void PopAccount::startJob()
mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem(
"MailCheck" + mName,
escapedName,
- i18n("Preparing transmission from \"%1\"...").arg( escapedName ),
+ i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ),
true, // can be canceled
useSSL() || useTLS() );
connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
@@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() {
"the UIDL command: this command is required to determine, in a reliable way, "
"which of the mails on the server KMail has already seen before;\n"
"the feature to leave the mails on the server will therefore not "
- "work properly.").arg(NetworkAccount::name()) );
+ "work properly.").tqarg(NetworkAccount::name()) );
// An attempt to work around buggy pop servers, these seem to be popular.
mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict;
}
@@ -751,7 +751,7 @@ void PopAccount::slotJobFinished() {
i18n( "Fetched 1 message from %1. Deleting messages from server...",
"Fetched %n messages from %1. Deleting messages from server...",
numMsgs )
- .arg( mHost ) );
+ .tqarg( mHost ) );
url.setPath("/remove/" + idsOfMsgsToDelete.join(","));
kdDebug(5006) << "url: " << url.prettyURL() << endl;
} else {
@@ -761,7 +761,7 @@ void PopAccount::slotJobFinished() {
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
- .arg( mHost ) );
+ .tqarg( mHost ) );
url.setPath(TQString("/commit"));
kdDebug(5006) << "url: " << url.prettyURL() << endl;
}
@@ -781,7 +781,7 @@ void PopAccount::slotJobFinished() {
i18n( "Fetched 1 message from %1. Terminating transmission...",
"Fetched %n messages from %1. Terminating transmission...",
numMsgs )
- .arg( mHost ) );
+ .tqarg( mHost ) );
KURL url = getUrl();
url.setPath(TQString("/commit"));
job = KIO::get( url, false, false );
@@ -841,7 +841,7 @@ void PopAccount::saveUidList()
seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] );
}
TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" +
- mHost + ":" + TQString("%1").arg(mPort) );
+ mHost + ":" + TQString("%1").tqarg(mPort) );
KConfig config( seenUidList );
config.writeEntry( "seenUidList", uidsOfNextSeenMsgs );
config.writeEntry( "seenUidTimeList", seenUidTimeList );
@@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg()
curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly );
curMsgLen = nextLen;
++indexOfCurrentMsg;
- kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl;
+ kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl;
mMsgsPendingDownload.remove( next.key() );
}
}
@@ -904,14 +904,14 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data)
{
msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 "
"(%7 KB remain on the server).")
- .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
- .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024);
+ .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
+ .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024);
}
else
{
msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.")
- .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024)
- .arg(numBytesToRead/1024).arg(mLogin).arg(mHost);
+ .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024)
+ .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost);
}
mMailCheckProgressItem->setqStatus( msg );
mMailCheckProgressItem->setProgress(
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index e53a4f18e..58b2af575 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -73,8 +73,8 @@ class QuotaInfo {
if ( isValid() && !isEmpty() ) {
readConfig();
int factor = static_cast<int> ( pow( 1000, mFactor ) );
- return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor )
- .arg( mMax.toInt() / factor ).arg( mUnits );
+ return i18n("%1 of %2 %3 used").tqarg( mCurrent.toInt() / factor )
+ .tqarg( mMax.toInt() / factor ).tqarg( mUnits );
}
return TQString();
}
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 273ba923c..5e8175dcf 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str,
if ( count++ > GlobalSettings::self()->maximumRecipients() ) {
KMessageBox::sorry( this,
i18n("Truncating recipients list to %1 of %2 entries.")
- .arg( GlobalSettings::self()->maximumRecipients() )
- .arg( r.count() ) );
+ .tqarg( GlobalSettings::self()->maximumRecipients() )
+ .tqarg( r.count() ) );
break;
}
addRecipient( *it, type );
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 38b00d14b..0bbacbeae 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -103,7 +103,7 @@ void RecipientItem::setAddressee( const KABC::Addressee &a,
TQImage img = a.photo().data();
if ( !img.isNull() )
- mIcon = img.smoothScale( 20, 20, TQImage::ScaleMin );
+ mIcon = img.smoothScale( 20, 20, TQ_ScaleMin );
else
mIcon = KGlobal::iconLoader()->loadIcon( "personal", KIcon::Small );
@@ -783,7 +783,7 @@ void RecipientsPicker::pick( Recipient::Type type )
"recipients is %1. Please adapt the selection.",
"You selected %n recipients. The maximum supported number of "
"recipients is %1. Please adapt the selection.", count)
- .arg( GlobalSettings::self()->maximumRecipients() ) );
+ .tqarg( GlobalSettings::self()->maximumRecipients() ) );
return;
}
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 97aef16f3..1d4d3b992 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -120,7 +120,7 @@ namespace KMail {
void RegExpLineEdit::slotEditRegExp()
{
if ( !mRegExpEditDialog )
- mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
+ mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
KRegExpEditorInterface *iface =
static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->qt_cast( "KRegExpEditorInterface" ) );
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index b3e211fa0..18a848149 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createFunctionWidget( i, functionStack, receiver ) );
++i ) {
- if ( childCount( functionStack, w->name() ) < 2 ) {
+ if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
functionStack->addWidget( w );
}
@@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0;
( w = (*it)->createValueWidget( i, valueStack, receiver ) );
++i ) {
- if ( childCount( valueStack, w->name() ) < 2 ) {
+ if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget
valueStack->addWidget( w );
}
@@ -360,15 +360,15 @@ namespace {
TQObject* TQObject_child_const( const TQObject *tqparent,
const char *objName )
{
- const TQObjectList *list = tqparent->tqchildren();
- if ( !list )
+ const TQObjectList list = tqparent->childrenListObject();
+ if ( list.isEmpty() )
return 0;
- TQObjectListIterator it( *list );
+ TQObjectListIterator it( list );
TQObject *obj;
while ( ( obj = it.current() ) ) {
++it;
- if ( !objName || qstrcmp( objName, obj->name() ) == 0 )
+ if ( !objName || tqstrcmp( objName, obj->name() ) == 0 )
break;
}
return obj;
@@ -472,7 +472,7 @@ namespace {
KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
"textRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo",
@@ -503,7 +503,7 @@ namespace {
if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory ) {
const TQComboBox *combo=
- dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
"categoryCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo",
@@ -520,7 +520,7 @@ namespace {
//in other cases of func it is a lineedit
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -646,15 +646,15 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
TQWidget *w =
- static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
+ TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
TQComboBox *combo =
- static_cast<TQComboBox*>( valueStack->child( "categoryCombo",
- 0, false ) );
+ static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo",
+ 0, false )) );
combo->blockSignals( true );
for ( i = 0; i < combo->count(); ++i )
if ( rule->contents() == combo->text( i ) ) {
@@ -692,7 +692,7 @@ namespace {
{
// raise the correct function widget
functionStack->raiseWidget(
- static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo",
+ TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -700,13 +700,13 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) {
valueStack->raiseWidget(
- static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
+ TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
0, false ) ) );
}
else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) {
valueStack->raiseWidget(
- static_cast<TQWidget*>( valueStack->child( "categoryCombo",
+ TQT_TQWIDGET( valueStack->child( "categoryCombo",
0, false ) ) );
}
else {
@@ -794,7 +794,7 @@ namespace {
KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
"messageRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo",
@@ -825,7 +825,7 @@ namespace {
KMSearchRule::Function ) const
{
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -947,7 +947,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
+ TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -978,7 +978,7 @@ namespace {
return false;
// raise the correct function widget
functionStack->raiseWidget(
- static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo",
+ TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
@@ -986,7 +986,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w =
- static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
+ TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
0, false ) );
valueStack->raiseWidget( w );
}
@@ -1068,7 +1068,7 @@ namespace {
KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
"statusRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo",
@@ -1098,7 +1098,7 @@ namespace {
int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
{
const TQComboBox *statusCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
"statusRuleValueCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo",
@@ -1249,12 +1249,12 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo",
+ TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
valueStack->raiseWidget(
- static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo",
+ TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo",
0, false ) ) );
return true;
}
@@ -1323,7 +1323,7 @@ namespace {
KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
+ dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
"numericRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo",
@@ -1353,7 +1353,7 @@ namespace {
TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const
{
const KIntNumInput *numInput =
- dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack,
+ dynamic_cast<KIntNumInput*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
"KIntNumInput" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput",
@@ -1502,7 +1502,7 @@ namespace {
// raise the correct function widget
functionStack->raiseWidget(
- static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo",
+ TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo",
0, false ) ) );
// raise the correct value widget
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index cabae0fd5..a9eb35365 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -252,7 +252,7 @@ void SearchJob::slotSearchFolder()
// so we need to download all messages and check
TQString question = i18n("To execute your search all messages of the folder %1 "
"have to be downloaded from the server. This may take some time. "
- "Do you want to continue your search?").arg( mFolder->label() );
+ "Do you want to continue your search?").tqarg( mFolder->label() );
if ( KMessageBox::warningContinueCancel( 0, question,
i18n("Continue Search"), i18n("&Search"),
"continuedownloadingforsearch" ) != KMessageBox::Continue )
@@ -267,7 +267,7 @@ void SearchJob::slotSearchFolder()
mProgress = ProgressManager::createProgressItem(
"ImapSearchDownload" + ProgressManager::getUniqueID(),
i18n("Downloading emails from IMAP server"),
- i18n( "URL: %1" ).arg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ),
+ i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ),
true,
mAccount->useSSL() || mAccount->useTLS() );
mProgress->setTotalItems( numMsgs );
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index ee7e090bf..24d08a069 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -188,8 +188,8 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
if ( list )
object = list->first();
delete list;
- if (!searchFolder && object && ::qt_cast<TQComboBox*>(object))
- static_cast<TQComboBox*>(object)->setCurrentText("Subject");
+ if (!searchFolder && object && ::tqqt_cast<TQComboBox*>(object))
+ static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText("Subject");
vbl->addWidget( mPatternEdit );
@@ -199,7 +199,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
mChkSubFolders, TQT_SLOT(setEnabled(bool)) );
connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(setEnabledSearchButton(bool)) );
+ TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) );
mLbxMatches = new MatchListView(searchWidget, this, "Find Messages");
@@ -237,13 +237,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mLbxMatches->setDragEnabled( true );
connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)),
- this, TQT_SLOT(slotShowMsg(TQListViewItem *)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- this, TQT_SLOT(slotViewMsg(TQListViewItem *)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)),
- this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
- this, TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
+ TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
vbl->addWidget( mLbxMatches );
TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" );
@@ -261,16 +261,16 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mSearchFolderOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchFolderOpenBtn);
connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)),
- this, TQT_SLOT( scheduleRename( const TQString & )));
+ TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & )));
connect( &mRenameTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( renameSearchFolder() ));
+ TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() ));
connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( openSearchFolder() ));
+ TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() ));
mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget);
mSearchResultOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchResultOpenBtn);
connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( slotViewSelectedMsg() ));
+ TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() ));
mStatusBar = new KStatusBar(searchWidget);
mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
mStatusBar->changeItem(i18n("Ready."), 0);
@@ -286,7 +286,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
resize(mainWidth, mainHeight);
setMainWidget(searchWidget);
- setButtonBoxOrientation(TQWidget::Vertical);
+ setButtonBoxOrientation(Qt::Vertical);
mBtnSearch = actionButton(KDialogBase::User1);
mBtnStop = actionButton(KDialogBase::User2);
@@ -294,12 +294,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch()));
connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop()));
- connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(deleteLater()));
+ connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater()));
// give focus to the value field of the first search rule
object = mPatternEdit->child( "regExpLineEdit" );
if ( object && object->isWidgetType() ) {
- static_cast<TQWidget*>(object)->setFocus();
+ TQT_TQWIDGET(object)->setFocus();
//kdDebug(5006) << "SearchWindow: focus has been given to widget "
// << object->name() << endl;
}
@@ -309,13 +309,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
//set up actions
KActionCollection *ac = actionCollection();
ac->setWidget( this );
- mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", 0, this,
+ mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
mReplyAllAction = new KAction( i18n("Reply to &All..."), "mail_replyall",
- 0, this, TQT_SLOT(slotReplyAllToMsg()),
+ 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()),
ac, "search_reply_all" );
mReplyListAction = new KAction( i18n("Reply to Mailing-&List..."),
- "mail_replylist", 0, this,
+ "mail_replylist", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotReplyListToMsg()), ac,
"search_reply_list" );
mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"),
@@ -324,11 +324,11 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardInlineMsg()) );
mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardAttachedMsg()), ac,
"search_message_forward_as_attachment" );
mForwardInlineAction = new KAction( i18n("&Inline..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardInlineMsg()), ac,
"search_message_forward_inline" );
if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
@@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
}
mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotForwardDigestMsg()), ac,
"search_message_forward_as_digest" );
mForwardActionMenu->insert( mForwardDigestAction );
mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."),
- "mail_forward", 0, this,
+ "mail_forward", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRedirectMsg()), ac,
"search_message_forward_redirect" );
mForwardActionMenu->insert( mRedirectAction );
- mSaveAsAction = KStdAction::saveAs( this, TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
+ mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
mSaveAtchAction = new KAction( i18n("Save Attachments..."), "attach", 0,
- this, TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
+ TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
- mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrintMsg()), ac, "search_print" );
- mClearAction = new KAction( i18n("Clear Selection"), 0, 0, this,
+ mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" );
+ mClearAction = new KAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
- mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
- mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
+ mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
+ mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
- connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updtqStatus()));
+ connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updtqStatus()));
connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
- this, TQT_SLOT(folderInvalidated(KMFolder*)));
+ TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*)));
connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)),
- this, TQT_SLOT(slotFolderActivated()));
+ TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated()));
}
@@ -418,17 +418,17 @@ void SearchWindow::updtqStatus(void)
if(!mStopped) {
genMsg = i18n("Done.");
detailMsg = i18n("%n match in %1", "%n matches in %1",
- numMatches).arg(procMsg);
+ numMatches).tqarg(procMsg);
} else {
genMsg = i18n("Search canceled.");
detailMsg = i18n("%n match so far in %1", "%n matches so far in %1",
- numMatches).arg(procMsg);
+ numMatches).tqarg(procMsg);
}
} else {
procMsg = i18n("%n message", "%n messages", numProcessed);
genMsg = i18n("%n match", "%n matches", numMatches);
detailMsg = i18n("Searching in %1. %2 searched so far")
- .arg(folderName).arg(procMsg);
+ .tqarg(folderName).tqarg(procMsg);
}
mStatusBar->changeItem(genMsg, 0);
@@ -497,7 +497,7 @@ void SearchWindow::slotSearch()
while ((folder = mgr->tqfind(fullName))) {
if (folder->storage()->inherits("KMFolderSearch"))
break;
- fullName = TQString("%1 %2").arg(baseName).arg(++count);
+ fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count);
}
if (!folder)
@@ -508,17 +508,17 @@ void SearchWindow::slotSearch()
}
mFolder->stopSearch();
disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(slotAddMsg(int)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
connect(mFolder, TQT_SIGNAL(msgAdded(int)),
- this, TQT_SLOT(slotAddMsg(int)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int)));
connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
- this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
+ TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
mSearchFolderEdt->setEnabled(false);
KMSearch *search = new KMSearch();
connect(search, TQT_SIGNAL(finished(bool)),
- this, TQT_SLOT(searchDone()));
+ TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
if (mChkbxAllFolders->isChecked()) {
search->setRecursive(true);
} else {
@@ -543,7 +543,7 @@ void SearchWindow::searchDone()
mTimer->stop();
updtqStatus();
- TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI()));
if(mLastFocus)
mLastFocus->setFocus();
if (mCloseRequested)
@@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e)
//Cancel search in progress by setting the search folder search to
//the null search
mFolder->setSearch(new KMSearch());
- TQTimer::singleShot(0, this, TQT_SLOT(slotClose()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
} else {
KDialogBase::closeEvent(e);
}
@@ -677,7 +677,7 @@ void SearchWindow::folderInvalidated(KMFolder *folder)
mLbxMatches->clear();
if (mFolder->search())
connect(mFolder->search(), TQT_SIGNAL(finished(bool)),
- this, TQT_SLOT(searchDone()));
+ TQT_TQOBJECT(this), TQT_SLOT(searchDone()));
mTimer->start(200);
enableGUI();
}
@@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint
mMenuToFolder.clear();
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage,
- this, &mMenuToFolder, msgMoveMenu );
+ TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu );
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage,
- this, &mMenuToFolder, msgCopyMenu );
+ TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu );
// show most used actions
mReplyAction->plug(menu);
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index d29b732d5..75d07495d 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -253,7 +253,7 @@ void SieveDebugDialog::slotDiagNextAccount()
KMAccount *acc = mAccountList.first();
mAccountList.pop_front();
- mEdit->append( i18n( "Collecting data for account '%1'...\n" ).arg( acc->name() ) );
+ mEdit->append( i18n( "Collecting data for account '%1'...\n" ).tqarg( acc->name() ) );
mEdit->append( i18n( "------------------------------------------------------------\n" ) );
mAccountBase = dynamic_cast<KMail::ImapAccountBase *>( acc );
if ( mAccountBase )
@@ -295,7 +295,7 @@ void SieveDebugDialog::slotDiagNextScript()
TQString scriptFile = mScriptList.first();
mScriptList.pop_front();
- mEdit->append( i18n( "Contents of script '%1':\n" ).arg( scriptFile ) );
+ mEdit->append( i18n( "Contents of script '%1':\n" ).tqarg( scriptFile ) );
mUrl = urlFromAccount( mAccountBase );
mUrl.setFileName( scriptFile );
@@ -324,7 +324,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success,
mEdit->append( i18n(
"------------------------------------------------------------\n"
"%1\n"
- "------------------------------------------------------------\n\n" ).arg( script ) );
+ "------------------------------------------------------------\n\n" ).tqarg( script ) );
}
// Fetch next script
@@ -363,7 +363,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success,
for ( TQStringList::const_iterator it = scriptList.begin(); it != scriptList.end(); ++it )
mEdit->append( "* " + *it + "\n" );
mEdit->append( "\n" );
- mEdit->append( i18n( "Active script: %1\n\n" ).arg( activeScript ) );
+ mEdit->append( i18n( "Active script: %1\n\n" ).tqarg( activeScript ) );
}
// Handle next job: dump scripts for this server
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index ac8d0ebf4..12da05014 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -145,9 +145,9 @@ void SnippetWidget::slotAdd()
SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& name, const TQString& text, const KShortcut& shortcut )
{
SnippetItem * item = new SnippetItem(tqparent, name, text);
- const TQString actionName = i18n("Snippet %1").arg(name);
+ const TQString actionName = i18n("Snippet %1").tqarg(name);
const TQString normalizedName = TQString(actionName).tqreplace(" ", "_");
- if ( !mActionCollection->action(normalizedName.utf8() ) ) {
+ if ( !mActionCollection->action(normalizedName.utf8().data() ) ) {
KAction * action = new KAction( actionName, shortcut, item,
TQT_SLOT( slotExecute() ), mActionCollection,
normalizedName.utf8() );
@@ -352,8 +352,8 @@ void SnippetWidget::writeConfig()
SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
if (group) {
//kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
- strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
- strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
+ strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount);
+ strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount);
_cfg->writeEntry(strKeyName, group->getName());
_cfg->writeEntry(strKeyId, group->getId());
@@ -361,9 +361,9 @@ void SnippetWidget::writeConfig()
iGroupCount++;
} else if (dynamic_cast<SnippetItem*>(item)) {
//kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
- strKeyName=TQString("snippetName_%1").arg(iSnipCount);
- strKeyText=TQString("snippetText_%1").arg(iSnipCount);
- strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
+ strKeyName=TQString("snippetName_%1").tqarg(iSnipCount);
+ strKeyText=TQString("snippetText_%1").tqarg(iSnipCount);
+ strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount);
_cfg->writeEntry(strKeyName, item->getName());
_cfg->writeEntry(strKeyText, item->getText());
@@ -373,7 +373,7 @@ void SnippetWidget::writeConfig()
assert( action );
const KShortcut& sc = action->shortcut();
if (!sc.isNull() ) {
- _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() );
+ _cfg->writeEntry( TQString("snippetShortcut_%1").tqarg(iSnipCount), sc.toString() );
}
iSnipCount++;
} else {
@@ -389,8 +389,8 @@ void SnippetWidget::writeConfig()
for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values
if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it
- strKeyName=TQString("snippetSavedName_%1").arg(iCount);
- strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
+ strKeyName=TQString("snippetSavedName_%1").tqarg(iCount);
+ strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount);
_cfg->writeEntry(strKeyName, it.key());
_cfg->writeEntry(strKeyText, it.data());
@@ -434,8 +434,8 @@ void SnippetWidget::initConfig()
int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
for ( int i=0; i<iCount; i++) { //read the group-list
- strKeyName=TQString("snippetGroupName_%1").arg(i);
- strKeyId=TQString("snippetGroupId_%1").arg(i);
+ strKeyName=TQString("snippetGroupName_%1").tqarg(i);
+ strKeyId=TQString("snippetGroupId_%1").tqarg(i);
TQString strNameVal="";
int iIdVal=-1;
@@ -460,9 +460,9 @@ void SnippetWidget::initConfig()
if (iCount != -1) {
iCount = _cfg->readNumEntry("snippetCount", 0);
for ( int i=0; i<iCount; i++) { //read the snippet-list
- strKeyName=TQString("snippetName_%1").arg(i);
- strKeyText=TQString("snippetText_%1").arg(i);
- strKeyId=TQString("snippetParent_%1").arg(i);
+ strKeyName=TQString("snippetName_%1").tqarg(i);
+ strKeyText=TQString("snippetText_%1").tqarg(i);
+ strKeyId=TQString("snippetParent_%1").tqarg(i);
TQString strNameVal="";
TQString strTextVal="";
@@ -474,7 +474,7 @@ void SnippetWidget::initConfig()
//kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl;
if (strNameVal != "" && strTextVal != "" && iParentVal != -1) {
- KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) );
+ KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").tqarg(i), TQString() ) );
item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut );
//kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl;
_list.append(item);
@@ -487,8 +487,8 @@ void SnippetWidget::initConfig()
iCount = _cfg->readNumEntry("snippetSavedCount", 0);
for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap
- strKeyName=TQString("snippetSavedName_%1").arg(i);
- strKeyText=TQString("snippetSavedVal_%1").arg(i);
+ strKeyName=TQString("snippetSavedName_%1").tqarg(i);
+ strKeyText=TQString("snippetSavedVal_%1").tqarg(i);
TQString strNameVal="";
TQString strTextVal="";
@@ -586,7 +586,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
if ( strName != del+del ) { //if not doubel-delimiter
if (iInMeth == 0) { //if input-method "single" is selected
if ( mapVar[strName].length() <= 0 ) { // and not already in map
- strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
+ strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName);
strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
if (strNew=="")
return ""; //user clicked Cancle
@@ -799,7 +799,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
labTop = new TQLabel( &dlg, "label" );
tqlayoutTop->addWidget(labTop, 0, 0);
- labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
+ labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 346cfa8c8..e476749e6 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -374,7 +374,7 @@ void SubscriptionDialog::doSave()
if( !a->onlySubscribedFolders() ) {
int result = KMessageBox::questionYesNoCancel( this,
i18n("Currently subscriptions are not used for server. %1\nDo you want to enable subscriptions?")
- .arg( a->name() ),
+ .tqarg( a->name() ),
i18n("Enable Subscriptions?"), i18n("Enable"), i18n("Do Not Enable"));
switch(result) {
case KMessageBox::Yes:
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index d497f1846..8e167f5fd 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot insert content from file %1: %2" ).
- arg( path ).arg( file.errorString() ) );
+ tqarg( path ).tqarg( file.errorString() ) );
}
} else if ( cmd.startsWith( "SYSTEM=" ) ) {
@@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot insert content from file %1: %2").
- arg( path ).arg(file.errorString() ));
+ tqarg( path ).tqarg(file.errorString() ));
}
} else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) {
@@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
kdDebug() << "Command: OTEXTSIZE" << endl;
i += strlen( "OTEXTSIZE" );
if ( mOrigMsg ) {
- TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() );
+ TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() );
body.append( str );
}
@@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body )
DwParameter *nameParameter = new DwParameter;
nameParameter->SetAttribute( "name" );
nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset(
- i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) );
+ i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) );
ct.AddParameter( nameParameter );
}
}
@@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate()
TQString iid;
if ( mIdentity ) {
- iid = TQString("IDENTITY_%1").arg( mIdentity ); // templates ID for that identity
+ iid = TQString("IDENTITY_%1").tqarg( mIdentity ); // templates ID for that identity
}
else {
iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity
@@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
i18n( "Pipe command exit with status %1: %2").
- arg( mPipeRc ).arg( cmd ) );
+ tqarg( mPipeRc ).tqarg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Pipe command exit with status %1: %2" ).
- arg( mPipeRc ).arg( cmd ), mPipeErr );
+ tqarg( mPipeRc ).tqarg( cmd ), mPipeErr );
}
}
@@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
i18n( "Pipe command killed by signal %1: %2" ).
- arg( -(mPipeRc) ).arg( cmd ) );
+ tqarg( -(mPipeRc) ).tqarg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Pipe command killed by signal %1: %2" ).
- arg( -(mPipeRc) ).arg( cmd ), mPipeErr );
+ tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr );
}
}
}
@@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Pipe command did not finish within %1 seconds: %2" ).
- arg( PipeTimeout ).arg( cmd ) );
+ tqarg( PipeTimeout ).tqarg( cmd ) );
}
}
@@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
if ( mDebug ) {
if ( mPipeErr.isEmpty() ) {
KMessageBox::error( 0,
- i18n( "Cannot write to process stdin: %1" ).arg( cmd ) );
+ i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) );
} else {
KMessageBox::detailedError( 0,
i18n( "Cannot write to process stdin: %1" ).
- arg( cmd ), mPipeErr );
+ tqarg( cmd ), mPipeErr );
}
}
}
@@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf )
} else if ( mDebug ) {
KMessageBox::error( 0,
i18n( "Cannot start pipe command from template: %1" ).
- arg( cmd ) );
+ tqarg( cmd ) );
}
return mPipeOut;
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 0e52599c4..00bf87d90 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *
"if they are specified.</p>"
"</qt>" );
}
- mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) );
+ mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) );
}
void TemplatesConfiguration::slotTextChanged()
@@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal()
void TemplatesConfiguration::loadFromIdentity( uint id )
{
- Templates t( TQString("IDENTITY_%1").arg( id ) );
+ Templates t( TQString("IDENTITY_%1").tqarg( id ) );
TQString str;
@@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id )
void TemplatesConfiguration::saveToIdentity( uint id )
{
- Templates t( TQString("IDENTITY_%1").arg( id ) );
+ Templates t( TQString("IDENTITY_%1").tqarg( id ) );
t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) );
t.setTemplateReply( strOrBlank( textEdit_reply->text() ) );
@@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity )
Templates* tid = 0;
if ( identity ) {
- tid = new Templates( TQString("IDENTITY_%1").arg( identity ) );
+ tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) );
}
TQString str;
@@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases()
"---------- %1 ----------\n"
"%TEXT\n"
"-------------------------------------------------------\n"
- ) ).arg( convertPhrases( str ) ) );
+ ) ).tqarg( convertPhrases( str ) ) );
}
else {
textEdit_forward->setText( defaultForward() );
@@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases()
"\n"
"%TEXT\n"
"-------------------------------------------------------\n"
- ) ).arg( convertPhrases( str ) ) );
+ ) ).tqarg( convertPhrases( str ) ) );
}
else {
GlobalSettings::self()->setTemplateForward( defaultForward() );
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 2a33f3aaf..90a143731 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -41,11 +41,11 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *tqparent,
KAction *action;
KActionMenu *menu;
- TQSignalMapper *mapper = new TQSignalMapper( this );
+ TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
connect( mapper, TQT_SIGNAL( mapped(int) ),
this, TQT_SLOT( slotMapped(int) ) );
- mMenu = new KActionMenu( i18n( "Insert Command..." ), this );
+ mMenu = new KActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) );
// ******************************************************
menu = new KActionMenu( i18n( "Original Message" ), mMenu );
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index e1707b1ba..0ef6bfd24 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -53,7 +53,7 @@
#include <algorithm>
using std::for_each;
using std::remove;
-using std::tqfind;
+using std::find;
KMail::URLHandlerManager * KMail::URLHandlerManager::self = 0;
@@ -561,7 +561,7 @@ namespace {
TQString displayName, libName, keyId;
if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) )
return TQString();
- return i18n("Show certificate 0x%1").arg( keyId );
+ return i18n("Show certificate 0x%1").tqarg( keyId );
}
}
@@ -689,8 +689,8 @@ namespace {
if ( name.isEmpty() )
name = msgPart.name();
if ( !name.isEmpty() )
- return i18n( "Attachment: %1" ).arg( name );
- return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) );
+ return i18n( "Attachment: %1" ).tqarg( name );
+ return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) );
}
}
@@ -752,7 +752,7 @@ namespace {
namespace {
bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const {
if ( w )
- w->emitUrlClicked( url, TQt::LeftButton );
+ w->emitUrlClicked( url, Qt::LeftButton );
return true;
}
diff --git a/kmail/util.cpp b/kmail/util.cpp
index 9586f70d1..d153e9d37 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str )
that.detach();
uint len1 = that.size();
uint len2 = str.size();
- if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
+ if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
memcpy( that.data() + len1, str.data(), len2 );
}
@@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str )
that.detach();
uint len1 = that.size();
uint len2 = tqstrlen(str);
- if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
+ if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
memcpy( that.data() + len1, str, len2 );
}
@@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str )
that.detach();
uint len1 = that.size();
uint len2 = str.size() - 1;
- if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) )
+ if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) )
memcpy( that.data() + len1, str.data(), len2 );
}
@@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s )
int nlen = olen + len;
if ( index >= olen ) { // insert after end of string
that.detach();
- if ( that.resize(nlen+index-olen, TQByteArray::SpeedOptim ) ) {
+ if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) {
memset( that.data()+olen, ' ', index-olen );
memcpy( that.data()+index, s, len );
}
} else {
that.detach();
- if ( that.resize(nlen, TQByteArray::SpeedOptim ) ) { // normal insert
+ if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) { // normal insert
memmove( that.data()+index+len, that.data()+index, olen-index );
memcpy( that.data()+index, s, len );
}
diff --git a/kmail/util.h b/kmail/util.h
index 9f291a2e0..0d1e263f7 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -206,7 +206,7 @@ namespace Util {
KMessageBox::warningContinueCancel(
w,
i18n( "A file named \"%1\" already exists. "
- "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+ "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return false;
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index edce8d854..d3440a975 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -475,12 +475,12 @@ namespace KMail {
" { keep; stop; }\n" ); // FIXME?
if ( !domain.isEmpty() ) // FIXME
- script += TQString::tqfromLatin1( "if not address :domain :tqcontains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain );
+ script += TQString::tqfromLatin1( "if not address :domain :tqcontains \"from\" \"%1\" { keep; stop; }\n" ).tqarg( domain );
script += "vacation ";
script += addressesArgument;
if ( notificationInterval > 0 )
- script += TQString::tqfromLatin1(":days %1 ").arg( notificationInterval );
+ script += TQString::tqfromLatin1(":days %1 ").tqarg( notificationInterval );
script += TQString::tqfromLatin1("text:\n");
script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText );
script += TQString::tqfromLatin1( "\n.\n;\n" );
@@ -573,7 +573,7 @@ namespace KMail {
"\n"
"Yours sincerely,\n"
"-- <enter your name and email address here>\n")
- .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
+ .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) );
}
int Vacation::defaultNotificationInterval() {
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index 9e782adf7..e2ca8e0c0 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -96,7 +96,7 @@ namespace KMail {
mDomainCheck->setChecked( false );
mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" );
mDomainEdit->setEnabled( false );
- mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) );
+ mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) );
glay->addWidget( mDomainCheck, row, 0 );
glay->addWidget( mDomainEdit, row, 1 );
connect( mDomainCheck, TQT_SIGNAL(toggled(bool)),
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index 1110641d5..b49394dc7 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -266,7 +266,7 @@ namespace KMail {
TQString str = mTextEdit->text();
if ( !str.isEmpty() )
{
- if ( str.startsWith("x-face:", false) )
+ if ( str.tqstartsWith("x-face:", false) )
{
str = str.remove("x-face:", false);
mTextEdit->setText(str);