diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/compactionjob.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/compactionjob.cpp')
| -rw-r--r-- | kmail/compactionjob.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index 3d3dd6acc..5de762e96 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -96,7 +96,7 @@ int MboxCompactionJob::executeNow( bool silent ) if (!storage->compactable()) { kdDebug(5006) << storage->location() << " compaction skipped." << endl; if ( !mSilent ) { - TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() ); + TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() ); BroadcastqStatus::instance()->seStatusMsg( str ); } return 0; @@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc ) mbox->close("mboxcompact", true); mbox->setAutoCreateIndex( autoCreate ); mbox->setNeedsCompacting( false ); // We are clean now - str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); kdDebug(5006) << str << endl; } else { mbox->close("mboxcompact"); - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl; kdDebug(5006) << "Compaction aborted." << endl; TQFile::remove( mTempName ); @@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc ) mCancellable = false; TQString str; if ( !rc ) { - str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); } else { - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); } mErrorCode = rc; storage->setNeedsCompacting( false ); |