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/icalformat.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'libkcal/icalformat.cpp')

diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index ff792e28..25feb42f 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -23,9 +23,9 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqregexp.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -117,7 +117,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName )
     kdDebug(5800) << "ICalFormat::save() errno: " << strerror( file.status() )
               << endl;
     setException( new ErrorFormat( ErrorFormat::SaveError,
-                  i18n( "Error saving to '%1'." ).arg( fileName ) ) );
+                  i18n( "Error saving to '%1'." ).tqarg( fileName ) ) );
     return false;
   }
 
@@ -128,7 +128,7 @@ bool ICalFormat::save( Calendar *calendar, const TQString &fileName )
   if ( !file.close() ) {
     kdDebug(5800) << "KSaveFile: close: status was " << file.status() << ". See errno.h." << endl;
     setException(new ErrorFormat(ErrorFormat::SaveError,
-                 i18n("Could not save '%1'").arg(fileName)));
+                 i18n("Could not save '%1'").tqarg(fileName)));
     return false;
   }
 
@@ -440,7 +440,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (messageText.isEmpty())
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "messageText was empty, unable to parse into a ScheduleMessage" ) ) );
     return 0;
   }
   // TODO FIXME: Don't we have to ical-free message??? MEMLEAK
@@ -449,7 +449,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (!message)
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "icalparser was unable to parse messageText into a ScheduleMessage" ) ) );
     return 0;
   }
 
@@ -457,7 +457,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
                                                      ICAL_METHOD_PROPERTY);
   if (!m)
   {
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "message didn't contain an ICAL_METHOD_PROPERTY" ) ) );
     return 0;
   }
 
@@ -495,7 +495,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
 
   if (!incidence) {
     kdDebug(5800) << "ICalFormat:parseScheduleMessage: object is not a freebusy, event, todo or journal" << endl;
-    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::fromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
+    setException( new ErrorFormat( ErrorFormat::ParseErrorKcal, TQString::tqfromLatin1( "object is not a freebusy, event, todo or journal" ) ) );
     return 0;
   }
 
@@ -577,7 +577,7 @@ ScheduleMessage *ICalFormat::parseScheduleMessage( Calendar *cal,
   kdDebug(5800) << "ICalFormat::parseScheduleMessage() returning..." << endl;
   kdDebug(5800) << "ICalFormat::parseScheduleMessage(), result = " << result << endl;
 
-  ScheduleMessage::Status status;
+  ScheduleMessage::tqStatus status;
 
   switch (result) {
     case ICAL_XLICCLASS_PUBLISHNEW:
-- 
cgit v1.2.3