From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knode/knarticlefactory.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'knode/knarticlefactory.cpp') diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 410c2bf40..493e2e229 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -209,13 +209,13 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo TQString attribution=knGlobals.configManager()->postNewsComposer()->intro(); TQString name(a->from()->name()); if (name.isEmpty()) - name = TQString::fromLatin1(a->from()->email()); - attribution.replace(TQRegExp("%NAME"),name); - attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(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"); + 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+="\n\n"; TQString quoted=attribution; @@ -279,7 +279,7 @@ void KNArticleFactory::createForward(KNArticle *a) bool incAtt = ( !knGlobals.configManager()->postNewsTechnical()->useExternalMailer() && ct->isMultipart() && ct->isSubtype("mixed") && KMessageBox::Yes == KMessageBox::questionYesNo(knGlobals.topWidget, - i18n("This article contains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward")) + i18n("This article tqcontains attachments. Do you want them to be forwarded as well?"), TQString::null, i18n("Forward"), i18n("Do Not Forward")) ); if (knGlobals.configManager()->postNewsTechnical()->useOwnCharset()) @@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a) art->lines()->setNumberOfLines(1); //body - art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n")); + art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n")); //assemble art->assemble(); @@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T if(origPost) { TQString name(origPost->from()->name()); if (name.isEmpty()) - name = TQString::fromLatin1(origPost->from()->email()); - value.replace(TQRegExp("%NAME"), name); - value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email())); + name = TQString::tqfromLatin1(origPost->from()->email()); + value.tqreplace(TQRegExp("%NAME"), name); + value.tqreplace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email())); } else if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1) -- cgit v1.2.1