diff options
Diffstat (limited to 'kbabel/catalogmanager/libcvs')
-rw-r--r-- | kbabel/catalogmanager/libcvs/cvsdialog.cpp | 18 | ||||
-rw-r--r-- | kbabel/catalogmanager/libcvs/cvshandler.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 798bb51f..ef964568 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -118,8 +118,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config 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 )" ).tqarg( "UTF-8" ); - encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() ); + encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); + encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_encodingComboBox->insertStringList( encodingList ); @@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( ) if ( !codec ) { - KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) ); + KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( 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?" ).tqarg( m_encoding ) ); + "Do you want to continue?" ).arg( m_encoding ) ); if ( res != KMessageBox::Continue ) return; } @@ -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 ]" ).tqarg( p->exitStatus( ) ) ); + output->append( i18n( "[ Exited with status %1 ]" ).arg( 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" ).tqarg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) { - const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( 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 )" ).tqarg( m_encoding ), 0); + m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( 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" ).tqarg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); config->writeEntry( "CVSEncoding", m_encoding ); } diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index cf067f9c..b0be0345 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -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/" ).tqarg( info.fileName( ) ) ); + TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) ); TQString temp; TQTextStream stream( &entries ); |