diff options
Diffstat (limited to 'kmail/kmfoldermaildir.cpp')
| -rw-r--r-- | kmail/kmfoldermaildir.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 6947bc78..1ae867bd 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess() KCursorSaver idle(KBusyPtr::idle()); if ( nRetVal == ENOENT ) KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); else KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid " "maildir folder, or you do not have sufficient access permissions.") - .tqarg(sBadFolderName)); + .arg(sBadFolderName)); return nRetVal; } @@ -117,12 +117,12 @@ int KMFolderMaildir::open(const char *) if (!folder()->path().isEmpty()) { - if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed + if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed { TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed; recreating index.") - .tqarg(name()); + .arg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS // we can't have any New messages at this point if (mi->isNew()) { - mi->setqStatus(KMMsgStatusUnread); + mi->seStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; if (ftell(mIndexStream) > revert) { kdDebug(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on tqdevice or insufficient quota?)\n" + "(No space left on device or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx) } -void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status) +void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status) { // we keep our current directory to restore it later char path_buffer[PATH_MAX]; @@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents() return 0; } -KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus() +KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd; //----------------------------------------------------------------------------- // static TQString KMFolderMaildir::constructValidFileName( const TQString & filename, - KMMsgtqStatus status ) + KMMsgStatus status ) { TQString aFileName( filename ); @@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status) +TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status) { TQString dest(newLoc); // make sure that our destination filename doesn't already exist @@ -1096,13 +1096,13 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus, - const KMMsgtqStatus newtqStatus, int idx) +void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus, + const KMMsgStatus newStatus, int idx) { // if the status of any message changes, then we need to compact needsCompact = true; - KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx); + KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx); } /*virtual*/ |