diff options
Diffstat (limited to 'kmail/kmfoldermaildir.cpp')
-rw-r--r-- | kmail/kmfoldermaildir.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 2ec8326ed..ace5a6ddc 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -117,7 +117,7 @@ int KMFolderMaildir::open(const char *) if (!folder()->path().isEmpty()) { - if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed + if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed { TQString str; mIndexStream = 0; @@ -279,7 +279,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS TQString subdirCur(location() + "/cur/"); unsigned int stopIndex = nbMessages == -1 ? mMsgList.count() : - QMIN( mMsgList.count(), startIndex + nbMessages ); + TQMIN( mMsgList.count(), startIndex + nbMessages ); //kdDebug(5006) << "KMFolderMaildir: compacting from " << startIndex << " to " << stopIndex << endl; for(unsigned int idx = startIndex; idx < stopIndex; ++idx) { KMMsgInfo* mi = (KMMsgInfo*)mMsgList.at(idx); @@ -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->seStatus(KMMsgStatusUnread); + mi->setqStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -375,13 +375,13 @@ if( fileD0.open( IO_WriteOnly ) ) { int rc; // take message out of the folder it is currently in, if any - msgParent = aMsg->parent(); + msgParent = aMsg->tqparent(); if (msgParent) { if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder())) return 0; - idx = msgParent->find(aMsg); + idx = msgParent->tqfind(aMsg); msgParent->getMsg( idx ); } @@ -404,7 +404,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (len <= 0) { - kdDebug(5006) << "Message added to folder `" << name() << "' tqcontains no data. Ignoring it." << endl; + kdDebug(5006) << "Message added to folder `" << name() << "' contains no data. Ignoring it." << endl; return 0; } @@ -480,7 +480,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (aMsg->getMsgSerNum() <= 0) aMsg->setMsgSerNum(); else - tqreplaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); + replaceMsgSerNum( aMsg->getMsgSerNum(), &aMsg->toMsgBase(), idx ); // write index entry if desired if (mAutoCreateIndex) @@ -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 device?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << 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 device or insufficient quota?)\n" + "(No space left on tqdevice 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, KMMsgStatus status) +void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status) { // we keep our current directory to restore it later char path_buffer[PATH_MAX]; @@ -596,7 +596,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& // actually be some other state (but not New) if (status == KMMsgStatusRead) { - if (file.find(":2,") == -1) + if (file.tqfind(":2,") == -1) status = KMMsgStatusUnread; else if (file.right(5) == ":2,RS") status |= KMMsgStatusReplied; @@ -636,7 +636,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& msgIdStr = msgIdStr.stripWhiteSpace(); if( !msgIdStr.isEmpty() ) { int rightAngle; - rightAngle = msgIdStr.find( '>' ); + rightAngle = msgIdStr.tqfind( '>' ); if( rightAngle != -1 ) msgIdStr.truncate( rightAngle + 1 ); } @@ -644,7 +644,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& replyToIdStr = replyToIdStr.stripWhiteSpace(); if( !replyToIdStr.isEmpty() ) { int rightAngle; - rightAngle = replyToIdStr.find( '>' ); + rightAngle = replyToIdStr.tqfind( '>' ); if( rightAngle != -1 ) replyToIdStr.truncate( rightAngle + 1 ); } @@ -672,7 +672,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& // message In-Reply-To points to is not kept in this folder, // but e.g. in an Outbox replyToAuxIdStr = referencesStr; - rightAngle = referencesStr.find( '>' ); + rightAngle = referencesStr.tqfind( '>' ); if( rightAngle != -1 ) replyToAuxIdStr.truncate( rightAngle + 1 ); } @@ -697,7 +697,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& charset = ""; if ( !contentTypeStr.isEmpty() ) { - int cidx = contentTypeStr.find( "charset=" ); + int cidx = contentTypeStr.tqfind( "charset=" ); if ( cidx != -1 ) { charset = contentTypeStr.mid( cidx + 8 ); if ( !charset.isEmpty() && ( charset[0] == '"' ) ) { @@ -800,7 +800,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& { xmarkStr = TQCString(line+13); } - else if (strncasecmp(line, "X-Status:", 9) == 0) + else if (strncasecmp(line, "X-tqStatus:", 9) == 0) { statusStr = TQCString(line+9); } @@ -864,8 +864,8 @@ int KMFolderMaildir::createIndexFromContents() curDir.setFilter(TQDir::Files); // then, we look for all the 'cur' files - const QFileInfoList *list = curDir.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = curDir.entryInfoList(); + TQFileInfoListIterator it(*list); TQFileInfo *fi; while ((fi = it.current())) @@ -893,7 +893,7 @@ int KMFolderMaildir::createIndexFromContents() correctUnreadMsgsCount(); if (kmkernel->outboxFolder() == folder() && count() > 0) - KMessageBox::information(0, i18n("Your outbox tqcontains messages which were " + KMessageBox::information(0, i18n("Your outbox contains messages which were " "most-likely not created by KMail;\nplease remove them from there if you " "do not want KMail to send them.")); @@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents() return 0; } -KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus() +KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -989,8 +989,8 @@ static bool removeDirAndContentsRecursively( const TQString & path ) d.setPath( path ); d.setFilter( TQDir::Files | TQDir::Dirs | TQDir::Hidden | TQDir::NoSymLinks ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd; //----------------------------------------------------------------------------- // static TQString KMFolderMaildir::constructValidFileName( const TQString & filename, - KMMsgStatus status ) + KMMsgtqStatus 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, KMMsgStatus status) +TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status) { TQString dest(newLoc); // make sure that our destination filename doesn't already exist @@ -1090,19 +1090,19 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n TQDir d; if (d.rename(oldLoc, dest) == false) - return TQString::null; + return TQString(); else return dest; } //----------------------------------------------------------------------------- -void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx) +void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx) { // if the status of any message changes, then we need to compact needsCompact = true; - KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx); + KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx); } /*virtual*/ |