summaryrefslogtreecommitdiffstats
path: root/kmail/kmmsgbase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmmsgbase.cpp')
-rw-r--r--kmail/kmmsgbase.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index eb8ed59e0..e69dcdfb0 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -142,7 +142,7 @@ void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx)
}
if (storage()) {
if (idx < 0)
- idx = storage()->tqfind( this );
+ idx = storage()->find( this );
storage()->msgStatusChanged( oldtqStatus, status(), idx );
storage()->headerOfMsgChanged(this, idx);
}
@@ -258,7 +258,7 @@ void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
if ( oldtqStatus != mtqStatus && storage() ) {
if (idx < 0)
- idx = storage()->tqfind( this );
+ idx = storage()->find( this );
storage()->msgStatusChanged( oldtqStatus, status(), idx );
storage()->headerOfMsgChanged( this, idx );
}
@@ -608,7 +608,7 @@ TQStringList KMMsgBase::supportedEncodings(bool usAscii)
{
TQTextCodec *codec = KGlobal::charsets()->codecForName(*it);
TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it);
- if (mimeNames.tqfind(mimeName) == mimeNames.end())
+ if (mimeNames.find(mimeName) == mimeNames.end())
{
encodings.append(KGlobal::charsets()->languageForEncoding(*it)
+ " ( " + mimeName + " )");
@@ -665,7 +665,7 @@ TQString KMMsgBase::decodeRFC2047String(const TQCString& aStr, TQCString prefCha
if ( str.isEmpty() )
return TQString();
- if ( str.tqfind( "=?" ) < 0 ) {
+ if ( str.find( "=?" ) < 0 ) {
if ( !prefCharset.isEmpty() &&
kmkernel->isCodecAsciiCompatible( KMMsgBase::codecForName( prefCharset ) ) ) {
if ( prefCharset == "us-ascii" ) {
@@ -813,7 +813,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
start = pos; p = pos;
while (p < strLength)
{
- if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.tqfind(_str.tqat(p)) != -1))
+ if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.find(_str.tqat(p)) != -1))
start = p + 1;
if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32)
break;
@@ -821,9 +821,9 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
}
if (breakLine || p < strLength)
{
- while (dontQuote.tqfind(_str.tqat(start)) != -1) start++;
+ while (dontQuote.find(_str.tqat(start)) != -1) start++;
stop = start;
- while (stop < strLength && dontQuote.tqfind(_str.tqat(stop)) == -1)
+ while (stop < strLength && dontQuote.find(_str.tqat(stop)) == -1)
stop++;
result += _str.mid(pos, start - pos).latin1();
encLength = encodeRFC2047Quoted(codec->fromUnicode(_str.
@@ -849,7 +849,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str,
if (result.right(5) == "?=\n ") {
start--; result.truncate(result.length() - 1);
}
- int lastNewLine = result.tqfindRev("\n ");
+ int lastNewLine = result.findRev("\n ");
if (!result.mid(lastNewLine).stripWhiteSpace().isEmpty()
&& result.length() - lastNewLine + encLength + 2 > maxLen)
result += "\n ";
@@ -946,12 +946,12 @@ TQCString KMMsgBase::encodeRFC2231StringAutoDetectCharset( const TQString &str,
//-----------------------------------------------------------------------------
TQString KMMsgBase::decodeRFC2231String(const TQCString& _str)
{
- int p = _str.tqfind('\'');
+ int p = _str.find('\'');
if (p < 0) return kmkernel->networkCodec()->toUnicode(_str);
TQCString charset = _str.left(p);
- TQCString st = _str.mid(_str.tqfindRev('\'') + 1);
+ TQCString st = _str.mid(_str.findRev('\'') + 1);
char ch, ch2;
p = 0;
while (p < (int)st.length())
@@ -996,10 +996,10 @@ TQCString KMMsgBase::extractRFC2231HeaderField( const TQCString &aStr, const TQC
// Quoted values end at the ending quote
if ( aStr[startPart] == '"' ) {
startPart++; // the double quote isn't part of the filename
- endPart = aStr.tqfind('"', startPart) - 1;
+ endPart = aStr.find('"', startPart) - 1;
}
else {
- endPart = aStr.tqfind(';', startPart) - 1;
+ endPart = aStr.find(';', startPart) - 1;
}
if (endPart < 0)
endPart = 32767;
@@ -1081,7 +1081,7 @@ unsigned long KMMsgBase::getMsgSerNum() const
if (msn)
return msn;
if (mParent) {
- int index = mParent->tqfind((KMMsgBase*)this);
+ int index = mParent->find((KMMsgBase*)this);
msn = KMMsgDict::instance()->getMsgSerNum(mParent, index);
if (msn)
MessageProperty::setSerialCache( this, msn );
@@ -1450,11 +1450,11 @@ void KMMsgBase::readConfig()
sReplySubjPrefixes = composerGroup.readListEntry("reply-prefixes", ',');
if (sReplySubjPrefixes.isEmpty())
sReplySubjPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:";
- sReplaceSubjPrefix = composerGroup.readBoolEntry("tqreplace-reply-prefix", true);
+ sReplaceSubjPrefix = composerGroup.readBoolEntry("replace-reply-prefix", true);
sForwardSubjPrefixes = composerGroup.readListEntry("forward-prefixes", ',');
if (sForwardSubjPrefixes.isEmpty())
sForwardSubjPrefixes << "Fwd:" << "FW:";
- sReplaceForwSubjPrefix = composerGroup.readBoolEntry("tqreplace-forward-prefix", true);
+ sReplaceForwSubjPrefix = composerGroup.readBoolEntry("replace-forward-prefix", true);
}
//-----------------------------------------------------------------------------
@@ -1469,7 +1469,7 @@ TQString KMMsgBase::stripOffPrefixes( const TQString& str )
// static
TQString KMMsgBase::replacePrefixes( const TQString& str,
const TQStringList& prefixRegExps,
- bool tqreplace,
+ bool replace,
const TQString& newPrefix )
{
bool recognized = false;
@@ -1489,8 +1489,8 @@ TQString KMMsgBase::replacePrefixes( const TQString& str,
TQString tmp = str;
if ( rx.search( tmp ) == 0 ) {
recognized = true;
- if ( tqreplace )
- return tmp.tqreplace( 0, rx.matchedLength(), newPrefix + ' ' );
+ if ( replace )
+ return tmp.replace( 0, rx.matchedLength(), newPrefix + ' ' );
}
}
if ( !recognized )
@@ -1508,10 +1508,10 @@ TQString KMMsgBase::cleanSubject() const
//-----------------------------------------------------------------------------
TQString KMMsgBase::cleanSubject( const TQStringList & prefixRegExps,
- bool tqreplace,
+ bool replace,
const TQString & newPrefix ) const
{
- return KMMsgBase::replacePrefixes( subject(), prefixRegExps, tqreplace,
+ return KMMsgBase::replacePrefixes( subject(), prefixRegExps, replace,
newPrefix );
}