Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

4 files changed, 14 insertions, 14 deletions

diff --git a/dcoprss/cache.cpp b/dcoprss/cache.cpp
index c4a566aa..0636c674 100644
--- a/dcoprss/cache.cpp
+++ b/dcoprss/cache.cpp
@@ -35,7 +35,7 @@ bool CacheEntry::isValid() const
 {
 	// Cache entries get invalid after on hour. One shouldn't hardcode this
 	// but for now it'll do.
-	return m_timeStamp.secsTo( TQDateTime::currentDateTime() ) < 3600;
+	return m_timeStamp.secsTo( TQDateTime::tqcurrentDateTime() ) < 3600;
 }
 
 Cache *Cache::m_instance = 0;
@@ -51,8 +51,8 @@ TQString Cache::getCacheKey( const TQString &server, const TQString &method,
                             const TQValueList<TQVariant> &args )
 {
 	TQString key;
-	key = server + TQString::fromLatin1( "__" );
-	key += method + TQString::fromLatin1( "__" );
+	key = server + TQString::tqfromLatin1( "__" );
+	key += method + TQString::tqfromLatin1( "__" );
 	TQValueList<TQVariant>::ConstIterator it = args.begin();
 	TQValueList<TQVariant>::ConstIterator end = args.end();
 	for ( ; it != end; ++it )
@@ -111,13 +111,13 @@ void Cache::touch( const TQString &key )
 	CacheEntry *entry = find( key );
 	if ( !entry )
 		return;
-	entry->m_timeStamp = TQDateTime::currentDateTime();
+	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
 }
 
 void Cache::insert( const TQString &key, const KXMLRPC::Query::Result &result )
 {
 	CacheEntry *entry = new CacheEntry;
-	entry->m_timeStamp = TQDateTime::currentDateTime();
+	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
 	entry->m_result = result;
 	TQDict<CacheEntry>::insert( key, entry );
 }
diff --git a/dcoprss/document.cpp b/dcoprss/document.cpp
index fb5cd904..64c68d6e 100644
--- a/dcoprss/document.cpp
+++ b/dcoprss/document.cpp
@@ -29,7 +29,7 @@ RSSDocument::RSSDocument(const TQString& url) :
 	m_pix = TQPixmap();
 	m_isLoading = false;
 	m_maxAge = 60;
-	m_Timeout = TQDateTime::currentDateTime();
+	m_Timeout = TQDateTime::tqcurrentDateTime();
 	m_state.clear();
 }
 
@@ -40,7 +40,7 @@ RSSDocument::~RSSDocument()
 	delete m_Doc;
 }
 
-void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat)
+void RSSDocument::loadingComplete(Loader *ldr, Document doc, tqStatus stat)
 {
 
 
@@ -129,7 +129,7 @@ TQDateTime RSSDocument::lastBuildDate()
 	if( m_Doc != 0L)
 		return m_Doc->lastBuildDate();
 	else
-		return TQDateTime::currentDateTime();
+		return TQDateTime::tqcurrentDateTime();
 }
 
 TQDateTime RSSDocument::pubDate()
@@ -137,7 +137,7 @@ TQDateTime RSSDocument::pubDate()
 	if( m_Doc != 0L)
 		return m_Doc->pubDate();
 	else
-		return TQDateTime::currentDateTime();
+		return TQDateTime::tqcurrentDateTime();
 }
 
 TQString RSSDocument::copyright()
@@ -243,14 +243,14 @@ bool RSSDocument::pixmapValid()
 void RSSDocument::refresh()
 {
 	kdDebug() << "Mod time " << m_Timeout.toString() << endl;
-	kdDebug() << "Current time " << TQDateTime::currentDateTime().toString() << endl;
+	kdDebug() << "Current time " << TQDateTime::tqcurrentDateTime().toString() << endl;
 
-	if(!m_isLoading  && (TQDateTime::currentDateTime() >= m_Timeout))
+	if(!m_isLoading  && (TQDateTime::tqcurrentDateTime() >= m_Timeout))
 	{
 		kdDebug() << "Document going to refresh" << endl;
 		m_isLoading = true;
 		Loader *loader = Loader::create(this,
-			TQT_SLOT(loadingComplete(Loader *, Document, Status)));
+			TQT_SLOT(loadingComplete(Loader *, Document, tqStatus)));
 		loader->loadFrom(KURL( m_Url ),  new FileRetriever());
 		documentUpdating(DCOPRef(this));
 	}
diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp
index 9c324890..b3d48eaf 100644
--- a/dcoprss/query.cpp
+++ b/dcoprss/query.cpp
@@ -113,7 +113,7 @@ void QueryService::getCategories( const TQString &category )
 	kdDebug() << "QueryService::getCategories()" << endl;
 
 	if ( category == "Top" ) {
-		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ),
+		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::tqfromLatin1( "DMOZ" ) ),
 		            TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
 	} else {
 		TQStringList args;
diff --git a/dcoprss/service.h b/dcoprss/service.h
index 5ca2872b..502d13c1 100644
--- a/dcoprss/service.h
+++ b/dcoprss/service.h
@@ -124,7 +124,7 @@ class RSSDocument :  public TQObject, public DCOPObject
 
 	private slots:
 		void pixmapLoaded(const TQPixmap&);
-		void loadingComplete(Loader *, Document, Status);
+		void loadingComplete(Loader *, Document, tqStatus);
 
 	public:
 		RSSDocument(const TQString& url);