diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
| commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
| tree | ab537a329b9613e11dce8195761f93ffe82aed24 /knode/knarticlefactory.cpp | |
| parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
| download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'knode/knarticlefactory.cpp')
| -rw-r--r-- | knode/knarticlefactory.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 2b686cf2a..d82bb5c74 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -12,7 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvbox.h> @@ -209,9 +209,9 @@ 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()); + name = TQString::tqfromLatin1(a->from()->email()); attribution.replace(TQRegExp("%NAME"),name); - attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email())); + 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()); @@ -306,7 +306,7 @@ void KNArticleFactory::createForward(KNArticle *a) //--------------------------- <Body> ----------------------------- - TQString fwd = TQString("\n--------------- %1\n\n").arg(i18n("Forwarded message (begin)")); + TQString fwd = TQString("\n--------------- %1\n\n").tqarg(i18n("Forwarded message (begin)")); fwd+=( i18n("Subject") + ": " + a->subject()->asUnicodeString() + "\n" ); fwd+=( i18n("From") + ": " + a->from()->asUnicodeString() + "\n" ); @@ -321,7 +321,7 @@ void KNArticleFactory::createForward(KNArticle *a) fwd += (*it) + "\n"; } - fwd += TQString("\n--------------- %1\n").arg(i18n("Forwarded message (end)")); + fwd += TQString("\n--------------- %1\n").tqarg(i18n("Forwarded message (end)")); //--------------------------- </Body> ---------------------------- @@ -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(); @@ -601,7 +601,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .arg(id->getSigGeneratorStdErr())); + .tqarg(id->getSigGeneratorStdErr())); mCompList.append( com ); connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); @@ -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()); + name = TQString::tqfromLatin1(origPost->from()->email()); value.replace(TQRegExp("%NAME"), name); - value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email())); + value.replace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email())); } else if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1) @@ -895,7 +895,7 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T KMessageBox::information(knGlobals.topWidget, i18n("<qt>The signature generator program produced the " "following output:<br><br>%1</qt>") - .arg(id->getSigGeneratorStdErr())); + .tqarg(id->getSigGeneratorStdErr())); } else sig=TQString(); @@ -1070,8 +1070,8 @@ KNSendErrorDialog::KNSendErrorDialog() TQVBox *page = makeVBoxMainWidget(); - new TQLabel(TQString("<b>%1</b><br>%2").arg(i18n("Errors occurred while sending these articles:")) - .arg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); + new TQLabel(TQString("<b>%1</b><br>%2").tqarg(i18n("Errors occurred while sending these articles:")) + .tqarg(i18n("The unsent articles are stored in the \"Outbox\" folder.")), page); j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); |