diff options
Diffstat (limited to 'kmail/kmmsgbase.cpp')
-rw-r--r-- | kmail/kmmsgbase.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index aed324580..eb8ed59e0 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.at(i).tqunicode() >= 128) { - result.at(i) = '?'; + if (result.tqat(i).tqunicode() >= 128) { + result.tqat(i) = '?'; all_ok = false; } if (ok) @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.at(i).tqunicode() >= 128) nonAscii++; + if (_str.tqat(i).tqunicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, start = pos; p = pos; while (p < strLength) { - if (!breakLine && (_str.at(p) == ' ' || dontQuote.tqfind(_str.at(p)) != -1)) + if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.tqfind(_str.tqat(p)) != -1)) start = p + 1; - if (_str.at(p).tqunicode() >= 128 || _str.at(p).tqunicode() < 32) + if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32) break; p++; } if (breakLine || p < strLength) { - while (dontQuote.tqfind(_str.at(start)) != -1) start++; + while (dontQuote.tqfind(_str.tqat(start)) != -1) start++; stop = start; - while (stop < strLength && dontQuote.tqfind(_str.at(stop)) == -1) + while (stop < strLength && dontQuote.tqfind(_str.tqat(stop)) == -1) stop++; result += _str.mid(pos, start - pos).latin1(); encLength = encodeRFC2047Quoted(codec->fromUnicode(_str. @@ -843,13 +843,13 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, stop = start + dif; } p = stop; - while (p > start && _str.at(p) != ' ') p--; + while (p > start && _str.tqat(p) != ' ') p--; if (p > start) stop = p; if (result.right(3) == "?= ") start--; if (result.right(5) == "?=\n ") { start--; result.truncate(result.length() - 1); } - int lastNewLine = result.findRev("\n "); + int lastNewLine = result.tqfindRev("\n "); if (!result.mid(lastNewLine).stripWhiteSpace().isEmpty() && result.length() - lastNewLine + encLength + 2 > maxLen) result += "\n "; @@ -951,18 +951,18 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str) TQCString charset = _str.left(p); - TQCString st = _str.mid(_str.findRev('\'') + 1); + TQCString st = _str.mid(_str.tqfindRev('\'') + 1); char ch, ch2; p = 0; while (p < (int)st.length()) { - if (st.at(p) == 37) + if (st.tqat(p) == 37) { - ch = st.at(p+1) - 48; + ch = st.tqat(p+1) - 48; if (ch > 16) ch -= 7; - ch2 = st.at(p+2) - 48; + ch2 = st.tqat(p+2) - 48; if (ch2 > 16) ch2 -= 7; - st.at(p) = ch * 16 + ch2; + st.tqat(p) = ch * 16 + ch2; st.remove( p+1, 2 ); } p++; @@ -1477,7 +1477,7 @@ TQString KMMsgBase::replacePrefixes( const TQString& str, // 1. is anchored to the beginning of str (sans whitespace) // 2. matches at least one of the part regexps in prefixRegExps TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*") - .arg( prefixRegExps.join(")|(?:") ); + .tqarg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \"" |