summaryrefslogtreecommitdiffstats
path: root/kmail/kmfoldercachedimap.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kmail/kmfoldercachedimap.cpp
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kmail/kmfoldercachedimap.cpp')
-rw-r--r--kmail/kmfoldercachedimap.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index d30316a9c..10dfff5af 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -75,7 +75,7 @@ using KMail::ListJob;
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqvaluelist.h>
#include "annotationjobs.h"
@@ -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() ) );
@@ -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" );
}
}
@@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags()
// Send off a status setting job for each set.
for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) {
TQString imappath = imapPath() + ";UID=" + ( *slit );
- mAccount->setImapStatus(folder(), imappath, flags);
+ mAccount->setImaptqStatus(folder(), imappath, flags);
}
}
// FIXME END DUPLICATED FROM KMFOLDERIMAP
@@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags()
mStatusFlagsJobs += sets.count();
for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
TQString imappath = imapPath() + ";UID=" + ( *it );
- mAccount->setImapSeenStatus( folder(), imappath, true );
+ mAccount->setImapSeentqStatus( folder(), imappath, true );
}
}
if ( !unseenUids.isEmpty() ) {
@@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags()
mStatusFlagsJobs += sets.count();
for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) {
TQString imappath = imapPath() + ";UID=" + ( *it );
- mAccount->setImapSeenStatus( folder(), imappath, false );
+ mAccount->setImapSeentqStatus( folder(), imappath, false );
}
}
@@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString&
}
// This is not perfect, what if the status didn't really change? Oh well ...
-void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle)
{
- KMFolderMaildir::seStatus( idx, status, toggle );
+ KMFolderMaildir::setqStatus( idx, status, toggle );
const KMMsgBase *msg = getMsgBase( idx );
Q_ASSERT( msg );
if ( msg )
mUIDsOfLocallyChangedStatuses.insert( msg->UID() );
}
-void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle)
+void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle)
{
- KMFolderMaildir::seStatus(ids, status, toggle);
+ KMFolderMaildir::setqStatus(ids, status, toggle);
for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) {
const KMMsgBase *msg = getMsgBase( *it );
Q_ASSERT( msg );
@@ -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 );
}
@@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray &
// be considered correct.
if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
/* The message is OK, update flags */
- KMFolderImap::flagsToStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags );
+ KMFolderImap::flagsTotqStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags );
} else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) {
- KMFolderImap::seenFlagToStatus( existingMessage, flags );
+ KMFolderImap::seenFlagTotqStatus( existingMessage, flags );
}
}
// kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl;
@@ -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 );
@@ -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 ) {
@@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState()
KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
TQString str = i18n("Aborted");
if (progressItem)
- progressItem->seStatus( str );
+ progressItem->setqStatus( str );
emit statusMsg( str );
emit syncStateChanged();
}
@@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress()
mProgress += 5;
}
-void KMFolderCachedImap::newState( int progress, const TQString& syncStatus )
+void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus )
{
- //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl;
+ //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl;
KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem();
if( progressItem )
progressItem->setCompletedItems( progress );
- if ( !syncStatus.isEmpty() ) {
+ if ( !synctqStatus.isEmpty() ) {
TQString str;
// For a subfolder, show the label. But for the main folder, it's already shown.
if ( mAccount->imapFolder() == this )
- str = syncStatus;
+ str = synctqStatus;
else
- str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus );
+ str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus );
if( progressItem )
- progressItem->seStatus( str );
+ progressItem->setqStatus( str );
emit statusMsg( str );
}
if( progressItem )
@@ -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
@@ -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;
@@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages()
break;
// create subfolder for this incident
- TQDate today = TQDate::currentDate();
+ TQDate today = TQDate::tqcurrentDate();
TQString baseName = folder()->label() + "-" + TQString::number( today.year() )
+ (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() )
+ (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() );
@@ -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 );