From f78838f2f736acc2b235d8b680f3379a07a6d372 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:34 -0600 Subject: Remove additional unneeded tq method conversions --- kbugbuster/backend/bugdetails.cpp | 2 +- kbugbuster/backend/bugdetailsjob.cpp | 4 ++-- kbugbuster/backend/buglistjob.cpp | 4 ++-- kbugbuster/backend/bugmybugsjob.cpp | 2 +- kbugbuster/backend/bugserver.cpp | 4 ++-- kbugbuster/backend/mailsender.cpp | 4 ++-- kbugbuster/backend/smtp.cpp | 4 ++-- kbugbuster/gui/buglvi.cpp | 2 +- kbugbuster/gui/centralwidget.cpp | 2 +- kbugbuster/gui/cwbugdetails.cpp | 38 ++++++++++++++++---------------- kbugbuster/gui/cwbugdetailscontainer.cpp | 20 ++++++++--------- kbugbuster/gui/cwbuglistcontainer.cpp | 16 +++++++------- kbugbuster/gui/cwloadingwidget.cpp | 2 +- kbugbuster/gui/loadallbugsdlg.cpp | 4 ++-- kbugbuster/gui/messageeditor.cpp | 2 +- kbugbuster/gui/msginputdialog.cpp | 2 +- kbugbuster/kresources/kcalresource.cpp | 2 +- 17 files changed, 57 insertions(+), 57 deletions(-) (limited to 'kbugbuster') diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index 1b6a1f79..6b0ded58 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -241,7 +241,7 @@ TQValueList BugDetails::extractAttachments( const TQStri KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ ); else //KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ ); - KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) ); + KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) ); #ifdef DEBUG_EXTRACT kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl; #endif diff --git a/kbugbuster/backend/bugdetailsjob.cpp b/kbugbuster/backend/bugdetailsjob.cpp index 22ee31c7..1218023d 100644 --- a/kbugbuster/backend/bugdetailsjob.cpp +++ b/kbugbuster/backend/bugdetailsjob.cpp @@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data ) KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails ); if ( err ) { - emit error( i18n("Bug %1: %2").tqarg( m_bug.number() ) - .tqarg( err.message() ) ); + emit error( i18n("Bug %1: %2").arg( m_bug.number() ) + .arg( err.message() ) ); } else { emit bugDetailsAvailable( m_bug, bugDetails ); } diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp index 01910ea2..419b7956 100644 --- a/kbugbuster/backend/buglistjob.cpp +++ b/kbugbuster/backend/buglistjob.cpp @@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data ) KBB::Error err = server()->processor()->parseBugList( data, bugs ); if ( err ) { - emit error( i18n("Package %1: %2").tqarg( m_package.name() ) - .tqarg( err.message() ) ); + emit error( i18n("Package %1: %2").arg( m_package.name() ) + .arg( err.message() ) ); } else { emit bugListAvailable( m_package, m_component, bugs ); } diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp index 869b0827..cd8c3005 100644 --- a/kbugbuster/backend/bugmybugsjob.cpp +++ b/kbugbuster/backend/bugmybugsjob.cpp @@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data ) delete processor; if ( err ) - emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) ); + emit error( i18n( "My Bugs: %2" ).arg( err.message() ) ); else emit bugListAvailable( i18n( "My Bugs" ), bugs ); } diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index dc4fa8a5..6c8aa6fb 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const for ( ; cmdIt.current() ; ++cmdIt ) { BugCommand* cmd = cmdIt.current(); if (!cmd->controlString().isNull()) - result.append( i18n("Control command: %1").tqarg(cmd->controlString()) ); + result.append( i18n("Control command: %1").arg(cmd->controlString()) ); else - result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) ); + result.append( i18n("Mail to %1").arg(cmd->mailAddress()) ); } } return result; diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 543b1de3..93b74eff 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T { TQString from( fromName ); if ( !fromEmail.isEmpty() ) - from += TQString::fromLatin1( " <%2>" ).tqarg( fromEmail ); + from += TQString::fromLatin1( " <%2>" ).arg( fromEmail ); kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to << "\nbccflag:" << bcc << "\nRecipient:" << recipient @@ -173,7 +173,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response) KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()), i18n( "Error during SMTP transfer.\n" "command: %1\n" - "response: %2" ).tqarg( command ).tqarg( response ) ); + "response: %2" ).arg( command ).arg( response ) ); emit finished(); TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index df31131b..b9211cbb 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to, state = smtpInit; command = ""; - emit status( i18n( "Connecting to %1" ).tqarg( server ) ); + emit status( i18n( "Connecting to %1" ).arg( server ) ); mSocket->connectToHost( server, port ); t = new TQTextStream( mSocket ); @@ -79,7 +79,7 @@ void Smtp::quit() void Smtp::connected() { - emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) ); + emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) ); } void Smtp::socketError(int errorCode) diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp index f4643b8d..18d7c064 100644 --- a/kbugbuster/gui/buglvi.cpp +++ b/kbugbuster/gui/buglvi.cpp @@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug ) Person developer = bug.developerTODO(); if ( !developer.name.isEmpty() ) - setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) ); + setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) ); } BugLVI::~BugLVI() diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index 50384351..bb00be51 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -56,7 +56,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage, ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - // Create TQSplitter tqchildren + // Create TQSplitter children m_vertSplitter = new TQSplitter( Qt::Vertical, this ); m_listPane = new CWBugListContainer( m_vertSplitter ); m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter ); diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index f0e07cb2..b096e412 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -65,25 +65,25 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "td.helpBod { border-bottom: 1px solid #9CF; border-top: 0px; border-left: 1px solid #9CF; border-right: 0px; text-align: center; text-indent: 10px; font-family: Verdana, sans-serif, Arial; font-weight: normal; font-size: 11px; color: #404040; background-color: #000000; }\n" "table.sofT { text-align: center; font-family: Verdana; font-weight: normal; font-size: 11px; color: #404040; width: 100%; background-color: #fafafa; border: 1px #000000 solid; border-collapse: collapse; border-spacing: 0px; }\n" "\n" ) - .tqarg( cg.highlight().name() ) - .tqarg( cg.highlightedText().name() ) ); + .arg( cg.highlight().name() ) + .arg( cg.highlightedText().name() ) ); text.append( "\n" ); TQString highlightStyle = TQString( "background: %1; color: %2; " ) - .tqarg( cg.highlight().name() ) - .tqarg( cg.highlightedText().name() ); + .arg( cg.highlight().name() ) + .arg( cg.highlightedText().name() ); TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " ) - .tqarg( cg.foreground().name() ); + .arg( cg.foreground().name() ); TQString borderTopStyle = TQString( "border-top: solid %1 1px; " ) - .tqarg( cg.foreground().name() ); + .arg( cg.foreground().name() ); TQString submitter = bug.submitter().fullName( true ); int age = details.age(); text.append( "
" ); text.append( "server()->bugLink( bug ).url() + "\">" + i18n("Bug Report from %1 " ) - .tqarg( submitter ) ); + .arg( submitter ) ); int replies = details.parts().count() - 1; if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies ); text += "
"; @@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "border-bottom: solid %3 1px; " "padding: 4px\">" "" ) - .tqarg( cg.background().name() ) - .tqarg( cg.foreground().name() ) ); + .arg( cg.background().name() ) + .arg( cg.foreground().name() ) ); text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) ); text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) ); text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) ); @@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( ++it2 == bdp.end() ) text.append( "server()->bugLink( bug ).url() + "\">" + i18n("Bug Report from %1") - .tqarg( sender ) ); + .arg( sender ) ); else { - text.append( "server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies ) + text.append( "server()->bugLink( bug ).url() + TQString("#c%1").arg( replies ) + "\">" + i18n("Reply #%1 from %2") - .tqarg( replies ).tqarg( sender ) ); + .arg( replies ).arg( sender ) ); replies--; } text.append( "\n" ); @@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( atts.count() > 0 ) { text.append( "
" ); text.append( TQString( "") - .tqarg( i18n( "Attachment List") ) ); + .arg( i18n( "Attachment List") ) ); text.append( TQString("") - .tqarg( i18n("Description") ) - .tqarg( i18n("Date") ) - .tqarg( i18n("View") ) - .tqarg( i18n("Edit") ) ); + .arg( i18n("Description") ) + .arg( i18n("Date") ) + .arg( i18n("View") ) + .arg( i18n("Edit") ) ); TQValueList::iterator it; for ( it = atts.begin() ; it != atts.end() ; ++it ) { - text.append( TQString("").tqarg( (*it).description ) ) ; - text.append( TQString("").tqarg( (*it).date ) ); + text.append( TQString("").arg( (*it).description ) ) ; + text.append( TQString("").arg( (*it).date ) ); text.append( "" ); diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index ef8fc8ef..7b57ec1b 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details ) list.truncate( list.length()-2 ); //Strip off the last ", " labelText = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4") - .tqarg( bug.number() ) - .tqarg( list ) - .tqarg( bug.severityAsString() ) - .tqarg( bug.title() ); + .arg( bug.number() ) + .arg( list ) + .arg( bug.severityAsString() ) + .arg( bug.title() ); } else { labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3") - .tqarg( bug.number() ).tqarg( bug.severityAsString() ) - .tqarg( bug.title() ); + .arg( bug.number() ).arg( bug.severityAsString() ) + .arg( bug.title() ); } m_bugLabel->setText( KStringHandler::tagURLs( labelText ) ); @@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug ) if (!first) cmdText += " | "; // separator in case of multiple commands first = false; - cmdText += TQString("%1").tqarg( cmd->name() ); + cmdText += TQString("%1").arg( cmd->name() ); if (!cmdDetails.isEmpty()) cmdDetails += " | "; // separator in case of multiple commands cmdDetails += cmd->details(); @@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug ) showCommands( bug ); m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" ) - .tqarg( bug.number() ).tqarg( bug.title() ) ); + .arg( bug.number() ).arg( bug.title() ) ); m_bugStack->raiseWidget( 1 ); } @@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug ) TQString msg; if( BugSystem::self()->disconnected() ) msg = i18n( "Bug #%1 (%2) is not available offline." ). - tqarg( bug.number() ).tqarg( bug.title() ); + arg( bug.number() ).arg( bug.title() ); else msg = i18n( "Retrieving details for bug #%1\n" "(%2)" ). - tqarg( bug.number() ).tqarg( bug.title() ); + arg( bug.number() ).arg( bug.title() ); m_bugLoading->setText( msg ); m_bugStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 98124dda..14a601be 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug } } - m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) ); + m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) ); m_listStack->raiseWidget( 0 ); } @@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com if ( component.isEmpty() ) { if ( package.components().count() > 1 ) - listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() ); + listLabel = i18n( "Product '%1', all components" ).arg( package.name() ); else - listLabel = i18n( "Product '%1'" ).tqarg( package.name() ); + listLabel = i18n( "Product '%1'" ).arg( package.name() ); } else { - listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component ); + listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component ); } setBugList( listLabel, bugs ); @@ -208,9 +208,9 @@ void CWBugListContainer::setNoList() void CWBugListContainer::setLoading( const Package &package, const TQString &component ) { if ( component.isEmpty() ) - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) ); else - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) ); } void CWBugListContainer::setLoading( const TQString &label ) @@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label ) void CWBugListContainer::setCacheMiss( const Package &package ) { - setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) ); + setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) ); } void CWBugListContainer::setCacheMiss( const TQString &label ) { - m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) ); + m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) ); m_listStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index 6e8a9852..f2a62573 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text ) { m_text = text; updatePixmap(); - tqrepaint(); + repaint(); } void CWLoadingWidget::updatePixmap() diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index 72212ccd..d6203c07 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) m_bugLoadingProgress = new KIO::DefaultProgress( this ); connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotStopped() ) ); - setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) ); + setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) ); connect( BugSystem::self(), TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); @@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & ) { kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl; - m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) ); + m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) ); loadNextBug(); } diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index 54d56ea6..29da4b12 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -79,7 +79,7 @@ void MessageEditor::addButton() void MessageEditor::removeButton() { int result = KMessageBox::warningContinueCancel(this, - i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()), + i18n("Remove the button %1?").arg(mSelectionCombo->currentText()), i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") ); if (result == KMessageBox::Continue) { diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 388a02df..5f9d0e1a 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, { switch ( mType ) { case Close: - setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) ); + setCaption( i18n("Close Bug %1").arg( mBug.number() ) ); break; case Reply: setCaption( i18n("Reply to Bug") ); diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index dd858f18..5af8b8be 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/kresources/kcalresource.cpp @@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &, newTodo = new KCal::Todo; newTodo->setUid( uid ); TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1"; - newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) ); + newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) ); todo = newTodo; } -- cgit v1.2.3
%1
%1 %2 %3 %4
%1%1
%1%1server()->attachmentViewLink( (*it).id ).url() + "\">" + i18n("View") + "