diff options
Diffstat (limited to 'kbabel/catalogmanager/libcvs')
-rw-r--r-- | kbabel/catalogmanager/libcvs/cvsdialog.cpp | 2 | ||||
-rw-r--r-- | kbabel/catalogmanager/libcvs/cvshandler.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 1a71cf94..afc299b9 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( ) } // Change the command line to have the real name of the temporary file - _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); + _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); // Update the list of log messages if ( !msg.isEmpty() ) { diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index af58ead9..6ab70423 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -138,7 +138,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const bool isInRepository = false; while ( !stream.atEnd() ) { temp = stream.readLine( ); - if ( temp.tqfind( rx ) == 0 ) { + if ( temp.find( rx ) == 0 ) { isInRepository = true; break; } @@ -162,7 +162,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const return LOCALLY_REMOVED; // check for conflicts - if ( timestamp.tqfind( '+' ) >= 0 ) + if ( timestamp.find( '+' ) >= 0 ) return CONFLICT; // calculate the UTC time from the file's last modified date @@ -314,7 +314,7 @@ void CVSHandler::checkToAdd( const TQStringList& files ) temp = TQFileInfo( *it ).dirPath( true ); } // check recursivlely if tqparent dirs have to be added as well - while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.tqfindIndex( temp ) == -1 ) { + 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.tqfind( rx ); + int pos = entr.find( 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.tqreplace( file, entr ); + map.replace( file, entr ); } } void CVSHandler::processDiff( TQString output ) { output.remove( TQRegExp( "\\[ .* \\]$" )); - output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]"))); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; |