summaryrefslogtreecommitdiffstats
path: root/kmail/kmfoldermaildir.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmfoldermaildir.cpp')
-rw-r--r--kmail/kmfoldermaildir.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index fe19131fb..8c54e3c24 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -291,7 +291,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS
continue;
// first, make sure this isn't in the 'new' subdir
- if ( entryList.tqcontains( filename ) )
+ if ( entryList.contains( filename ) )
moveInternal(subdirNew + filename, subdirCur + filename, mi);
// construct a valid filename. if it's already valid, then
@@ -381,7 +381,7 @@ if( fileD0.open( IO_WriteOnly ) ) {
if (msgParent==folder() && !kmkernel->folderIsDraftOrOutbox(folder()))
return 0;
- idx = msgParent->tqfind(aMsg);
+ idx = msgParent->find(aMsg);
msgParent->getMsg( idx );
}
@@ -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.tqfind(":2,") == -1)
+ if (file.find(":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.tqfind( '>' );
+ rightAngle = msgIdStr.find( '>' );
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.tqfind( '>' );
+ rightAngle = replyToIdStr.find( '>' );
if( rightAngle != -1 )
replyToIdStr.truncate( rightAngle + 1 );
}
@@ -652,7 +652,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
referencesStr = referencesStr.stripWhiteSpace();
if( !referencesStr.isEmpty() ) {
int leftAngle, rightAngle;
- leftAngle = referencesStr.tqfindRev( '<' );
+ leftAngle = referencesStr.findRev( '<' );
if( ( leftAngle != -1 )
&& ( replyToIdStr.isEmpty() || ( replyToIdStr[0] != '<' ) ) ) {
// use the last reference, instead of missing In-Reply-To
@@ -660,10 +660,10 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
}
// find second last reference
- leftAngle = referencesStr.tqfindRev( '<', leftAngle - 1 );
+ leftAngle = referencesStr.findRev( '<', leftAngle - 1 );
if( leftAngle != -1 )
referencesStr = referencesStr.mid( leftAngle );
- rightAngle = referencesStr.tqfindRev( '>' );
+ rightAngle = referencesStr.findRev( '>' );
if( rightAngle != -1 )
referencesStr.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.tqfind( '>' );
+ rightAngle = referencesStr.find( '>' );
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.tqfind( "charset=" );
+ int cidx = contentTypeStr.find( "charset=" );
if ( cidx != -1 ) {
charset = contentTypeStr.mid( cidx + 8 );
if ( !charset.isEmpty() && ( charset[0] == '"' ) ) {
@@ -1046,7 +1046,7 @@ TQString KMFolderMaildir::constructValidFileName( const TQString & filename,
if (!suffix_regex)
suffix_regex_sd.setObject(suffix_regex, new TQRegExp(":2,?R?S?$"));
- aFileName.truncate(aFileName.tqfindRev(*suffix_regex));
+ aFileName.truncate(aFileName.findRev(*suffix_regex));
// only add status suffix if the message is neither new nor unread
if (! ((status & KMMsgStatusNew) || (status & KMMsgStatusUnread)) )