From 1bc598742e8dcd7c3f72d892b2c3dd618496b79c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:28 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 58ed6eb0cbce97f0c662eaafc536fd0399466ede. --- src/notes.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/notes.cpp') diff --git a/src/notes.cpp b/src/notes.cpp index faf0786..870c7af 100644 --- a/src/notes.cpp +++ b/src/notes.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -51,8 +51,8 @@ TQString TNoteLink::text(int fmt) const if (fmt == LinkOnly || description.isEmpty()) return link; else if (fmt == DescriptionOnly) return description; else if (fmt == LinkDescription) - return TQString("%1 (%2)").arg(link).arg(description); - else return TQString("%1 (%2)").arg(description).arg(link); + return TQString("%1 (%2)").tqarg(link).tqarg(description); + else return TQString("%1 (%2)").tqarg(description).tqarg(link); } TQPixmap TNoteLink::icon() const @@ -238,7 +238,7 @@ bool TNote::saveHTML(const KURL& fname, const TQString& origname, const TQString ts << "\n" "\n\n " << i18n("KnowIt document") << TQString("\n \n").arg(ts.codec()->mimeName()); + "content=\"text/html; charset=%1\">\n").tqarg(ts.codec()->mimeName()); if (!style.isEmpty()) ts << " \n"; ts << "\n\n\n"; @@ -246,7 +246,7 @@ bool TNote::saveHTML(const KURL& fname, const TQString& origname, const TQString TQValueVector Depths; Depths.append(0); if (flags & TOC) { - ts << TQString("

%1

\n").arg(i18n("Table of contents")); + ts << TQString("

%1

\n").tqarg(i18n("Table of contents")); saveHTMLTocEntry(ts, Depths, flags); ts << "\n\n"; } @@ -256,9 +256,9 @@ bool TNote::saveHTML(const KURL& fname, const TQString& origname, const TQString saveHTMLBuf(ts, Depths, flags); TQString epilog = i18n("Exported from %1 by KnowIt %2, %3."); - ts << "

" << epilog.arg(origname) - .arg(VERSION) - .arg(TQDateTime::currentDateTime().toString()) << "\n\n"; + ts << "

" << epilog.tqarg(origname) + .tqarg(VERSION) + .tqarg(TQDateTime::tqcurrentDateTime().toString()) << "\n\n"; ts << "\n\n\n"; return true; } @@ -272,12 +272,12 @@ bool TNote::saveHTMLBuf(TQTextStream& ts, TQValueVector& depths, else if (hlevel > 3) hlevel = 3; TQString id, number; for (uint i=0; i%3%4").arg(hlevel).arg(id).arg(number) - .arg(item->text(0)).arg(hlevel); + ts << TQString("%3%4").tqarg(hlevel).tqarg(id).tqarg(number) + .tqarg(item->text(0)).tqarg(hlevel); TQString htmltext = text; int begin = htmltext.find("= 0) begin = htmltext.find(">", begin); @@ -289,14 +289,14 @@ bool TNote::saveHTMLBuf(TQTextStream& ts, TQValueVector& depths, /* save links */ for (TQValueList::Iterator LinkList = links.begin(); LinkList != links.end(); ++LinkList) - ts << TQString("%2
\n").arg((*LinkList).link) - .arg((*LinkList).text(TNoteLink::DescriptionOnly)); + ts << TQString("%2
\n").tqarg((*LinkList).link) + .tqarg((*LinkList).text(TNoteLink::DescriptionOnly)); /* save rule */ if (flags & AddRule) ts << "

\n\n"; else ts << "\n\n"; - /* save children */ + /* save tqchildren */ if ((SaveSubnotes | SaveAll) & flags && item->childCount()) { depths.append(0); collection->find(item->firstChild())->saveHTMLBuf(ts, depths, flags); @@ -321,11 +321,11 @@ bool TNote::saveHTMLTocEntry(TQTextStream& ts, TQValueVector& depths, int f TQString id, number; for (uint i=0; i%2%3\n").arg(id).arg(number). + ts << TQString("

%2%3

\n").tqarg(id).tqarg(number). arg(item->text(0)); if ((SaveSubnotes | SaveAll) & flags && item->childCount()) { depths.append(0); @@ -397,9 +397,9 @@ void TNote::save(TQTextStream& ts, bool current) const TQString activeheader = "\\CurrentEntry %1 %2\n"; if (current) - ts << activeheader.arg(item->depth()).arg(item->text(0)); + ts << activeheader.tqarg(item->depth()).tqarg(item->text(0)); else - ts << header.arg(item->depth()).arg(item->text(0)); + ts << header.tqarg(item->depth()).tqarg(item->text(0)); for (TQValueList::Iterator LinkList = links.begin(); LinkList != links.end(); ++LinkList) (*LinkList).save(ts); -- cgit v1.2.1