summaryrefslogtreecommitdiffstats
path: root/kmail/kmfolderimap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmfolderimap.cpp')
-rw-r--r--kmail/kmfolderimap.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp
index 51e5762e8..6d3d468ec 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" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+ i18n( "URL: %1" ).arg( 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").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ),
+ i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ),
true,
account()->useSSL() || account()->useTLS() );
mAddMessageProgressItem->setTotalItems( msgList.count() );
@@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames,
// update progress
account()->listDirProgressItem()->incCompletedItems();
account()->listDirProgressItem()->updateProgress();
- account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") );
+ account()->listDirProgressItem()->setStatus( folder()->prettyURL() + i18n(" completed") );
f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] );
f->setChildrenState( subfolderAttributes[i] );
@@ -1003,11 +1003,11 @@ bool KMFolderImap::mailCheckInProgress() const
//-----------------------------------------------------------------------------
void KMFolderImap::setChildrenState( TQString attributes )
{
- // update tqchildren state
- if ( attributes.find( "hastqchildren", 0, false ) != -1 )
+ // update children state
+ if ( attributes.find( "haschildren", 0, false ) != -1 )
{
setHasChildren( FolderStorage::HasChildren );
- } else if ( attributes.find( "hasnotqchildren", 0, false ) != -1 ||
+ } else if ( attributes.find( "hasnochildren", 0, false ) != -1 ||
attributes.find( "noinferiors", 0, false ) != -1 )
{
setHasChildren( FolderStorage::HasNoChildren );
@@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity()
mMailCheckProgressItem->setProgress(0);
}
if ( account()->mailCheckProgressItem() ) {
- account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() );
+ account()->mailCheckProgressItem()->setStatus( folder()->prettyURL() );
}
ImapAccountBase::jobData jd( url.url() );
KIO::SimpleJob *job = KIO::get(url, false, false);
@@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
if (startUid.isEmpty())
{
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus( i18n("Retrieving message status") );
+ mMailCheckProgressItem->setStatus( i18n("Retrieving message status") );
url.setPath(imapPath() + ";SECTION=UID FLAGS");
KIO::SimpleJob *job = KIO::listDir(url, false);
KIO::Scheduler::assignJobToSlave(account()->slave(), job);
@@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid)
} else {
mContentState = imapDownloadInProgress;
if ( mMailCheckProgressItem )
- mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+ mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
url.setPath(imapPath() + ";UID=" + startUid
+ ":*;SECTION=ENVELOPE");
KIO::SimpleJob *newJob = KIO::get(url, false, false);
@@ -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.").tqarg( label() ) );
+ i18n("Error while listing the contents of the folder %1.").arg( label() ) );
account()->removeJob(it);
finishMailCheck( "listfolder", imapNoInformation );
return;
@@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job)
mMailCheckProgressItem->setCompletedItems( 0 );
mMailCheckProgressItem->setTotalItems( jd.total );
mMailCheckProgressItem->setProgress( 0 );
- mMailCheckProgressItem->seStatus( i18n("Retrieving messages") );
+ mMailCheckProgressItem->setStatus( i18n("Retrieving messages") );
}
TQStringList sets;
@@ -1460,7 +1460,7 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
const KMMsgStatus oldStatus = msg->status();
if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 )
- msg->seStatus( KMMsgStatusOld );
+ msg->setStatus( KMMsgStatusOld );
// In case the message does not have the seen flag set, override our local
// notion that it is read. Otherwise the count of unread messages and the
@@ -1468,10 +1468,10 @@ void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg)
if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) {
if (newMsg) {
if ( (oldStatus & KMMsgStatusNew) == 0 )
- msg->seStatus( KMMsgStatusNew );
+ msg->setStatus( KMMsgStatusNew );
} else {
if ( (oldStatus & KMMsgStatusUnread) == 0 )
- msg->seStatus( KMMsgStatusUnread );
+ msg->setStatus( KMMsgStatusUnread );
}
}
}
@@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data)
}
// Transfer the status, if it is cached.
if ( md ) {
- msg->seStatus( md->status() );
+ msg->setStatus( md->status() );
} else if ( !account()->hasCapability("uidplus") ) {
// see if we have cached the msgIdMD5 and get the status +
// serial number from there
TQString id = msg->msgIdMD5();
if ( mMetaDataMap.find( id ) ) {
md = mMetaDataMap[id];
- msg->seStatus( md->status() );
+ msg->setStatus( md->status() );
if ( md->serNum() != 0 && serNum == 0 ) {
msg->setMsgSerNum( md->serNum() );
}
@@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList)
}
//-----------------------------------------------------------------------------
-void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle)
+void KMFolderImap::setStatus(int idx, KMMsgStatus status, bool toggle)
{
TQValueList<int> ids; ids.append(idx);
- seStatus(ids, status, toggle);
+ setStatus(ids, status, toggle);
}
-void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
+void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle)
{
- FolderStorage::seStatus(_ids, status, toggle);
+ FolderStorage::setStatus(_ids, status, toggle);
TQValueList<int> ids;
if ( mUploadAllFlags ) {
kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl;
@@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state )
mSubfolderState = state;
if ( state == imapNoInformation && folder()->child() )
{
- // pass through to tqchildren
+ // pass through to children
KMFolderNode* node;
TQPtrListIterator<KMFolderNode> it( *folder()->child() );
for ( ; (node = it.current()); )