From c3b301575a98e4c3505ad95534d6192b65539dab Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:36:08 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 lib/cppparser/ast.cpp        | 2 +-
 lib/cppparser/lexer.cpp      | 6 +++---
 lib/cppparser/lexercache.cpp | 6 +++---
 lib/cppparser/lexercache.h   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/cppparser')

diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index e4e3cf5d..326ee625 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -474,7 +474,7 @@ TQString ClassOrNamespaceNameAST::text() const
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
 
     return str;
 }
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 1ed9fca7..c19408e6 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -393,14 +393,14 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::tqfromLatin1("\"") + str.str() + TQString::tqfromLatin1("\" ") );
+                    textToInsert.append( TQString::fromLatin1("\"") + str.str() + TQString::fromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
-                    textToInsert.append( str.str()  + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str.str()  + TQString::fromLatin1(" ") );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str.str() + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str.str() + TQString::fromLatin1(" ") );
                 }
             }
         
diff --git a/lib/cppparser/lexercache.cpp b/lib/cppparser/lexercache.cpp
index 7f420cac..cbe8640d 100644
--- a/lib/cppparser/lexercache.cpp
+++ b/lib/cppparser/lexercache.cpp
@@ -112,13 +112,13 @@ TQDateTime LexerCache::fileModificationTimeCached( const HashedString& fileName
   FileModificationMap::const_iterator it = m_fileModificationCache.find( fileName );
   if( it != m_fileModificationCache.end() ) {
     ///Use the cache for 10 seconds
-    if( (*it).second.m_readTime.secsTo( m_tqcurrentDateTime ) < 10 ) {
+    if( (*it).second.m_readTime.secsTo( m_currentDateTime ) < 10 ) {
       return (*it).second.m_modificationTime;
     }
   }
   
   TQFileInfo fileInfo( fileName.str() );
-  m_fileModificationCache[fileName].m_readTime = TQDateTime::tqcurrentDateTime();
+  m_fileModificationCache[fileName].m_readTime = TQDateTime::currentDateTime();
   m_fileModificationCache[fileName].m_modificationTime = fileInfo.lastModified();
   return fileInfo.lastModified();
   
@@ -239,7 +239,7 @@ size_t CachedLexedFile::hash() const {
 }
 
 void LexerCache::initFileModificationCache() {
-  m_tqcurrentDateTime = TQDateTime::tqcurrentDateTime();
+  m_currentDateTime = TQDateTime::currentDateTime();
 }
 
 void LexerCache::saveMemory() {
diff --git a/lib/cppparser/lexercache.h b/lib/cppparser/lexercache.h
index 535768bc..c1aac432 100644
--- a/lib/cppparser/lexercache.h
+++ b/lib/cppparser/lexercache.h
@@ -155,7 +155,7 @@ class LexerCache : public CacheManager {
     typedef __gnu_cxx::hash_map<HashedString, FileModificationCache> FileModificationMap;
     FileModificationMap m_fileModificationCache;
     Driver* m_driver;
-    TQDateTime m_tqcurrentDateTime;
+    TQDateTime m_currentDateTime;
 };
 
 
-- 
cgit v1.2.1