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.
---
 kresources/tvanytime/kcal_resourcetvanytime.cpp       | 4 ++--
 kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kresources/tvanytime')

diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 4933768ab..f819bba5a 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -320,7 +320,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
   TQStringList entries = mScheduleArchive->directory()->entries();
   TQRegExp re( "^(\\d{8})" + serviceId );
   TQStringList dates;
-  TQString todaysDate = TQDate::currentDate().toString( "yyyyMMdd" );
+  TQString todaysDate = TQDate::tqcurrentDate().toString( "yyyyMMdd" );
   for( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
   {
     if ( re.search( *it ) != -1 ) // this entry belongs to the requested service
@@ -328,7 +328,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
       TQString entry = re.cap( 1 );
       // handle this date according to user preferences
       TQDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() );
-      if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) )
+      if ( entryDate < TQDate::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) )
         continue;
 
       if ( !dates.contains( re.cap( 1 ) ) )
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index c667f95c3..110a62f9e 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -21,7 +21,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-- 
cgit v1.2.1