TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 88 insertions, 86 deletions

diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 090b3de3..1a71cf94 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 
-// Qt include files
+// TQt include files
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqfileinfo.h>
@@ -60,8 +60,8 @@
 #include "cvsdialog.h"
 
 
-CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config )
-  : KDialog( parent, "CVSDIALOG", true ), m_config( config )
+CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config )
+  : KDialog( tqparent, "CVSDIALOG", true ), m_config( config )
 {
   _cmd = cmd;
   p=0L;
@@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the CVS command.
   switch ( cmd ) {
@@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "Commit the following files:" );
       break;
-    case CVS::Status:
+    case CVS::tqStatus:
       temp = i18n( "Get status for the following files:" );
       break;
     case CVS::Diff:
       temp = i18n( "Get diff for the following files:" );
       break;
   }
-  layout->addWidget( new TQLabel( temp, this ) );
+  tqlayout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  layout->addWidget( filebox );
+  tqlayout->addWidget( filebox );
 
   // Add special widgets for 'cvs commit'.
   if ( cmd == CVS::Commit ) {
@@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    layout->addWidget( label );
-    layout->addWidget( oldMessages );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    layout->addWidget( label );
-    layout->addWidget( logedit );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( logedit );
 
     label = new TQLabel( i18n( "E&ncoding:" ), this );
     m_encodingComboBox = new KComboBox( this );
     label->setBuddy( m_encodingComboBox );
-    layout->addWidget( label );
-    layout->addWidget( m_encodingComboBox );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( m_encodingComboBox );
     TQStringList encodingList;
     // The last encoding will be added at the top of the list, when the seetings will be read.
-    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
-    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() );
+    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
+    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
     m_encodingComboBox->insertStringList( encodingList );
     
@@ -143,8 +143,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "&Commit" );
       break;
-    case CVS::Status:
-      temp = i18n( "&Get Status" );
+    case CVS::tqStatus:
+      temp = i18n( "&Get tqStatus" );
       break;
     case CVS::Diff:
       temp = i18n( "&Get Diff" );
@@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  layout->addLayout( buttons );
+  tqlayout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addWidget( line );
+  tqlayout->addWidget( line );
 
-  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  layout->addWidget( output );
+  tqlayout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
 
   if ( cmd == CVS::Commit )
     logedit->setFocus( );
@@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( )
 
     if ( !codec )
     {
-        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) );
+        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) );
         return;
     }
     else if ( !codec->canEncode( msg ) )
     {
         const int res = KMessageBox::warningContinueCancel( this,
             i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n"
-            "Do you want to continue?" ).arg( m_encoding ) );
+            "Do you want to continue?" ).tqarg( m_encoding ) );
         if ( res != KMessageBox::Continue )
             return;
     }
@@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( )
     }
     
     // Change the command line to have the real name of the temporary file
-    _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
+    _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
 
     // Update the list of log messages
     if ( !msg.isEmpty() ) {
@@ -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::Status) || (_cmd == CVS::Diff) )
+  if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
     _statusOutput += TQString::fromLocal8Bit( buffer, len );
 }
 
@@ -339,7 +339,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
   // If an error occurs while executing the command display stderr in
   // another color.
   TQColor oldColor( output->color( ) );
-  output->setColor( Qt::red );
+  output->setColor( TQt::red );
   output->append( TQString::fromLocal8Bit( buffer, len ) );
   output->setColor( oldColor );
   output->setCursorPosition( output->lines( ), 0 );
@@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void CVSDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -383,9 +383,9 @@ void CVSDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
     {
-      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
+      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
       if ( !logMessage.isEmpty() )
       {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -398,7 +398,7 @@ void CVSDialog::readSettings( )
     }
 
     m_encoding = config->readEntry( "CVSEncoding", "UTF-8" );
-    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0);
+    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0);
   }
 }
 
@@ -413,7 +413,7 @@ void CVSDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
 
     config->writeEntry( "CVSEncoding", m_encoding );
   }
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h
index 0eccf24c..3c492704 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.h
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -39,7 +39,7 @@
 #include <kdialog.h>
 // Project specific include files
 #include "cvsresources.h"
-// Forwarding Qt classes
+// Forwarding TQt classes
 class TQCheckBox;
 class TQComboBox;
 class TQListBox;
@@ -66,13 +66,14 @@ class KComboBox;
 class CVSDialog : public KDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
      * Constructor for creating the dialog.
      * @param cmd The type of command to be executed.
      */
-    CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config );
+    CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config );
     ~CVSDialog();
     /**
      * Set the list of files which will be used for the CVS command.
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 66eeac0a..73d149d3 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -36,7 +36,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-// Qt include files
+// TQt include files
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -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 );
@@ -138,7 +138,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
   bool isInRepository = false;
   while ( !stream.atEnd() ) {
     temp = stream.readLine( );
-    if ( temp.find( rx ) == 0 ) {
+    if ( temp.tqfind( rx ) == 0 ) {
       isInRepository = true;
       break;
     }
@@ -162,7 +162,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
     return LOCALLY_REMOVED;
 
   // check for conflicts
-  if ( timestamp.find( '+' ) >= 0 )
+  if ( timestamp.tqfind( '+' ) >= 0 )
     return CONFLICT;
 
   // calculate the UTC time from the file's last modified date
@@ -177,23 +177,23 @@ 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];
 }
 
-void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
 {
   if ( !_isPORepository ) {
     // This message box should never be visible but who knows... ;-)
-    KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
+    KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
       "The CVS commands cannot be executed." ) );
     return;
   }
 
   TQFileInfo info( filename );
   if ( !info.isDir( ) ) {
-    execCVSCommand( parent, cmd, TQStringList( filename ), templates, config );
+    execCVSCommand( tqparent, cmd, TQStringList( filename ), templates, config );
     return;
   }
 
@@ -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:
@@ -218,14 +218,14 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       break;
   }
 
-  showDialog( parent, cmd, TQStringList( filename ), command, config );
+  showDialog( tqparent, cmd, TQStringList( filename ), command, config );
 }
 
-void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
 {
   if ( !_isPORepository ) {
     // This message box should never be visible but who knows... ;-)
-    KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
+    KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
       "The CVS commands cannot be executed." ) );
     return;
   }
@@ -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:
@@ -262,7 +262,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
     command += " \'" + temp + "\'";
   }
 
-  showDialog( parent, cmd, files, command, config );
+  showDialog( tqparent, cmd, files, command, config );
 }
 
 void CVSHandler::setAutoUpdateTemplates( bool update )
@@ -270,9 +270,9 @@ void CVSHandler::setAutoUpdateTemplates( bool update )
   _autoUpdateTemplates = update;
 }
 
-void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
+void CVSHandler::showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
 {
-  CVSDialog * dia = new CVSDialog( cmd, parent, config );
+  CVSDialog * dia = new CVSDialog( cmd, tqparent, config );
   dia->setFiles( files );
   dia->setCommandLine( commandLine );
   if ( cmd == CVS::Commit ) {
@@ -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( ) );
@@ -313,7 +313,7 @@ void CVSHandler::checkToAdd( const TQStringList& files )
         toBeAdded << *it;
         temp = TQFileInfo( *it ).dirPath( true );
       }
-      // check recursivlely if parent dirs have to be added as well
+      // check recursivlely if tqparent dirs have to be added as well
       while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) {
         toBeAdded << temp;
         temp = TQFileInfo( temp ).dirPath( true );
@@ -357,7 +357,7 @@ void CVSHandler::processStatusOutput( const TQString& status )
     TQString entr = *it;
     // translate the filename from repository to local
     TQRegExp rx( basedir + ".*,v" );
-    int pos = entr.find( rx );
+    int pos = entr.tqfind( rx );
     TQString file = _poBaseDir + entr.mid( pos + basedir.length( ),
       rx.matchedLength( ) - basedir.length( ) - 2 );
 
@@ -365,14 +365,14 @@ void CVSHandler::processStatusOutput( const TQString& status )
 
     // TODO: do some markup
 
-    map.replace( file, entr );
+    map.tqreplace( file, entr );
   }
 }
 
 void CVSHandler::processDiff( TQString output )
 {
   output.remove( TQRegExp( "\\[ .* \\]$" ));
-  output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]")));
+  output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]")));
 
   KTempFile tmpFile;
   *(tmpFile.textStream()) << output;
@@ -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:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 961c41fd..78e248da 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -35,13 +35,13 @@
 #ifndef CVSHANDLER_H
 #define CVSHANDLER_H
 
-// Qt include files
+// TQt include files
 #include <tqmap.h>
 #include <tqobject.h>
 // Project specific include files
 #include "cvsdialog.h"
 #include "cvsresources.h"
-// Forwarding Qt classes
+// Forwarding TQt classes
 class TQString;
 class TQStringList;
 class TQWidget;
@@ -54,12 +54,13 @@ class KSharedConfig;
  * @short  Backend for CVS support in Catalog Manager
  * @author Marco Wegner <mail@marcowegner.de>
  */
-class CVSHandler : public QObject
+class CVSHandler : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    enum FileStatus {
+    enum FiletqStatus {
       NO_REPOSITORY,
       NOT_IN_CVS,
       LOCALLY_ADDED,
@@ -69,24 +70,24 @@ class CVSHandler : public QObject
       UP_TO_DATE
     };
 
-    CVSHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null );
+    CVSHandler( const TQString& poBaseDir = TQString(), const TQString& potBaseDir = TQString() );
 
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FileStatus fstatus( const TQString& filename ) const;
-    TQString fileStatus( const FileStatus status ) const;
-    TQString cvsStatus( const TQString& filename ) const;
+    FiletqStatus fstatus( const TQString& filename ) const;
+    TQString filetqStatus( const FiletqStatus status ) const;
+    TQString cvstqStatus( 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 );
+    void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
+    void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
 
     void setAutoUpdateTemplates( bool update );
 
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FileStatus status ) const;
+    bool isConsideredModified( const FiletqStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
@@ -94,7 +95,7 @@ class CVSHandler : public QObject
     void signalFilesCommitted( const TQStringList& );
 
   private:
-      void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
+      void showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
     void checkToAdd( const TQStringList& files );
     void processStatusOutput( const TQString& status );
     void processDiff( TQString output );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 627802f7..4c2bc144 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -19,11 +19,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -35,7 +35,7 @@
 #define CVSRESOURCES_H
 
 namespace CVS {
-  enum Command { Update, Commit, Status, Diff };
+  enum Command { Update, Commit, tqStatus, Diff };
 }
 
 #endif // CVSRESOURCES_H