diff options
Diffstat (limited to 'kalarm/alarmtext.cpp')
| -rw-r--r-- | kalarm/alarmtext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp index 5be991f0d..6cf07c34f 100644 --- a/kalarm/alarmtext.cpp +++ b/kalarm/alarmtext.cpp @@ -44,7 +44,7 @@ void AlarmText::setText(const TQString& text) mBody = text; mIsScript = text.startsWith(TQString::tqfromLatin1("#!")); mIsEmail = false; - mTo = mFrom = mCc = mTime = mSubject = TQString::null; + mTo = mFrom = mCc = mTime = mSubject = TQString(); mKMailSerialNum = 0; } @@ -136,14 +136,14 @@ int AlarmText::emailHeaderCount(const TQStringList& lines) /****************************************************************************** * Check whether a text is an email, and if so return its headers or optionally * only its subject line. -* Reply = headers/subject line, or TQString::null if not the text of an email. +* Reply = headers/subject line, or TQString() if not the text of an email. */ TQString AlarmText::emailHeaders(const TQString& text, bool subjectOnly) { TQStringList lines = TQStringList::split('\n', text); int n = emailHeaderCount(lines); if (!n) - return TQString::null; + return TQString(); if (subjectOnly) return lines[n-1].mid(mSubjectPrefix.length()).stripWhiteSpace(); TQString h = lines[0]; @@ -184,8 +184,8 @@ TQString AlarmText::fromCalendarText(const TQString& text, bool& email) dispText += mCcPrefix + lines[2].mid(mCcPrefixEn.length()) + '\n'; dispText += mDatePrefix + lines[n].mid(mDatePrefixEn.length()) + '\n'; dispText += mSubjectPrefix + lines[n+1].mid(mSubjectPrefixEn.length()); - int i = text.find(mSubjectPrefixEn); - i = text.find('\n', i); + int i = text.tqfind(mSubjectPrefixEn); + i = text.tqfind('\n', i); if (i > 0) dispText += text.mid(i); email = true; @@ -224,8 +224,8 @@ TQString AlarmText::toCalendarText(const TQString& text) calText += mCcPrefixEn + lines[2].mid(mCcPrefix.length()) + '\n'; calText += mDatePrefixEn + lines[n].mid(mDatePrefix.length()) + '\n'; calText += mSubjectPrefixEn + lines[n+1].mid(mSubjectPrefix.length()); - int i = text.find(mSubjectPrefix); - i = text.find('\n', i); + int i = text.tqfind(mSubjectPrefix); + i = text.tqfind('\n', i); if (i > 0) calText += text.mid(i); return calText; @@ -276,7 +276,7 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated) int newline = -1; for (int i = 0; i < maxLines; ++i) { - newline = text.find('\n', newline + 1); + newline = text.tqfind('\n', newline + 1); if (newline < 0) return text; // not truncated after all !?! } |