summaryrefslogtreecommitdiffstats
path: root/knode/knarticlefactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'knode/knarticlefactory.cpp')
-rw-r--r--knode/knarticlefactory.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 37c1b4961..53eabd8bb 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -210,12 +210,12 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
TQString name(a->from()->name());
if (name.isEmpty())
name = TQString::tqfromLatin1(a->from()->email());
- attribution.tqreplace(TQRegExp("%NAME"),name);
- attribution.tqreplace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email()));
- attribution.tqreplace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
- attribution.tqreplace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
- attribution.tqreplace(TQRegExp("%GROUP"),g->groupname());
- attribution.tqreplace(TQRegExp("%L"),"\n");
+ attribution.replace(TQRegExp("%NAME"),name);
+ attribution.replace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email()));
+ attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
+ attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
+ attribution.replace(TQRegExp("%GROUP"),g->groupname());
+ attribution.replace(TQRegExp("%L"),"\n");
attribution+="\n\n";
TQString quoted=attribution;
@@ -876,11 +876,11 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
TQString name(origPost->from()->name());
if (name.isEmpty())
name = TQString::tqfromLatin1(origPost->from()->email());
- value.tqreplace(TQRegExp("%NAME"), name);
- value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
+ value.replace(TQRegExp("%NAME"), name);
+ value.replace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
}
else
- if(value.tqfind("%NAME") != -1 || value.tqfind("%EMAIL") != -1)
+ if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
continue;
art->setHeader( new KMime::Headers::Generic( (TQCString("X-")+(*it).name()), art, value, pnt->charset() ) );