From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001
From: Timothy Pearson
Date: Mon, 19 Dec 2011 11:59:01 -0600
Subject: Remove additional unneeded tq method conversions
---
kmail/ChangeLog | 4 +-
kmail/Mainpage.dox | 20 ++++----
kmail/accountdialog.cpp | 8 +--
kmail/accountmanager.cpp | 10 ++--
kmail/accountwizard.cpp | 6 +--
kmail/actionscheduler.cpp | 24 ++++-----
kmail/antispamconfig.cpp | 2 +-
kmail/antispamwizard.cpp | 6 +--
kmail/attachmentcollector.cpp | 2 +-
kmail/backupjob.cpp | 28 +++++------
kmail/bodyvisitor.h | 2 +-
kmail/cachedimapjob.cpp | 24 ++++-----
kmail/callback.cpp | 8 +--
kmail/compactionjob.cpp | 16 +++---
kmail/configuredialog.cpp | 82 +++++++++++++++---------------
kmail/configuredialog_p.cpp | 6 +--
kmail/copyfolderjob.cpp | 6 +--
kmail/csshelper.cpp | 2 +-
kmail/customtemplates.cpp | 2 +-
kmail/customtemplates_base.ui | 4 +-
kmail/distributionlistdialog.cpp | 2 +-
kmail/expirejob.cpp | 22 ++++-----
kmail/favoritefolderview.cpp | 14 +++---
kmail/filterlogdlg.cpp | 2 +-
kmail/folderdiaacltab.cpp | 8 +--
kmail/folderdiaquotatab.cpp | 6 +--
kmail/folderrequester.cpp | 2 +-
kmail/foldershortcutdialog.cpp | 2 +-
kmail/folderstorage.cpp | 12 ++---
kmail/folderstorage.h | 18 +++----
kmail/foldertreebase.cpp | 12 ++---
kmail/folderutil.cpp | 2 +-
kmail/folderviewtooltip.h | 10 ++--
kmail/headeritem.cpp | 4 +-
kmail/headeritem.h | 12 ++---
kmail/headerstyle.cpp | 96 ++++++++++++++++++------------------
kmail/identitydialog.cpp | 26 +++++-----
kmail/identitylistview.cpp | 2 +-
kmail/imapaccountbase.cpp | 32 ++++++------
kmail/imapaccountbase.h | 4 +-
kmail/imapjob.cpp | 14 +++---
kmail/importjob.cpp | 22 ++++-----
kmail/index.cpp | 2 +-
kmail/kcursorsaver.h | 6 +--
kmail/keyresolver.cpp | 22 ++++-----
kmail/khtmlparthtmlwriter.cpp | 2 +-
kmail/kmaccount.cpp | 18 +++----
kmail/kmaccount.h | 2 +-
kmail/kmacctimap.cpp | 22 ++++-----
kmail/kmacctlocal.cpp | 40 +++++++--------
kmail/kmacctmaildir.cpp | 34 ++++++-------
kmail/kmailicalifaceimpl.cpp | 22 ++++-----
kmail/kmcommands.cpp | 56 ++++++++++-----------
kmail/kmcomposewin.cpp | 26 +++++-----
kmail/kmedit.cpp | 2 +-
kmail/kmfilter.cpp | 10 ++--
kmail/kmfilteraction.cpp | 26 +++++-----
kmail/kmfilterdlg.cpp | 18 +++----
kmail/kmfolder.cpp | 14 +++---
kmail/kmfolder.h | 12 ++---
kmail/kmfoldercachedimap.cpp | 44 ++++++++---------
kmail/kmfoldercachedimap.h | 6 +--
kmail/kmfolderdia.cpp | 2 +-
kmail/kmfolderdir.cpp | 6 +--
kmail/kmfolderdir.h | 2 +-
kmail/kmfolderimap.cpp | 42 ++++++++--------
kmail/kmfolderimap.h | 6 +--
kmail/kmfolderindex.cpp | 10 ++--
kmail/kmfoldermaildir.cpp | 14 +++---
kmail/kmfoldermaildir.h | 2 +-
kmail/kmfoldermbox.cpp | 24 ++++-----
kmail/kmfoldermbox.h | 2 +-
kmail/kmfoldermgr.cpp | 10 ++--
kmail/kmfoldertree.cpp | 20 ++++----
kmail/kmheaders.cpp | 72 +++++++++++++--------------
kmail/kmheaders.h | 4 +-
kmail/kmkernel.cpp | 32 ++++++------
kmail/kmlineeditspell.cpp | 2 +-
kmail/kmmainwidget.cpp | 68 ++++++++++++-------------
kmail/kmmessage.cpp | 42 ++++++++--------
kmail/kmmessage.h | 18 +++----
kmail/kmmsgbase.cpp | 72 +++++++++++++--------------
kmail/kmmsgbase.h | 4 +-
kmail/kmmsginfo.cpp | 4 +-
kmail/kmmsginfo.h | 4 +-
kmail/kmmsgpartdlg.cpp | 10 ++--
kmail/kmpopfiltercnfrmdlg.cpp | 4 +-
kmail/kmreaderwin.cpp | 80 +++++++++++++++---------------
kmail/kmsender.cpp | 62 +++++++++++------------
kmail/kmsender.h | 4 +-
kmail/kmstartup.cpp | 14 +++---
kmail/kmtransport.cpp | 2 +-
kmail/listjob.cpp | 4 +-
kmail/localsubscriptiondialog.cpp | 2 +-
kmail/managesievescriptsdialog.cpp | 2 +-
kmail/messagecomposer.cpp | 2 +-
kmail/networkaccount.cpp | 2 +-
kmail/newfolderdialog.cpp | 6 +--
kmail/objecttreeparser.cpp | 86 ++++++++++++++++----------------
kmail/objecttreeparser.h | 4 +-
kmail/partNode.cpp | 8 +--
kmail/partNode.h | 4 +-
kmail/partnodebodypart.cpp | 4 +-
kmail/popaccount.cpp | 36 +++++++-------
kmail/quotajobs.h | 4 +-
kmail/recipientseditor.cpp | 8 +--
kmail/recipientspicker.cpp | 2 +-
kmail/renamejob.cpp | 2 +-
kmail/rulewidgethandlermanager.cpp | 2 +-
kmail/searchjob.cpp | 4 +-
kmail/searchwindow.cpp | 8 +--
kmail/sievedebugdialog.cpp | 8 +--
kmail/snippetdlgbase.ui | 2 +-
kmail/snippetwidget.cpp | 48 +++++++++---------
kmail/subscriptiondialog.cpp | 4 +-
kmail/templateparser.cpp | 26 +++++-----
kmail/templatesconfiguration.cpp | 12 ++---
kmail/templatesconfiguration_base.ui | 2 +-
kmail/urlhandlermanager.cpp | 6 +--
kmail/util.cpp | 10 ++--
kmail/util.h | 2 +-
kmail/vacation.cpp | 6 +--
kmail/warningconfiguration.ui | 4 +-
kmail/xfaceconfigurator.cpp | 2 +-
124 files changed, 965 insertions(+), 965 deletions(-)
(limited to 'kmail')
diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index 8c7c6664c..8dddd3001 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -184,7 +184,7 @@ please visit http://webcvs.kde.org
Do the right thing when sending to "me@there (John Doe)"
Waldo's folderless-acount-segv-fix
More against destroyed last char in message
- Better long/normal folder-list tqgeometry bugfix
+ Better long/normal folder-list geometry bugfix
Don't quit while sending, and show a label while you send.
1999-02-03 Sven Radej (KMail-1.0.16)
@@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben
quoted text to catch smileys at the beginning of the
line ;-)
- * Main window configuration (tqgeometry, etc.) is now
+ * Main window configuration (geometry, etc.) is now
stored again.
* Composer: changed completion key from Ctrl-. to Ctrl-T
diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox
index 05802ef7c..cdab18acb 100644
--- a/kmail/Mainpage.dox
+++ b/kmail/Mainpage.dox
@@ -589,11 +589,11 @@ Strategy:
case. These are messages that have neither an In-Reply-To header nor
a References header and have a subject that is not prefixed.
In case there is a perfect parent, the current sort cache item is
- appended to the parents list of unsorted tqchildren, or to that of
+ appended to the parents list of unsorted children, or to that of
root, if there is not. A sort cache item is created in the mSortCache
for the parent, if it is not already there. Messages with a parent of
-1 are appended to the "unparented" list, which is later traversed and
- its elements threaded. Messages with -2 as the parent are tqchildren of
+ its elements threaded. Messages with -2 as the parent are children of
root as well, as noted above, and will remain so.
Once the end of the file is reached, we should have a nicely filled
@@ -677,13 +677,13 @@ Strategy:
cache items happen at the same time.
As previously mentioned (or not) each sort cache item holds a list of its
- sorted and one of its unsorted tqchildren. Starting with the root node the
+ sorted and one of its unsorted children. Starting with the root node the
unsorted list is first qsorted, and then merged with the list of already
- sorted tqchildren. To achieve that, the heads of both lists are compared and
+ sorted children. To achieve that, the heads of both lists are compared and
the one with the "better" key is added to the list view next by creating a
KMHeaderListItem for it. That header item receives both its sort key as well
as its id from the sort cache item. Should the current sort cache item have
- tqchildren, it is added to the end of a queue of nodes to repeat these steps
+ children, it is added to the end of a queue of nodes to repeat these steps
on after the current level is sorted. This way, a breadth first merge sort
is performed on the sort cache items and header items are created at each
node.
@@ -714,7 +714,7 @@ What happens when a message arrives in the folder?
After those house keeping tasks are performed, the list of as of yet imper-
fectly threaded messages is traversed and our newly arrived message is
considered as a new parent for each item on it. This is especially important
- to ensure that parents arriving out of order after their tqchildren still end
+ to ensure that parents arriving out of order after their children still end
up as parents. If necessary, the entries in the .sorted file of rethreaded
messages are updated. An entry for the new message itself is appended to the
.sorted file as well.
@@ -732,9 +732,9 @@ What happens when a message is removed from the folder?
In this case the msgRemoved slot kicks in and updates the headers list. First
the sort cache item and header item representing our message are removed from
the data structures and the ids of all items after it in the store decre-
- mented. Then a list of tqchildren of the message is assembled containing those
- tqchildren that have to be reparented now that our message has gone away. If
- one of those tqchildren has been marked as toBeDeleted, it is simply added to
+ mented. Then a list of children of the message is assembled containing those
+ children that have to be reparented now that our message has gone away. If
+ one of those children has been marked as toBeDeleted, it is simply added to
root at top level, because there is no need to find a parent for it if it is
to go away as well. This is an optimization to avoid rethreading all
messages in a thread when deleting several messages in a thread, or even the
@@ -743,7 +743,7 @@ What happens when a message is removed from the folder?
can be avoided. Note that that does not work when moving messages via filter
action.
- That list of tqchildren is then traversed and a new parent found for each one
+ That list of children is then traversed and a new parent found for each one
using, again, findParent and findParentBySubject. When a message becomes
imperfectly threaded in the process, it is added to the corresponding list.
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 3712346ec..fd29fa197 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -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").tqarg( ap.port() ) );
+ mPop.portEdit->setText( TQString("%1").arg( 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").tqarg( ai.port() ) );
+ mImap.portEdit->setText( TQString("%1").arg( 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").tqarg( ai.port() ) );
+ mImap.portEdit->setText( TQString("%1").arg( ai.port() ) );
#if 0
mImap.resourceCheck->setChecked( ai.resource() );
#endif
@@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent,
} else {
ns = i18n("Shared");
}
- setCaption( i18n("Edit Namespace '%1'").tqarg(ns) );
+ setCaption( i18n("Edit Namespace '%1'").arg(ns) );
TQGrid* grid = new TQGrid( 2, page );
mBg = new TQButtonGroup( 0 );
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index a086292a8..0610622f7 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").tqarg(i);
+ if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i);
acct = create(acctType, acctName, id);
if (!acct) continue;
add(acct);
@@ -155,7 +155,7 @@ void AccountManager::processNextCheck( bool _newMail )
if ( mAcctChecking.isEmpty() ) {
// all checks finished, display summary
if ( mDisplaySummary )
- KPIM::BroadcastStatus::instance()->seStatusMsgTransmissionCompleted(
+ KPIM::BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
mTotalNewMailsArrived );
emit checkedMail( mNewMailArrived, mInteractive, mTotalNewInFolder );
mTotalNewMailsArrived = 0;
@@ -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.")
- .tqarg(curAccount->name());
+ .arg(curAccount->name());
KMessageBox::information(0,tmp);
emit checkedMail( false, mInteractive, mTotalNewInFolder );
mTotalNewMailsArrived = 0;
@@ -222,8 +222,8 @@ void AccountManager::processNextCheck( bool _newMail )
connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
this, TQT_SLOT( processNextCheck( bool ) ) );
- KPIM::BroadcastStatus::instance()->seStatusMsg(
- i18n("Checking account %1 for new mail").tqarg(curAccount->name()));
+ KPIM::BroadcastStatus::instance()->setStatusMsg(
+ i18n("Checking account %1 for new mail").arg(curAccount->name()));
kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl;
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 6a188fbb5..caafcb353 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..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::checkImapCapabilities( const TQString &server, int port )
@@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port )
connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
- mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
@@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
const TQString&, const TQString&, const TQString& ) ) );
- mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) );
+ mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
}
void AccountWizard::popCapabilities( const TQStringList &capaNormalList,
diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp
index f699ff906..215e54511 100644
--- a/kmail/actionscheduler.cpp
+++ b/kmail/actionscheduler.cpp
@@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg )
serNumS.setNum( msg->getMsgSerNum() );
KMMessage *newMsg = new KMMessage;
newMsg->fromString(msg->asString());
- newMsg->seStatus(msg->status());
+ newMsg->setStatus(msg->status());
newMsg->setComplete(msg->isComplete());
newMsg->setHeaderField( "X-KMail-Filtered", serNumS );
mSrcFolder->addMsg( newMsg );
@@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res)
if (msg) {
if ( FilterLog::instance()->isLogging() ) {
TQString logText( i18n( "Applying filter action: %1" )
- .tqarg( mFilterAction->displayString() ) );
+ .arg( mFilterAction->displayString() ) );
FilterLog::instance()->add( logText, FilterLog::appliedAction );
}
KMFilterAction *action = mFilterAction;
@@ -786,19 +786,19 @@ TQString ActionScheduler::debug()
TQValueList::iterator it;
int i = 1;
for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) {
- res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) );
+ res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) );
if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) {
res.append( TQString( "Account %1, Name %2.\n" )
- .tqarg( (*it)->mAccountId )
- .tqarg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
+ .arg( (*it)->mAccountId )
+ .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) );
}
- 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( "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( "mResult " ) );
if ((*it)->mResult == ResultOk)
res.append( TQString( "ResultOk.\n" ) );
diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp
index 500529953..0cb047fd4 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").tqarg( i ) );
+ KConfigGroup tool( &config, TQString("Spamtool #%1").arg( 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 e0b40fc67..533ee379a 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability()
bool found = false;
for ( TQValueListIterator it = mToolList.begin();
it != mToolList.end(); ++it ) {
- TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) );
+ TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) );
mInfoPage->setScanProgressText( text );
if ( (*it).isSpamTool() && (*it).isServerBased() ) {
// check the configured account for pattern in
@@ -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.tqarg( i ) );
+ KConfigGroup toolConfig( mConfig, groupName.arg( 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.tqarg( i ) );
+ KConfigGroup toolConfig( mConfig, groupName.arg( i ) );
if( !toolConfig.readBoolEntry( "HeadersOnly", false ) )
mergeToolConfig( readToolConfig( toolConfig ) );
}
diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp
index 688af6233..b902f596f 100644
--- a/kmail/attachmentcollector.cpp
+++ b/kmail/attachmentcollector.cpp
@@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) {
continue;
}
if ( isInSkipList( node ) ) {
- node = node->next( false ); // skip even the tqchildren
+ node = node->next( false ); // skip even the children
continue;
}
if ( isInExclusionList( node ) ) {
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index af9a75c38..fd53997b3 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'." ).tqarg( mRootFolder->name() );
+ TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() );
text += "\n" + errorMessage;
KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) );
deleteLater();
@@ -165,19 +165,19 @@ void BackupJob::finish()
}
}
- mProgressItem->seStatus( i18n( "Archiving finished" ) );
+ mProgressItem->setStatus( i18n( "Archiving finished" ) );
mProgressItem->setComplete();
mProgressItem = 0;
TQFileInfo archiveFileInfo( mMailArchivePath.path() );
TQString text = i18n( "Archiving folder '%1' successfully completed. "
"The archive was written to the file '%2'." )
- .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() );
+ .arg( mRootFolder->name() ).arg( mMailArchivePath.path() );
text += "\n" + i18n( "1 message of size %1 was archived.",
"%n messages with the total size of %1 were archived.", mArchivedMessages )
- .tqarg( KIO::convertSize( mArchivedSize ) );
+ .arg( KIO::convertSize( mArchivedSize ) );
text += "\n" + i18n( "The archive file has a size of %1." )
- .tqarg( KIO::convertSize( archiveFileInfo.size() ) );
+ .arg( 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'." ).tqarg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( 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'." ).tqarg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) );
return;
}
@@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage()
kdWarning(5006) << "Message with subject " << mCurrentMessage->subject()
<< " is neither complete nor has a parent!" << endl;
abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." )
- .tqarg( mCurrentFolder->name() ) );
+ .arg( 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'." ).tqarg( mCurrentFolder->name() ) );
+ abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( 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." ).tqarg( mCurrentFolder->name() ) );
+ abort( i18n( "Downloading a message in folder '%1' failed." ).arg( 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->seStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) );
+ mProgressItem->setStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) );
if ( mCurrentFolder->open( "BackupJob" ) != 0 ) {
- abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) );
+ abort( i18n( "Unable to open folder '%1'.").arg( 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." )
- .tqarg( mCurrentFolder->name() ) );
+ .arg( 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." )
- .tqarg( mCurrentFolder->name() ) );
+ .arg( mCurrentFolder->name() ) );
return;
}
else
diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h
index 1f236c4a7..a436fb443 100644
--- a/kmail/bodyvisitor.h
+++ b/kmail/bodyvisitor.h
@@ -60,7 +60,7 @@ namespace KMail {
protected:
/**
- * Checks if one of the parents needs loaded tqchildren
+ * Checks if one of the parents needs loaded children
* This is e.g. needed for multipart/signed where all parts have to be loaded
*/
static bool parentNeedsLoading( KMMessagePart * part );
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index ec7dece78..5e5232d42 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::fromLatin1(";UID=%1").tqarg(uids) );
+ TQString::fromLatin1(";UID=%1").arg(uids) );
KIO::SimpleJob *simpleJob = KIO::file_delete( url, false );
KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob );
@@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
mFolder->addMsgInternal( mMsg, true, &index );
if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) {
- mFolder->seStatus( index, KMMsgStatusRead, false );
+ mFolder->setStatus( index, KMMsgStatusRead, false );
}
emit messageRetrieved( mMsg );
@@ -341,7 +341,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job)
if( mfd.flags > 0 )
KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX);
KURL url = mAccount->getUrl();
- url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").tqarg(mfd.uid));
+ url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(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.tqat(i) = '\r';
+ mData.at(i) = '\r';
i++;
}
- mData.tqat(i) = *ch; i++;
+ mData.at(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 = "" + i18n("Error while uploading folder")
- + "
" + i18n("Could not make the folder %1 on the server.").tqarg((*it).items[0])
+ + "
" + i18n("Could not make the folder %1 on the server.").arg((*it).items[0])
+ "
" + 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:") + "
";
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" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
- .tqarg( path );
+ const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) )
+ .arg( 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: " ).tqarg( (*it).path ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*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: " ).tqarg( (*it).parent->label() ) + '\n' );
+ mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->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" )
- .tqarg( mFolder->label() ).tqarg( errorMessage ) );
+ .arg( mFolder->label() ).arg( 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" ).tqarg( mFolder->label() );
+ const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() );
mAccount->handleJobError( job, errorMessage );
delete this;
} else {
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 0b94a5d1f..7a7a583f2 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -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" ).tqarg(subject).replace("Answer: ","") );
+ msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") );
else if ( status == TQString("tentative") )
- msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).replace("Answer: ","") );
+ msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") );
else if ( status == TQString("accepted") )
- msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).replace("Answer: ","") );
+ msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") );
else if ( status == TQString("delegated") )
- msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).replace("Answer: ","") );
+ msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") );
}
msg->setTo( to );
msg->setFrom( receiver() );
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index aa563c46e..fd89f4584 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -96,8 +96,8 @@ 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" ).tqarg( mbox->label() );
- BroadcastStatus::instance()->seStatusMsg( str );
+ TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() );
+ BroadcastStatus::instance()->setStatusMsg( 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" ).tqarg( mSrcFolder->label() );
+ str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
kdDebug(5006) << str << endl;
} else {
mbox->close("mboxcompact");
- str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
+ str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl;
kdDebug(5006) << "Compaction aborted." << endl;
TQFile::remove( mTempName );
@@ -185,7 +185,7 @@ void MboxCompactionJob::done( int rc )
mErrorCode = rc;
if ( !mSilent )
- BroadcastStatus::instance()->seStatusMsg( str );
+ BroadcastStatus::instance()->setStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"
@@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc )
mCancellable = false;
TQString str;
if ( !rc ) {
- str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() );
+ str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() );
} else {
- str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() );
+ str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() );
}
mErrorCode = rc;
storage->setNeedsCompacting( false );
@@ -266,7 +266,7 @@ void MaildirCompactionJob::done( int rc )
if ( storage->isOpened() )
storage->updateIndex();
if ( !mSilent )
- BroadcastStatus::instance()->seStatusMsg( str );
+ BroadcastStatus::instance()->setStatusMsg( str );
mFolderOpen = false;
deleteLater(); // later, because of the "return mErrorCode"
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 6dd25347d..538b6205f 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
// the KCMultiDialog starts with the size of the first kcm, not
// the largest one. This way at least after the first showing of
// the largest kcm the size is kept.
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
- int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
- int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ int width = geometry.readNumEntry( "ConfigureDialogWidth" );
+ int height = geometry.readNumEntry( "ConfigureDialogHeight" );
if ( width != 0 && height != 0 ) {
setMinimumSize( width, height );
}
@@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
}
void ConfigureDialog::hideEvent( TQHideEvent *ev ) {
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
- tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
- tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ geometry.writeEntry( "ConfigureDialogWidth", width() );
+ geometry.writeEntry( "ConfigureDialogHeight",height() );
KDialogBase::hideEvent( ev );
}
@@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity()
if ( !item ) return;
TQString msg = i18n("Do you really want to remove the identity named "
- "%1?").tqarg( item->identity().identityName() );
+ "%1?").arg( item->identity().identityName() );
if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"),
KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue )
if ( im->removeIdentity( item->identity().identityName() ) ) {
@@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list,
while ( list.find( result ) != list.end() ) {
result = i18n("%1: name; %2: number appended to it to make it unique "
"among a list of names", "%1 %2")
- .tqarg( name ).tqarg( suffix );
+ .arg( name ).arg( 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)")
- .tqarg( transportInfo->type );
+ .arg( 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("Unable to locate account %1.")
- .tqarg(listItem->text(0)) );
+ .arg(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("Unable to locate account %1.")
- .tqarg( (*it)->name() ) );
+ .arg( (*it)->name() ) );
}
mAccountsToDelete.clear();
@@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char
void AppearancePage::LayoutTab::doLoadOther() {
const KConfigGroup reader( KMKernel::config(), "Reader" );
- const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+ const KConfigGroup geometry( KMKernel::config(), "Geometry" );
- loadWidget( mFolderListGroup, tqgeometry, folderListMode );
+ loadWidget( mFolderListGroup, geometry, folderListMode );
loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation );
loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode );
- loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+ loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode );
mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() );
}
void AppearancePage::LayoutTab::installProfile( KConfig * profile ) {
const KConfigGroup reader( profile, "Reader" );
- const KConfigGroup tqgeometry( profile, "Geometry" );
+ const KConfigGroup geometry( profile, "Geometry" );
- loadProfile( mFolderListGroup, tqgeometry, folderListMode );
+ loadProfile( mFolderListGroup, geometry, folderListMode );
loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation );
loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode );
- loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+ loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode );
}
void AppearancePage::LayoutTab::save() {
KConfigGroup reader( KMKernel::config(), "Reader" );
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
- saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode );
+ saveButtonGroup( mFolderListGroup, geometry, folderListMode );
saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation );
saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode );
- saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode );
+ saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode );
GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() );
}
@@ -2058,7 +2058,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) {
TQString buttonLabel = i18n(dateDisplayConfig[i].displayName);
if ( buttonLabel.contains("%1") )
- buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
+ buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) );
radio = new TQRadioButton( buttonLabel, mDateDisplay );
mDateDisplay->insert( radio, i );
if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) {
@@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha
void AppearancePage::HeadersTab::doLoadOther() {
KConfigGroup general( KMKernel::config(), "General" );
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
// "General Options":
- mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) );
+ mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) );
mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) );
mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) );
mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) );
// "Message Header Threading Options":
- int num = tqgeometry.readNumEntry( "nestingPolicy", 3 );
+ int num = geometry.readNumEntry( "nestingPolicy", 3 );
if ( num < 0 || num > 3 ) num = 3;
mNestingPolicy->setButton( num );
@@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma
void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
KConfigGroup general( profile, "General" );
- KConfigGroup tqgeometry( profile, "Geometry" );
+ KConfigGroup geometry( profile, "Geometry" );
- if ( tqgeometry.hasKey( "nestedMessages" ) )
- mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) );
+ if ( geometry.hasKey( "nestedMessages" ) )
+ mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) );
if ( general.hasKey( "showMessageSize" ) )
mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) );
@@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
if ( general.hasKey( "showAttachmentIcon" ) )
mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) );
- if ( tqgeometry.hasKey( "nestingPolicy" ) ) {
- int num = tqgeometry.readNumEntry( "nestingPolicy" );
+ if ( geometry.hasKey( "nestingPolicy" ) ) {
+ int num = geometry.readNumEntry( "nestingPolicy" );
if ( num < 0 || num > 3 ) num = 3;
mNestingPolicy->setButton( num );
}
@@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) {
void AppearancePage::HeadersTab::save() {
KConfigGroup general( KMKernel::config(), "General" );
- KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
- if ( tqgeometry.readBoolEntry( "nestedMessages", false )
+ if ( geometry.readBoolEntry( "nestedMessages", false )
!= mNestedMessagesCheck->isChecked() ) {
int result = KMessageBox::warningContinueCancel( this,
i18n("Changing the global threading setting will override "
"all folder specific values."),
TQString(), KStdGuiItem::cont(), "threadOverride" );
if ( result == KMessageBox::Continue ) {
- tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
+ geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() );
// remove all threadMessagesOverride keys from all [Folder-*] groups:
TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") );
kdDebug(5006) << "groups.count() == " << groups.count() << endl;
@@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() {
}
}
- tqgeometry.writeEntry( "nestingPolicy",
+ geometry.writeEntry( "nestingPolicy",
mNestingPolicy->id( mNestingPolicy->selected() ) );
general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() );
general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() );
@@ -3304,7 +3304,7 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) {
if ( charset.lower() == TQString::fromLatin1("locale") ) {
charset = TQString::fromLatin1("%1 (locale)")
- .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
+ .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() );
return;
}
@@ -3328,7 +3328,7 @@ void ComposerPage::CharsetTab::doLoadOther() {
if ( (*it) == TQString::fromLatin1("locale") ) {
TQCString cset = kmkernel->networkCodec()->mimeName();
KPIM::kAsciiToLower( cset.data() );
- (*it) = TQString("%1 (locale)").tqarg( TQString(cset) );
+ (*it) = TQString("%1 (locale)").arg( TQString(cset) );
}
mCharsetListEditor->setStringList( charsets );
@@ -3815,7 +3815,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
"exploits. More about "
"HTML mails... More "
"about external references...")
- .tqarg(htmlWhatsThis).tqarg(externalWhatsThis),
+ .arg(htmlWhatsThis).arg(externalWhatsThis),
group );
vlay->addWidget( group );
@@ -3890,7 +3890,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char *
label = new KActiveLabel( i18n("WARNING: Unconditionally returning "
"confirmations undermines your privacy. "
"More...")
- .tqarg(receiptWhatsThis),
+ .arg(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)" ).tqarg( systemProxy ) );
+ mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( 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" ).tqarg( componentName, groupName, entryName ) << endl;
+ kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( 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" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl;
+ 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;
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" ).tqarg( acct->id() );
+ folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() );
GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() );
}
}
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index ccc0230b1..93f6123cc 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -225,7 +225,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs,
if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) {
// not found:
TQString displayname = TQString::fromLatin1("%1 (%2)")
- .tqarg( name ).tqarg( acronym );
+ .arg( name ).arg( acronym );
TQPixmap flag( locate("locale", acronym + flagPng ) );
mComboBox->insertItem( flag, displayname );
}
@@ -255,7 +255,7 @@ int LanguageComboBox::insertLanguage( const TQString & language )
KSimpleConfig entry( locate("locale", language + entryDesktop) );
entry.setGroup( "KCM Locale" );
TQString name = entry.readEntry( "Name" );
- TQString output = TQString::fromLatin1("%1 (%2)").tqarg( name ).tqarg( language );
+ TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language );
insertItem( TQPixmap( locate("locale", language + flagPng ) ), output );
return listBox()->index( listBox()->findItem(output) );
}
@@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const
void LanguageComboBox::setLanguage( const TQString & language )
{
- TQString parenthizedLanguage = TQString::fromLatin1("(%1)").tqarg( language );
+ TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language );
for (int i = 0; i < count(); i++)
// ### FIXME: use .endWith():
if ( text(i).find( parenthizedLanguage ) >= 0 ) {
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index 9be07213e..a83b1cd6c 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob()
/*
* The basic strategy is to first create the target folder, then copy all the mail
- * from the source to the target folder, then recurse for each of the folder's tqchildren
+ * from the source to the target folder, then recurse for each of the folder's children
*/
void CopyFolderJob::execute()
{
@@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command )
rollback();
return;
}
- // if we have tqchildren, recurse
+ // if we have children, recurse
if ( mStorage->folder()->child() ) {
slotCopyNextChild();
} else {
@@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success )
mNextChildFolder = static_cast(node);
++mChildFolderNodeIterator;
} else {
- // no more tqchildren, we are done
+ // no more children, we are done
emit folderCopyComplete( true );
deleteLater();
return;
diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp
index 86166dbc2..3fe2fd78b 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" ).tqarg( i+1 );
+ const TQString key = TQString( "quote%1-font" ).arg( i+1 );
mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont );
}
}
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index 279c71ae6..6a0a7f4cf 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name )
"Universal which can be used for all kind of operations. "
"You cannot bind keyboard shortcut to Universal templates.
"
"" );
- mHelp->setText( i18n( "How does this work?" ).tqarg( help ) );
+ mHelp->setText( i18n( "How does this work?" ).arg( 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/customtemplates_base.ui b/kmail/customtemplates_base.ui
index c72ccec05..73300edd9 100644
--- a/kmail/customtemplates_base.ui
+++ b/kmail/customtemplates_base.ui
@@ -260,7 +260,7 @@
Shortc&ut:
-
+
AlignVCenter|AlignRight
@@ -282,7 +282,7 @@
&Template type:
-
+
AlignVCenter|AlignRight
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 26f720ad6..5dcb81d20 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1()
#endif
KMessageBox::information( this,
i18n( "Distribution list with the given name %1 "
- "already exists. Please select a different name." ).tqarg( name ) );
+ "already exists. Please select a different name." ).arg( name ) );
return;
}
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 65de61a33..a208b918b 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 )
- .tqarg( mSrcFolder->label() );
+ .arg( 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" )
- .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
+ .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() );
kdWarning(5006) << str << endl;
} else {
kdDebug(5006) << "ExpireJob: finished expiring in folder "
@@ -185,12 +185,12 @@ 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 )
- .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+ .arg( mSrcFolder->label(), mMoveToFolder->label() );
}
}
}
if ( !str.isEmpty() )
- BroadcastStatus::instance()->seStatusMsg( str );
+ BroadcastStatus::instance()->setStatusMsg( str );
KConfigGroup group( KMKernel::config(), "Folder-" + mSrcFolder->idString() );
group.writeEntry( "Current", -1 ); // i.e. make it invalid, the serial number will be used
@@ -213,38 +213,38 @@ void ExpireJob::slotMessagesMoved( KMCommand *command )
msg = i18n( "Removed 1 old message from folder %1.",
"Removed %n old messages from folder %1.",
mRemovedMsgs.count() )
- .tqarg( mSrcFolder->label() );
+ .arg( 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() )
- .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+ .arg( mSrcFolder->label(), mMoveToFolder->label() );
}
break;
case KMCommand::Failed:
if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
msg = i18n( "Removing old messages from folder %1 failed." )
- .tqarg( mSrcFolder->label() );
+ .arg( mSrcFolder->label() );
}
else {
msg = i18n( "Moving old messages from folder %1 to folder %2 failed." )
- .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+ .arg( mSrcFolder->label(), mMoveToFolder->label() );
}
break;
case KMCommand::Canceled:
if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) {
msg = i18n( "Removing old messages from folder %1 was canceled." )
- .tqarg( mSrcFolder->label() );
+ .arg( mSrcFolder->label() );
}
else {
msg = i18n( "Moving old messages from folder %1 to folder %2 was "
"canceled." )
- .tqarg( mSrcFolder->label(), mMoveToFolder->label() );
+ .arg( mSrcFolder->label(), mMoveToFolder->label() );
}
default: ;
}
- BroadcastStatus::instance()->seStatusMsg( msg );
+ BroadcastStatus::instance()->setStatusMsg( msg );
deleteLater();
}
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index e1689a9af..6715f4865 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item)
if ( !item ) return;
if ( !item->isSelected() )
item->setSelected( true );
- item->tqrepaint();
+ item->repaint();
handleGroupwareFolder( static_cast( item ) );
}
@@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder)
fti->setSelected( true );
setCurrentItem( fti );
ensureItemVisible( fti );
- fti->tqrepaint();
+ fti->repaint();
found = true;
} else if ( fti->folder() != folder && fti->isSelected() ) {
fti->setSelected( false );
- fti->tqrepaint();
+ fti->repaint();
}
}
blockSignals( false );
@@ -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" ).tqarg( accountFti->text( 0 ) );
+ name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) );
}
} else {
if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) {
- name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) );
+ name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) );
} else {
- name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) );
+ name = i18n( "%1 (local)" ).arg( fti->text( 0 ) );
}
}
return name;
@@ -524,7 +524,7 @@ void FavoriteFolderView::refresh()
KMFolderTreeItem* fti = static_cast(it.current());
if (!fti || !fti->folder())
continue;
- fti->tqrepaint();
+ fti->repaint();
}
update();
}
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 33bfa8d39..fef3b89ce 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." )
- .tqarg( fileName,
+ .arg( fileName,
TQString::fromLocal8Bit( strerror( errno ) ) ),
i18n( "KMail Error" ) );
}
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 63b67ffc4..b6c3e2c1d 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)" ).tqarg( internalRightsList );
+ return i18n( "Custom Permissions (%1)" ).arg( internalRightsList );
}
void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions )
@@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load()
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
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..." ).tqarg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( 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" ).tqarg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Error connecting to server %1" ).arg( 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" ).tqarg( job->errorString() ) );
+ mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) );
return;
}
diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 7c133bb8f..133a2b1a5 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load()
KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
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..." ).tqarg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( 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" ).tqarg( mImapAccount->host() ) );
+ mLabel->setText( i18n( "Error connecting to server %1" ).arg( 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" ).tqarg( job->errorString() ) );
+ mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) );
} else {
mQuotaInfo = info;
}
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index 242037b9a..ca6271c8e 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString )
setFolder( folder );
} else {
if ( !idString.isEmpty() ) {
- edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) );
+ edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) );
} else {
edit->setText( i18n( "Please select a folder" ) );
}
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 9095a647b..770b6cfc6 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder,
TQWidget *parent,
const char *name )
: KDialogBase( parent, name, true,
- i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ),
+ i18n( "Shortcut for Folder %1" ).arg( folder->label() ),
KDialogBase::Ok | KDialogBase::Cancel ),
mFolder( folder ), mMainWidget( mainwidget )
{
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 57241cd4b..bfc36b70a 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread()
if (!(msgBase = getMsgBase(i))) continue;
if (msgBase->isNew())
{
- msgBase->seStatus(KMMsgStatusUnread);
+ msgBase->setStatus(KMMsgStatusUnread);
msgBase->setDirty(true);
}
}
@@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx)
kdDebug(5006) << "Error: " << location() <<
" Index file is inconsistent with folder file. This should never happen." << endl;
- // We can't recreate the index at this point, since that would tqinvalidate the current
+ // We can't recreate the index at this point, since that would invalidate the current
// message list and delete KMMsgBase or KMMessage objects that are in use.
// Do it later in KMFolderIndex::readIndexHeader() instead.
mCompactable = false; // Don't compact
@@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const
}
//-----------------------------------------------------------------------------
-void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle)
+void FolderStorage::setStatus(int idx, KMMsgStatus status, bool toggle)
{
KMMsgBase *msg = getMsgBase(idx);
if ( msg ) {
if (toggle)
msg->toggleStatus(status, idx);
else
- msg->seStatus(status, idx);
+ msg->setStatus(status, idx);
}
}
//-----------------------------------------------------------------------------
-void FolderStorage::seStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
+void FolderStorage::setStatus(TQValueList& ids, KMMsgStatus status, bool toggle)
{
for ( TQValueList::Iterator it = ids.begin(); it != ids.end(); ++it )
{
- FolderStorage::seStatus(*it, status, toggle);
+ FolderStorage::setStatus(*it, status, toggle);
}
}
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 390675a25..3aeefbc4c 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -71,7 +71,7 @@ typedef TQValueList SerNumList;
*
* @section Accounts
* The accounts (of KMail) that are fed into the folder are
- * represented as the tqchildren of the folder. They are only stored here
+ * represented as the children of the folder. They are only stored here
* during runtime to have a reference for which accounts point to a
* specific folder.
*/
@@ -109,10 +109,10 @@ public:
/** Specify, that the folder can't contain mails. */
virtual void setNoContent(bool aNoContent);
- /** Returns, if the folder can't have tqchildren */
+ /** Returns, if the folder can't have children */
virtual bool noChildren() const { return mNoChildren; }
- /** Specify, that the folder can't have tqchildren */
+ /** Specify, that the folder can't have children */
virtual void setNoChildren( bool aNoChildren );
enum ChildrenState {
@@ -120,11 +120,11 @@ public:
HasNoChildren,
ChildrenUnknown
};
- /** Returns if the folder has tqchildren,
- * has no tqchildren or we don't know */
+ /** Returns if the folder has children,
+ * has no children or we don't know */
virtual ChildrenState hasChildren() const { return mHasChildren; }
- /** Specify if the folder has tqchildren */
+ /** Specify if the folder has children */
virtual void setHasChildren( ChildrenState state )
{ mHasChildren = state; }
@@ -245,7 +245,7 @@ public:
* be reflected in the UI. */
virtual bool isCloseToQuota() const;
- /** Called by KMMsgBase::seStatus when status of a message has changed
+ /** Called by KMMsgBase::setStatus when status of a message has changed
required to keep the number unread messages variable current. */
virtual void msgStatusChanged( const KMMsgStatus oldStatus,
const KMMsgStatus newStatus,
@@ -364,10 +364,10 @@ public:
void deregisterFromMessageDict();
/** Set the status of the message at index @p idx to @p status. */
- virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false);
+ virtual void setStatus(int idx, KMMsgStatus status, bool toggle=false);
/** Set the status of the message(s) in the TQValueList @p ids to @p status. */
- virtual void seStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
+ virtual void setStatus(TQValueList& ids, KMMsgStatus status, bool toggle=false);
void removeJobs();
diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 8557388ac..68c881f05 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
}
// set it
- bool tqrepaint = false;
+ bool repaint = false;
if (fti->unreadCount() != count) {
fti->adjustUnreadCount( count );
- tqrepaint = true;
+ repaint = true;
}
if (isTotalActive() || force)
{
@@ -196,7 +196,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
// set it
if ( count != fti->totalCount() ) {
fti->setTotalCount(count);
- tqrepaint = true;
+ repaint = true;
}
}
if ( isSizeActive() || force ) {
@@ -204,7 +204,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
TQ_INT64 size = folder->storage()->folderSize();
if ( size != fti->folderSize() ) {
fti->setFolderSize( size );
- tqrepaint = true;
+ repaint = true;
}
}
}
@@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/
}
if (fti->parent() && !fti->parent()->isOpen())
- tqrepaint = false; // we're not visible
- if (tqrepaint) {
+ repaint = false; // we're not visible
+ if (repaint) {
fti->setNeedsRepaint( true );
emit triggerRefresh();
}
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 40b543be7..0c2554dc0 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent
KMessageBox::information(parent,
i18n("The folder you deleted was associated with the account "
"%1 which delivered mail into it. The folder the account "
- "delivers new mail into was reset to the main Inbox folder.").tqarg( (*it)->name()));
+ "delivers new mail into was reset to the main Inbox folder.").arg( (*it)->name()));
}
}
if (folderToDelete->folderType() == KMFolderTypeImap)
diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h
index 096d22764..dfc3bbbaf 100644
--- a/kmail/folderviewtooltip.h
+++ b/kmail/folderviewtooltip.h
@@ -32,15 +32,15 @@ class FolderViewToolTip : public TQToolTip
item->updateCount();
TQString tipText = i18n("%1
Total: %2
Unread: %3
Size: %4" )
- .tqarg( item->folder()->prettyURL().replace( " ", " " ) )
- .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
- .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
- .tqarg( KIO::convertSize( item->folderSize() ) );
+ .arg( item->folder()->prettyURL().replace( " ", " " ) )
+ .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) )
+ .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) )
+ .arg( KIO::convertSize( item->folderSize() ) );
if ( KMFolderCachedImap* imap = dynamic_cast( item->folder()->storage() ) ) {
QuotaInfo info = imap->quotaInfo();
if ( info.isValid() && !info.isEmpty() )
- tipText += i18n("
Quota: %1").tqarg( info.toString() );
+ tipText += i18n("
Quota: %1").arg( info.toString() );
}
tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText );
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 14d467327..7decd39f2 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const
// Update this item to summarise a new folder and message
-//Opens all tqchildren in the thread
+//Opens all children in the thread
void HeaderItem::setOpenRecursive( bool open )
{
if (open){
@@ -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" ).tqarg( msg->getMsgSerNum(), 0, 36 );
+ TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 );
while (sortArrival.length() < 7) sortArrival = '0' + sortArrival;
if (column == paintInfo->dateCol) {
diff --git a/kmail/headeritem.h b/kmail/headeritem.h
index 2142cf71b..34dee4de0 100644
--- a/kmail/headeritem.h
+++ b/kmail/headeritem.h
@@ -80,20 +80,20 @@ public:
/** Returns whether the item has other items below it. */
bool hasChildren() const
{ return mSortedChildren.count() || mUnsortedCount; }
- /** The sorted tqchildren are an array of sortcache items we know are below the
+ /** The sorted children are an array of sortcache items we know are below the
* current one and are already properly sorted (as read from the cache ) */
const TQPtrList *sortedChildren() const
{ return &mSortedChildren; }
- /** The unsorted tqchildren are an array of sortcache items we know are below the
+ /** The unsorted children are an array of sortcache items we know are below the
* current one, but are yet to be threaded and sorted properly. */
SortCacheItem **unsortedChildren(int &count) const
{ count = mUnsortedCount; return mUnsortedChildren; }
- /** Add an item to this itme's list of already sorted tqchildren. */
+ /** Add an item to this itme's list of already sorted children. */
void addSortedChild(SortCacheItem *i) {
i->mParent = this;
mSortedChildren.append(i);
}
- /** Add an item to this itme's list of unsorted tqchildren. */
+ /** Add an item to this itme's list of unsorted children. */
void addUnsortedChild(SortCacheItem *i) {
i->mParent = this;
if(!mUnsortedChildren)
@@ -104,7 +104,7 @@ public:
mUnsortedChildren[mUnsortedCount++] = i;
}
- /** Clear the sorted and unsorted tqchildren datastructures. */
+ /** Clear the sorted and unsorted children datastructures. */
void clearChildren() {
mSortedChildren.clear();
free( mUnsortedChildren );
@@ -185,7 +185,7 @@ public:
// Return the serial number of the message associated with this item;
TQ_UINT32 msgSerNum() const;
- /** Expands all tqchildren of the list view item. */
+ /** Expands all children of the list view item. */
void setOpenRecursive( bool open );
/** Returns the text of the list view item. */
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 405f802b1..ab3ae9364 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.tqarg( useSpan ? "span" : "div" )
- .tqarg( useSpan ? "span" : "div" )
- .tqarg( dir )
- .tqarg( LinkLocator::convertToHtml( str ) );
+ return format.arg( useSpan ? "span" : "div" )
+ .arg( useSpan ? "span" : "div" )
+ .arg( dir )
+ .arg( LinkLocator::convertToHtml( str ) );
}
#endif
@@ -262,13 +262,13 @@ namespace KMail {
return headerStr + "";
}
- headerStr = TQString("