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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.
---
 kbabel/catalogmanager/libcvs/cvshandler.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kbabel/catalogmanager/libcvs/cvshandler.cpp')

diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0be0345..b0764af8 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
   emit signalIsPOTRepository( _isPOTRepository );
 }
 
-TQString CVSHandler::fileStatus( const FileStatus status ) const
+TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::fileStatus( const FileStatus status ) const
   }
 }
 
-CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -130,7 +130,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
   // ### FIXME: it does not take care of CVS/Entries.Log
   // a line in CVS/Entries has the following format:
   // [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE
-  TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) );
+  TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) );
 
   TQString temp;
   TQTextStream stream( &entries );
@@ -177,7 +177,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
   return UP_TO_DATE;
 }
 
-TQString CVSHandler::cvsStatus( const TQString& filename ) const
+TQString CVSHandler::cvstqStatus( const TQString& filename ) const
 {
   return map[filename];
 }
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( TQStringList( filename ) );
       break;
-    case CVS::Status:
+    case CVS::tqStatus:
       command += "status";
       break;
     case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( files );
       break;
-    case CVS::Status:
+    case CVS::tqStatus:
       command += "status";
       break;
     case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
   }
 
   if ( dia->exec( ) == KDialog::Accepted ) {
-    if ( cmd == CVS::Status )
+    if ( cmd == CVS::tqStatus )
       processStatusOutput( dia->statusOutput( ) );
     if ( cmd == CVS::Diff )
       processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
     KMessageBox::error( 0, error );
 }
 
-bool CVSHandler::isConsideredModified( const FileStatus status ) const
+bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
 {
   /*
    * A file is modified if it is either:
-- 
cgit v1.2.1