From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 libkcal/htmlexport.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'libkcal/htmlexport.cpp')

diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index 02f9f685a..4bedf8806 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -22,8 +22,8 @@
 
 #include <tqapplication.h>
 #include <tqfile.h>
-#include <textstream.h>
-#include <textcodec.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
 #include <tqregexp.h>
 
 #include <kcharsets.h>
@@ -147,8 +147,8 @@ void HtmlExport::createMonthView(TQTextStream *ts)
 
   while ( start < toDate() ) {
     // Write header
-    *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start))
-        .arg(start.year())) << "</h2>\n";
+    *ts << "<h2>" << (i18n("month_year","%1 %2").tqarg(KGlobal::locale()->calendar()->monthName(start))
+        .tqarg(start.year())) << "</h2>\n";
     if ( KGlobal::locale()->weekStartDay() == 1 ) {
       start = start.addDays(1 - start.dayOfWeek());
     } else {
@@ -459,7 +459,7 @@ void HtmlExport::createTodo (TQTextStream *ts,Todo *todo)
   *ts << "  <td";
   if (completed) *ts << " class=\"done\"";
   *ts << ">\n";
-  *ts << "    " << i18n("%1 %").arg(todo->percentComplete()) << "\n";
+  *ts << "    " << i18n("%1 %").tqarg(todo->percentComplete()) << "\n";
   *ts << "  </td>\n";
 
   if ( mSettings->taskDueDate() ) {
@@ -618,20 +618,20 @@ void HtmlExport::createFooter( TQTextStream *ts )
   TQString mail, name, credit, creditURL;*/
   if (!mSettings->eMail().isEmpty()) {
     if (!mSettings->name().isEmpty())
-      trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->name() );
+      trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->name() );
     else
-      trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").arg( mSettings->eMail() ).arg( mSettings->eMail() );
+      trailer += i18n("by <a href=\"mailto:%1\">%2</a> ").tqarg( mSettings->eMail() ).tqarg( mSettings->eMail() );
   } else {
     if (!mSettings->name().isEmpty())
-      trailer += i18n("by %1 ").arg( mSettings->name() );
+      trailer += i18n("by %1 ").tqarg( mSettings->name() );
   }
   if (!mSettings->creditName().isEmpty()) {
     if (!mSettings->creditURL().isEmpty())
       trailer += i18n("with <a href=\"%1\">%2</a>")
-                     .arg( mSettings->creditURL() )
-                     .arg( mSettings->creditName() );
+                     .tqarg( mSettings->creditURL() )
+                     .tqarg( mSettings->creditName() );
     else
-      trailer += i18n("with %1").arg( mSettings->creditName() );
+      trailer += i18n("with %1").tqarg( mSettings->creditName() );
   }
   *ts << "<p>" << trailer << "</p>\n";
 }
@@ -706,7 +706,7 @@ void HtmlExport::addHoliday( const TQDate &date, const TQString &name)
   if ( mHolidayMap[date].isEmpty() ) {
     mHolidayMap[date] = name;
   } else {
-    mHolidayMap[date] = i18n("list of holidays", "%1, %2").arg(mHolidayMap[date]).arg(name);
+    mHolidayMap[date] = i18n("list of holidays", "%1, %2").tqarg(mHolidayMap[date]).tqarg(name);
   }
 }
 
-- 
cgit v1.2.1