Rename old tq methods that no longer need a unique name

4 files changed, 17 insertions, 17 deletions

diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..798bb51f 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -79,7 +79,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "Commit the following files:" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "Get status for the following files:" );
       break;
     case CVS::Diff:
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "&Commit" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "&Get Status" );
       break;
     case CVS::Diff:
@@ -168,7 +168,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
   output->setReadOnly( true );
   tqlayout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 
   if ( cmd == CVS::Commit )
     logedit->setFocus( );
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
   output->setCursorPosition( output->lines( ), 0 );
 
   // If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
-  if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+  if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
     _statusOutput += TQString::fromLocal8Bit( buffer, len );
 }
 
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..cf067f9c 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::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
   }
 }
 
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
   return UP_TO_DATE;
 }
 
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( 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::tqStatus:
+    case CVS::Status:
       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::tqStatus:
+    case CVS::Status:
       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::tqStatus )
+    if ( cmd == CVS::Status )
       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 FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
 {
   /*
    * A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
   TQ_OBJECT
 
   public:
-    enum FiletqStatus {
+    enum FileStatus {
       NO_REPOSITORY,
       NOT_IN_CVS,
       LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FiletqStatus fstatus( const TQString& filename ) const;
-    TQString filetqStatus( const FiletqStatus status ) const;
-    TQString cvstqStatus( const TQString& filename ) const;
+    FileStatus fstatus( const TQString& filename ) const;
+    TQString fileStatus( const FileStatus status ) const;
+    TQString cvsStatus( const TQString& filename ) const;
 
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FiletqStatus status ) const;
+    bool isConsideredModified( const FileStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
 #define CVSRESOURCES_H
 
 namespace CVS {
-  enum Command { Update, Commit, tqStatus, Diff };
+  enum Command { Update, Commit, Status, Diff };
 }
 
 #endif // CVSRESOURCES_H