diff options
Diffstat (limited to 'kalarm/kamail.cpp')
| -rw-r--r-- | kalarm/kamail.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index 558406626..261e3865d 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -249,7 +249,7 @@ TQString KAMail::sendKMail(const KAMailData& data) if (func.left(5) == "bool ") { func = func.mid(5); - func.tqreplace(TQRegExp(" [0-9A-Za-z_:]+"), ""); + func.replace(TQRegExp(" [0-9A-Za-z_:]+"), ""); useSend = (func == sendFunction); } } @@ -341,13 +341,13 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons || replyType != funcType) { TQCString funcname = function; - funcname.tqreplace(TQRegExp("(.+$"), "()"); + funcname.replace(TQRegExp("(.+$"), "()"); kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call failed\n";; return false; } TQDataStream replyStream(replyData, IO_ReadOnly); TQCString funcname = function; - funcname.tqreplace(TQRegExp("(.+$"), "()"); + funcname.replace(TQRegExp("(.+$"), "()"); if (replyType == "int") { int result; @@ -385,7 +385,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) char buff[64]; strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow)); TQString from = data.from; - from.tqreplace(TQRegExp("^.*<"), TQString()).tqreplace(TQRegExp(">.*$"), TQString()); + from.replace(TQRegExp("^.*<"), TQString()).replace(TQRegExp(">.*$"), TQString()); message = TQString::tqfromLatin1(buff); message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from); } @@ -691,7 +691,7 @@ int KAMail::checkAddress(TQString& address) { address = address.stripWhiteSpace(); // Check that there are no list separator characters present - if (address.tqfind(',') >= 0 || address.tqfind(';') >= 0) + if (address.find(',') >= 0 || address.find(';') >= 0) return -1; int n = address.length(); if (!n) @@ -701,16 +701,16 @@ int KAMail::checkAddress(TQString& address) if (address[end] == '>') { // The email address is in <...> - if ((start = address.tqfind('<')) < 0) + if ((start = address.find('<')) < 0) return -1; ++start; --end; } - int i = address.tqfind('@', start); + int i = address.find('@', start); if (i >= 0) { if (i == start || i == end) // check @ isn't the first or last character -// || address.tqfind('@', i + 1) >= 0) // check for multiple @ characters +// || address.find('@', i + 1) >= 0) // check for multiple @ characters return -1; } /* else @@ -744,10 +744,10 @@ TQString KAMail::convertAttachments(const TQString& items, TQStringList& list) for (int next = 0; next < length; ) { // Find the first delimiter character (, or ;) - int i = items.tqfind(',', next); + int i = items.find(',', next); if (i < 0) i = items.length(); - int sc = items.tqfind(';', next); + int sc = items.find(';', next); if (sc < 0) sc = items.length(); if (sc < i) @@ -780,10 +780,10 @@ TQString KAMail::convertAttachments(const TQString& items, KURL::List& list) for (int next = 0; next < length; ) { // Find the first delimiter character (, or ;) - int i = items.tqfind(',', next); + int i = items.find(',', next); if (i < 0) i = items.length(); - int sc = items.tqfind(';', next); + int sc = items.find(';', next); if (sc < 0) sc = items.length(); if (sc < i) |