From 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions --- kopete/protocols/gadu/gaduaccount.cpp | 6 +-- kopete/protocols/gadu/gaducommands.cpp | 6 +-- kopete/protocols/gadu/gadudcctransaction.cpp | 4 +- kopete/protocols/gadu/gaduregisteraccount.cpp | 4 +- kopete/protocols/gadu/gadurichtextformat.cpp | 10 ++--- kopete/protocols/gadu/gadusession.cpp | 4 +- kopete/protocols/gadu/ui/gaduadd.ui | 4 +- kopete/protocols/gadu/ui/gadueditaccountui.ui | 4 +- kopete/protocols/gadu/ui/gaduregisteraccountui.ui | 4 +- kopete/protocols/groupwise/gwaccount.cpp | 20 ++++----- kopete/protocols/groupwise/gwcontact.cpp | 2 +- kopete/protocols/groupwise/gwmessagemanager.cpp | 4 +- kopete/protocols/groupwise/gwprotocol.cpp | 6 +-- kopete/protocols/groupwise/libgroupwise/client.cpp | 14 +++---- .../groupwise/libgroupwise/coreprotocol.cpp | 16 ++++---- .../groupwise/libgroupwise/eventprotocol.cpp | 10 ++--- .../groupwise/libgroupwise/gwclientstream.cpp | 10 ++--- .../protocols/groupwise/libgroupwise/gwerror.cpp | 4 +- .../groupwise/libgroupwise/inputprotocolbase.cpp | 2 +- .../groupwise/libgroupwise/responseprotocol.cpp | 22 +++++----- kopete/protocols/groupwise/libgroupwise/rtf.cc | 2 +- kopete/protocols/groupwise/libgroupwise/rtf.ll | 2 +- kopete/protocols/groupwise/libgroupwise/task.cpp | 6 +-- .../libgroupwise/tasks/conferencetask.cpp | 24 +++++------ .../libgroupwise/tasks/createcontacttask.cpp | 6 +-- .../libgroupwise/tasks/joinconferencetask.cpp | 6 +-- .../groupwise/libgroupwise/tasks/logintask.cpp | 4 +- .../libgroupwise/tasks/needfoldertask.cpp | 2 +- .../groupwise/libgroupwise/tasks/requesttask.cpp | 2 +- .../groupwise/libgroupwise/tasks/statustask.cpp | 2 +- .../groupwise/libgroupwise/userdetailsmanager.cpp | 4 +- .../protocols/groupwise/ui/gwaccountpreferences.ui | 2 +- kopete/protocols/groupwise/ui/gwprivacydialog.cpp | 4 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 2 +- kopete/protocols/groupwise/ui/gwshowinvitation.ui | 2 +- kopete/protocols/irc/ircaccount.cpp | 44 ++++++++++---------- kopete/protocols/irc/ircchannelcontact.cpp | 40 +++++++++--------- kopete/protocols/irc/irccontact.cpp | 2 +- kopete/protocols/irc/ircprotocol.cpp | 26 ++++++------ kopete/protocols/irc/ircservercontact.cpp | 10 ++--- kopete/protocols/irc/irctransferhandler.cpp | 2 +- kopete/protocols/irc/ircusercontact.cpp | 48 +++++++++++----------- kopete/protocols/irc/ksparser.cpp | 8 ++-- kopete/protocols/irc/libkirc/kircengine.cpp | 4 +- kopete/protocols/irc/libkirc/kircmessage.cpp | 6 +-- .../irc/libkirc/kircmessageredirector.cpp | 6 +-- kopete/protocols/irc/libkirc/ksslsocket.cpp | 4 +- kopete/protocols/irc/ui/ircadd.ui | 2 +- kopete/protocols/irc/ui/irceditaccount.ui | 2 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 4 +- kopete/protocols/jabber/jabberaccount.cpp | 30 +++++++------- .../protocols/jabber/jabbercapabilitiesmanager.cpp | 10 ++--- kopete/protocols/jabber/jabberchatsession.cpp | 2 +- kopete/protocols/jabber/jabbercontact.cpp | 6 +-- kopete/protocols/jabber/jabbergroupchatmanager.cpp | 2 +- kopete/protocols/jabber/jabbergroupcontact.cpp | 2 +- kopete/protocols/jabber/jabbertransport.cpp | 4 +- .../protocols/jabber/jingle/jinglevoicecaller.cpp | 16 ++++---- .../protocols/jabber/jingle/jinglevoicesession.cpp | 2 +- .../jabber/jingle/jinglevoicesessiondialog.cpp | 2 +- .../jabber/jingle/libjingle/talk/base/task.cc | 10 ++--- .../jabber/jingle/libjingle/talk/base/task.h | 14 +++---- .../jingle/libjingle/talk/base/taskrunner.cc | 2 +- .../jingle/libjingle/talk/xmllite/xmlelement.cc | 2 +- .../jingle/libjingle/talk/xmllite/xmlprinter.cc | 2 +- .../libjingle/talk/xmpp/xmppengineimpl_iq.cc | 2 +- .../libiris/005_join_muc_with_password.patch | 4 +- .../jabber/libiris/iris/xmpp-core/protocol.cpp | 8 ++-- .../jabber/libiris/iris/xmpp-core/stream.cpp | 4 +- .../jabber/libiris/iris/xmpp-core/xmlprotocol.cpp | 2 +- .../jabber/libiris/iris/xmpp-im/client.cpp | 40 +++++++++--------- .../jabber/libiris/iris/xmpp-im/types.cpp | 2 +- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp | 10 ++--- kopete/protocols/jabber/ui/dlgaddcontact.ui | 4 +- kopete/protocols/jabber/ui/dlgbrowse.ui | 2 +- kopete/protocols/jabber/ui/dlgchangepassword.ui | 2 +- .../jabber/ui/dlgjabbereditaccountwidget.ui | 8 ++-- .../jabber/ui/dlgjabberregisteraccount.ui | 4 +- kopete/protocols/jabber/ui/dlgjabberservices.cpp | 2 +- .../meanwhile/meanwhileeditaccountwidget.cpp | 4 +- .../meanwhile/ui/meanwhileaddcontactbase.ui | 2 +- .../meanwhile/ui/meanwhileeditaccountbase.ui | 2 +- kopete/protocols/msn/dispatcher.cpp | 14 +++---- kopete/protocols/msn/incomingtransfer.cpp | 12 +++--- kopete/protocols/msn/messageformatter.cpp | 2 +- kopete/protocols/msn/msnaccount.cpp | 2 +- kopete/protocols/msn/msnchatsession.cpp | 10 ++--- kopete/protocols/msn/msncontact.cpp | 2 +- kopete/protocols/msn/msnnotifysocket.cpp | 30 +++++++------- kopete/protocols/msn/msnsocket.cpp | 4 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 16 ++++---- kopete/protocols/msn/outgoingtransfer.cpp | 8 ++-- kopete/protocols/msn/transport.cpp | 2 +- kopete/protocols/msn/ui/msnadd.ui | 4 +- kopete/protocols/msn/ui/msneditaccountui.ui | 14 +++---- kopete/protocols/msn/webcam.cpp | 18 ++++---- kopete/protocols/msn/webcam/msnwebcamdialog.cpp | 4 +- kopete/protocols/oscar/aim/aimaccount.cpp | 4 +- kopete/protocols/oscar/aim/aimcontact.cpp | 6 +-- kopete/protocols/oscar/aim/aimprotocol.cpp | 4 +- kopete/protocols/oscar/aim/aimuserinfo.cpp | 6 +-- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 4 +- kopete/protocols/oscar/aim/ui/aiminfobase.ui | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 2 +- kopete/protocols/oscar/icq/icqcontact.cpp | 12 +++--- kopete/protocols/oscar/icq/icqprotocol.cpp | 6 +-- kopete/protocols/oscar/icq/icqreadaway.cpp | 6 +-- .../protocols/oscar/icq/ui/icqauthreplydialog.cpp | 4 +- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 4 +- kopete/protocols/oscar/liboscar/buffer.cpp | 4 +- .../oscar/liboscar/chatnavservicetask.cpp | 2 +- kopete/protocols/oscar/liboscar/coreprotocol.cpp | 2 +- kopete/protocols/oscar/liboscar/rtf.cc | 2 +- kopete/protocols/oscar/liboscar/rtf.ll | 2 +- kopete/protocols/oscar/liboscar/task.cpp | 4 +- kopete/protocols/oscar/liboscar/tests/ssitest.cpp | 12 +++--- kopete/protocols/oscar/liboscar/transfer.cpp | 2 +- kopete/protocols/oscar/liboscar/userdetails.cpp | 2 +- kopete/protocols/oscar/oscaraccount.cpp | 32 +++++++-------- kopete/protocols/oscar/oscarcontact.cpp | 2 +- kopete/protocols/sms/serviceloader.cpp | 2 +- kopete/protocols/sms/services/gsmlib.cpp | 6 +-- kopete/protocols/sms/services/smsclient.cpp | 20 ++++----- kopete/protocols/sms/services/smssend.cpp | 4 +- kopete/protocols/sms/services/smssendprovider.cpp | 12 +++--- kopete/protocols/sms/smsaccount.cpp | 2 +- kopete/protocols/sms/ui/smsactprefs.ui | 4 +- .../protocols/testbed/testbedaccountpreferences.ui | 4 +- .../protocols/testbed/ui/testbedwebcamdialog.cpp | 2 +- .../protocols/winpopup/libwinpopup/libwinpopup.cpp | 4 +- kopete/protocols/winpopup/ui/wpeditaccountbase.ui | 6 +-- kopete/protocols/winpopup/wpaccount.cpp | 2 +- kopete/protocols/winpopup/wpuserinfo.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/client.cpp | 2 +- .../protocols/yahoo/libkyahoo/conferencetask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/logintask.cpp | 4 +- .../protocols/yahoo/libkyahoo/mailnotifiertask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp | 12 +++--- .../protocols/yahoo/libkyahoo/receivefiletask.cpp | 8 ++-- .../protocols/yahoo/libkyahoo/sendpicturetask.cpp | 6 +-- .../yahoo/libkyahoo/statusnotifiertask.cpp | 6 +-- .../protocols/yahoo/libkyahoo/statusnotifiertask.h | 2 +- kopete/protocols/yahoo/libkyahoo/task.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp | 10 ++--- kopete/protocols/yahoo/libkyahoo/yabentry.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/yabtask.cpp | 4 +- .../yahoo/libkyahoo/yahoobuddyiconloader.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp | 8 ++-- kopete/protocols/yahoo/ui/yahooadd.ui | 2 +- kopete/protocols/yahoo/ui/yahooeditaccountbase.ui | 4 +- kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 4 +- kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp | 14 +++---- kopete/protocols/yahoo/yahooaccount.cpp | 30 +++++++------- kopete/protocols/yahoo/yahoocontact.cpp | 6 +-- 154 files changed, 558 insertions(+), 558 deletions(-) (limited to 'kopete/protocols') diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 47a124b3..19db0db7 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -710,7 +710,7 @@ GaduAccount::connectionFailed( gg_failure_t failure ) slotLogin( p->status.internalStatus() , p->lastDescription ); } else { - error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), + error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).arg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); @@ -925,7 +925,7 @@ GaduAccount::slotExportContactsListToFile() p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-save", false ); p->saveListDialog->setCaption( - i18n("Save Contacts List for Account %1 As").tqarg( + i18n("Save Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->saveListDialog->exec() == TQDialog::Accepted ) { @@ -971,7 +971,7 @@ GaduAccount::slotImportContactsFromFile() p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-load", true ); p->loadListDialog->setCaption( - i18n("Load Contacts List for Account %1 As").tqarg( + i18n("Load Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->loadListDialog->exec() == TQDialog::Accepted ) { diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index c36f1ced..104e1b01 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -44,7 +44,7 @@ GaduCommand::GaduCommand( TQObject* parent, const char* name ) GaduCommand::~GaduCommand() { - //TQSocketNotifiers are tqchildren and will + //TQSocketNotifiers are children and will //be deleted anyhow } @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -254,7 +254,7 @@ void RegisterCommand::watcher() return; } pubDir = (gg_pubdir*) session_->data; - emit operationStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 2d0e45d4..7ec8d2ac 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -237,8 +237,8 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c KGuiItem resumeButton( i18n ( "&Resume" ) ); KGuiItem overwriteButton( i18n ( "Over&write" ) ); switch ( KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget (), - i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ), - i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) ) + i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).arg( fileName ), + i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) ) { // resume case KMessageBox::Yes: diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 22f28703..e33b4959 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri ui->labelVerificationSequence->setDisabled( true ); ui->labelInstructions->setDisabled( true ); emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() ); - updateStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); + updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) ); enableButton( User1, false ); setButtonText( Ok, i18n( "&Close" ) ); } @@ -164,7 +164,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri void GaduRegisterAccount::registrationError( const TQString& title, const TQString& what ) { - updateStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); + updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 18ef22b7..377967bc 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -100,9 +100,9 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo g = (int)color->green; b = (int)color->blue; } - style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); + style += TQString(" color: rgb( %1, %2, %3 ); ").arg( r ).arg( g ).arg( b ); - tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").tqarg( style ) ); + tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) ); opened = true; } @@ -198,7 +198,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) return NULL; } - TQString rep = TQString("%2" ).tqarg( styleHTML ).tqarg( replacement ); + TQString rep = TQString("%2" ).arg( styleHTML ).arg( replacement ); htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); @@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position) // append font description rtfs.position = position; uint csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtfs, sizeof( rtfs ) ); // append color description, if color has changed if ( rtfs.font & GG_FONT_COLOR ) { csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 12fc5794..7fded85a 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -617,7 +617,7 @@ GaduSession::errorDescription( int err ) case GG_ERROR_WRITING: return i18n( "Writing error." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) ); } } @@ -642,7 +642,7 @@ GaduSession::failureDescription( gg_failure_t f ) case GG_FAILURE_TLS: return i18n( "Unable to connect over encrypted channel.\nTry to turn off encryption support in Gadu account settings and reconnect." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)f ) ); } } diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index 7fa193d6..48279c5d 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -45,7 +45,7 @@ false - + AlignVCenter @@ -78,7 +78,7 @@ <i>(for example: 1234567)</i> - + AlignVCenter|AlignRight diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 91556886..8707f8db 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -168,7 +168,7 @@ To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.<br><br> If you do not currently have an account, please click the button to create one. - + WordBreak|AlignVCenter @@ -797,7 +797,7 @@ If you do not currently have an account, please click the button to create one.< - + AlignCenter diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index cc4f6149..8099b0d9 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -374,7 +374,7 @@ <i>Type the letters and numbers shown in the image above into the <b>Verification Sequence</b> field. This is used to prevent automated registration abuse.</i> - + WordBreak|AlignTop @@ -402,7 +402,7 @@ - + AlignCenter diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 2896ccc8..d6d89a25 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) void GroupWiseAccount::slotMessageSendingFailed() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) ); + i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) ); } void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason ) @@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges() break; } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; conflicts = true; } } // @@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError() { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) ); + i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) ); disconnect(); } @@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message ) { TQString prefix = i18n("Prefix used for automatically generated auto-reply" " messages when the contact is Away, contains contact's name", - "Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() ); + "Auto reply from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedBroadcast ) { TQString prefix = i18n("Prefix used for broadcast messages", - "Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); + "Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedSystemBroadcast ) { TQString prefix = i18n("Prefix used for system broadcast messages", - "System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); + "System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } @@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated() KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error, i18n ("The contact %1 could not be added to the contact list, with error message: %2"). - tqarg(cct->userId() ).tqarg( cct->statusString() ), + arg(cct->userId() ).arg( cct->statusString() ), i18n ("Error Adding Contact") ); } } @@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance ) void GroupWiseAccount::slotConnectedElsewhere() { - KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ), - i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() ); + KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ), + i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() ); disconnect(); } @@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event ) c = createTemporaryContact( event.user ); sess->addInvitee( c ); - Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); + Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); sess->appendMessage( declined ); } else diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 98fd1f81..1aef7110 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -237,7 +237,7 @@ void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1) , protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"), - i18n("%1|Blocked").tqarg( status.description() ) ) ); + i18n("%1|Blocked").arg( status.description() ) ) ); } else { diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 5389e4ac..100bbfdf 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -196,7 +196,7 @@ void GroupWiseChatSession::slotCreationFailed( const int failedId, const int sta { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't start a chat, no GUID.\n" << endl; //emit creationFailed(); - Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").tqarg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); + Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage( failureNotify ); setClosed(); } @@ -468,7 +468,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c ) TQString from = c->metaContact()->displayName(); Kopete::Message declined = Kopete::Message( myself(), members(), - i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ), + i18n("%1 has rejected an invitation to join this conversation.").arg( from ), Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( declined ); } diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index cfb506da..539698ec 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) case '{': case '}': case '\\': - outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) ); + outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) ); break; case '\n': outputText.append( "\\par " ); @@ -253,12 +253,12 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) bytesEncoded = 1; } index += bytesEncoded; - escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char ); + escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } - return rtfTemplate.tqarg( outputText ); + return rtfTemplate.arg( outputText ); } TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index f24946c5..5df0d1de 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -218,7 +218,7 @@ void Client::initialiseEventTasks() void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) { - debug( TQString("Setting status to %1").tqarg( status ) );; + debug( TQString("Setting status to %1").arg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); sst->status( status, reason, autoReply ); connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) ); @@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr // SLOTS // void Client::streamError( int error ) { - debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) ); + debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) ); } void Client::streamReadyRead() @@ -390,14 +390,14 @@ void Client::jct_joinConfCompleted() { const JoinConferenceTask * jct = ( JoinConferenceTask * )sender(); #ifdef LIBGW_DEBUG - debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) ); + debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) ); TQStringList parts = jct->participants(); for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it ) - debug( TQString( " - %1" ).tqarg(*it) ); + debug( TQString( " - %1" ).arg(*it) ); debug( "invitees are: " ); TQStringList invitees = jct->invitees(); for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it ) - debug( TQString( " - %1" ).tqarg(*it) ); + debug( TQString( " - %1" ).arg(*it) ); #endif emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::fromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); + return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname ); } TQCString Client::ipAddress() @@ -457,7 +457,7 @@ void Client::send( Request * request ) return; } // TQString out = request.toString(); -// debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); +// debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); // xmlOutgoing(out); d->stream->write( request ); diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 79ecf419..449adfe0 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes ) while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) ) { transferCount++; - debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) ); + debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) ); int size = m_in.size(); if ( parsedBytes < size ) { @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) command = "login"; host = request->command().section( ':', 1, 1 ).ascii(); port = request->command().section( ':', 2, 2 ).ascii(); - debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) ); + debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) ); } else command = request->command().ascii(); @@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) else dout << "\r\n"; - debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) ); + debug( TQString( "data out: %1" ).arg( bytesOut.data() ) ); emit outgoingData( bytesOut ); // now convert @@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) + GW_URLVAR_VAL + (const char *)valString + GW_URLVAR_TYPE + typeString; - debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) ); + debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) ); dout.writeRawBytes( outgoing.data(), outgoing.length() ); // write what we have so far, we may be calling this function recursively //kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl; @@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) } else // otherwise -> Event code { - debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) ); Transfer * t = m_eventProtocol->parse( wire, bytesParsed ); if ( t ) { m_inTransfer = t; - debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) ); m_state = Available; emit incomingData(); } @@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( TQ_UINT8 method ) void CoreProtocol::slotOutgoingData( const TQCString &out ) { - debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) ); + debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out.data() ) ); } bool CoreProtocol::okToProceed() diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index 6ea65595..93ce7c92 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -53,10 +53,10 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) m_din >> type; m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) ); + debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) ); if ( type > Stop ) { - debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) ); + debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) ); m_state = OutOfSync; return 0; } @@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) m_din.unsetDevice(); return 0; } - debug( TQString( "got status: %1").tqarg( status ) ); + debug( TQString( "got status: %1").arg( status ) ); tentative->setStatus( status ); - debug( TQString( "tentative status: %1").tqarg( tentative->status() ) ); + debug( TQString( "tentative status: %1").arg( tentative->status() ) ); tentative->setStatusText( statusText ); break; case ConferenceJoined: // 106 - GUID + FLAGS @@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) tentative->setMessage( message ); break; default: - debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) ); + debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) ); break; } // if we got this far, the parse succeeded, return the Transfer diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 7305f7bc..f39c2ec7 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes ) { //#define GW_CLIENTSTREAM_DEBUG 1 #ifdef GW_CLIENTSTREAM_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) ); uint count = 0; while ( count < bytes.count() ) { @@ -440,7 +440,7 @@ void ClientStream::cp_incomingData() emit doReadyRead(); } else - CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) ); + CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) ); } void ClientStream::cr_connected() @@ -520,7 +520,7 @@ void ClientStream::ss_readyRead() #ifdef LIBGW_DEBUG TQCString cs(a.data(), a.size()+1); - CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) ); + CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) ); cs_dump( a ); #endif @@ -532,7 +532,7 @@ void ClientStream::ss_readyRead() void ClientStream::ss_bytesWritten(int bytes) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) ); #else Q_UNUSED( bytes ); #endif @@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed() void ClientStream::ss_error(int x) { - CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) ); if(x == SecureStream::ErrTLS) { reset(); d->errCond = TLSFail; diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp index 65574eb3..ba2a2a58 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp @@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = i18n( "Chat has been removed from server" ); break; default: - errorString = i18n("Unrecognized error code: %s").tqarg( errorCode ); + errorString = i18n("Unrecognized error code: %s").arg( errorCode ); #else case NMERR_ACCESS_DENIED: errorString = "Access denied"; @@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = "Chat has been removed from server"; break; default: - errorString = TQString("Unrecognized error code: %s").tqarg( errorCode ); + errorString = TQString("Unrecognized error code: %s").arg( errorCode ); #endif } return errorString; diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 14a5af70..415905bf 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -98,7 +98,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < ( val - 1 ) ) { - debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) ); + debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 50788178..2c7f3615 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) return 0; } headerRest.append( line ); - debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) ); + debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) ); } debug( "ResponseProtocol::readResponse() header finished" ); // if it's a redirect, set flag @@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // other header processing ( 500! ) if ( ok && rtnCode == 500 ) { - debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); + debug( TQString( "- server error %1" ).arg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; } if ( ok && rtnCode == 404 ) { - debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); + debug( TQString( "- server error %1" ).arg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; @@ -123,7 +123,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( sf ) { tId = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) ); + debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) ); m_collatingFields.remove( it ); delete sf; } @@ -135,7 +135,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( sf ) { resultCode = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) ); + debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) ); m_collatingFields.remove( it ); delete sf; } @@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // append to inQueue if ( tId ) { - debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) ); + debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) ); packetState = Available; bytes = m_bytes; m_din.unsetDevice(); @@ -169,7 +169,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) // if we find the beginning of a new nested list, push the current list onto m_collatingFields debug( "ResponseProtocol::readFields()" ); if ( fieldCount > 0 ) - debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) ); + debug( TQString( "reading %1 fields" ).arg( fieldCount ) ); Field::FieldList currentList; while ( fieldCount != 0 ) // prevents bad input data from ruining our day { @@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } - debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) ); + debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) ); // if multivalue or array if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY ) { @@ -223,7 +223,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) m_bytes += sizeof( TQ_UINT32 ); // create multifield - debug( TQString( " multi field containing: %1" ).tqarg( val ) ); + debug( TQString( " multi field containing: %1" ).arg( val ) ); Field::MultiField* m = new Field::MultiField( tag, method, 0, type ); currentList.append( m ); if ( !readFields( val, ¤tList) ) @@ -250,7 +250,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) } // convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val. TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 ); - debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) ); + debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) ); // create singlefield Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue ); currentList.append( s ); @@ -266,7 +266,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) } m_din >> val; m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "- numeric field: %1" ).tqarg( val ) ); + debug( TQString( "- numeric field: %1" ).arg( val ) ); Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val ); currentList.append( s ); } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index afe7b18e..a74b4c67 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 7f2f1841..67e9f5f5 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -517,7 +517,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 858c8fde..547844d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -130,7 +130,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) ); + client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) ); return true; } } @@ -256,7 +256,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index 3fccc218..c88e22b4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask() void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt ) { - client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg - ( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg - ( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); - client()->debug( TQString( " flags: %1" ).tqarg( evt.flags, 8 ) ); + client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg + ( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg + ( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); + client()->debug( TQString( " flags: %1" ).arg( evt.flags, 8 ) ); } bool ConferenceTask::take( Transfer * transfer ) @@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveMessage" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit message( event ); break; @@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ConferenceInvite" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit invited( event ); break; @@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveAutoReply" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) ); + client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) ); emit autoReply( event ); break; case GroupWise::ReceivedBroadcast: Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedBroadCast" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit broadcast( event ); break; @@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedSystemBroadCast" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); emit systemBroadcast( event ); break; default: - client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) ); + client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) ); } dumpConferenceEvent( event ); @@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d // if the details relate to event, try again to handle it if ( details.dn == (*current).user ) { - client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) ); + client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) ); switch ( (*current).type ) { case GroupWise::ConferenceJoined: @@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event ) } else { - client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) ); + client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) ); client()->userDetailsManager()->requestDetails( event.user ); m_pendingEvents.append( event ); return true; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 920eec3b..0d167236 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -71,7 +71,7 @@ void CreateContactTask::onGo() // create contacts on the server for ( ; it != end; ++it ) { - client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) ); + client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) ); CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() ); // the add contact action may cause other contacts' sequence numbers to change // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount @@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" ); return; } - client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg - ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) ); + client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg + ( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) ); if ( m_dn.isEmpty() ) m_dn = addedContact.dn; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index ed4f6bfd..b7b1f1cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer ) void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details ) { - client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) ); + client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) ); TQStringList::Iterator it = m_unknowns.begin(); TQStringList::Iterator end = m_unknowns.end(); while( it != end ) { TQString current = *it; ++it; - client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) ); + client()->debug( TQString( " - can we remove %1?" ).arg(current ) ); if ( current == details.dn ) { client()->debug( " - it's gone!" ); @@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details break; } } - client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) ); + client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) ); if ( m_unknowns.empty() ) { client()->debug( " - finished()" ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index e2637807..6a28124f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::fromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); + TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() ); Field::FieldList lst; lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) ); @@ -123,7 +123,7 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) current = fl.findSingleField( NM_A_SZ_PARENT_ID ); folder.parentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg( folder.id ).arg( folder.parentId ).arg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 5a1eb414..12c7382a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder ) // if this is the folder we were trying to create if ( m_folderDisplayName == addedFolder.name ) { - client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) ); + client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) ); m_folderId = addedFolder.id; } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp index 7d4b41aa..44f54124 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp @@ -50,7 +50,7 @@ void RequestTask::onGo() { if ( transfer() ) { - client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast( transfer() )->command() ) ); + client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast( transfer() )->command() ) ); send( static_cast( transfer() ) ); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp index 79435010..e7272402 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -37,7 +37,7 @@ bool StatusTask::take( Transfer * transfer ) if ( forMe( transfer, event ) ) { client()->debug( "Got a status change!" ); - client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) ); + client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) ); emit gotStatus( event->source().lower(), event->status(), event->statusText() ); return true; } diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index f87cfa25..ceb29632 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -88,7 +88,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU TQStringList::Iterator found = m_pendingDNs.find( *it ); if ( found == m_pendingDNs.end() ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) ); requestList.append( *it ); m_pendingDNs.append( *it ); } @@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) ); TQStringList list; list.append( dn ); requestDetails( list, onlyUnknown ); diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index ce17003c..646116e6 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -286,7 +286,7 @@ - + AlignCenter diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index e6179882..80daff71 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -49,7 +49,7 @@ private: }; GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), + : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0) { m_privacy = new GroupWisePrivacyWidget( this ); @@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges() void GroupWisePrivacyDialog::errorNotConnected() { KMessageBox::queuedMessageBox( this, KMessageBox::Information, - i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) ); + i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) ); } #include "gwprivacydialog.moc" diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 547de1b5..6005f61a 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co m_wid->m_contactName->setText( event.user ); m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); - m_wid->m_message->setText( TQString("%1").tqarg( event.message ) ); + m_wid->m_message->setText( TQString("%1").arg( event.message ) ); setMainWidget( m_wid ); } diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 4b23a370..7de10328 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -82,7 +82,7 @@ INVITE_MESSAGE - + WordBreak|AlignVCenter diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index ec3904eb..318a8f20 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) m_engine->addCustomCtcp( it.key(), it.data() ); - TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").tqarg(kapp->aboutData()->version()); + TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").arg(kapp->aboutData()->version()); m_engine->setVersionString( version ); TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), @@ -173,7 +173,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T /* Could not find this host. Add it to the networks structure */ m_network = new IRCNetwork; - m_network->name = i18n("Temporary Network - %1").tqarg( hostName ); + m_network->name = i18n("Temporary Network - %1").arg( hostName ); m_network->description = i18n("Network imported from previous version of Kopete, or an IRC URI"); IRCHost *host = new IRCHost; @@ -204,7 +204,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_contactManager = new IRCContactManager(mNickName, this); setMyself( m_contactManager->mySelf() ); - setAccountLabel( TQString::fromLatin1("%1@%2").tqarg(mNickName,networkName) ); + setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) ); m_myServer = m_contactManager->myServer(); m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, @@ -226,7 +226,7 @@ void IRCAccount::slotNickInUse( const TQString &nick ) { TQString newNick = KInputDialog::getText( i18n("IRC Plugin"), - i18n("The nickname %1 is already in use. Please enter an alternate nickname:").tqarg(nick), + i18n("The nickname %1 is already in use. Please enter an alternate nickname:").arg(nick), nick); if (newNick.isNull()) @@ -243,7 +243,7 @@ void IRCAccount::slotNickInUse( const TQString &nick ) void IRCAccount::slotNickInUseAlert( const TQString &nick ) { - KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").tqarg(nick), i18n("IRC Plugin")); + KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").arg(nick), i18n("IRC Plugin")); } void IRCAccount::setAltNick( const TQString &altNick ) @@ -306,8 +306,8 @@ void IRCAccount::setNetwork( const TQString &network ) KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("The network associated with this account, %1, no longer exists. Please" - " ensure that the account has a valid network. The account will not be enabled until you do so.").tqarg(network), - i18n("Problem Loading %1").tqarg( accountId() ), 0 ); + " ensure that the account has a valid network. The account will not be enabled until you do so.").arg(network), + i18n("Problem Loading %1").arg( accountId() ), 0 ); } } @@ -352,7 +352,7 @@ const TQString IRCAccount::defaultPart() const { TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart")); if( partMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() ); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg( kapp->aboutData()->version() ); return partMsg; } @@ -360,7 +360,7 @@ const TQString IRCAccount::defaultQuit() const { TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit")); if( quitMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version()); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg(kapp->aboutData()->version()); return quitMsg; } @@ -370,7 +370,7 @@ void IRCAccount::setCustomCtcpReplies( const TQMap< TQString, TQString > &replie for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) { m_engine->addCustomCtcp( it.key(), it.data() ); - val.append( TQString::fromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) ); + val.append( TQString::fromLatin1("%1=%2").arg( it.key() ).arg( it.data() ) ); } configGroup()->writeEntry( "CustomCtcp", val ); @@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, KActionMenu *IRCAccount::actionMenu() { - TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlineStatus().description() ); + TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() ); KActionMenu *mActionMenu = Kopete::Account::actionMenu(); @@ -455,14 +455,14 @@ void IRCAccount::connectWithPassword(const TQString &password) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("The network associated with this account, %1, has no valid hosts. Please ensure that the account has a valid network.").tqarg(m_network->name), + i18n("The network associated with this account, %1, has no valid hosts. Please ensure that the account has a valid network.").arg(m_network->name), i18n("Network is Empty"), 0 ); } else if( currentHost == hosts.count() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Kopete could not connect to any of the servers in the network associated with this account (%1). Please try again later.").tqarg(m_network->name), + i18n("Kopete could not connect to any of the servers in the network associated with this account (%1). Please try again later.").arg(m_network->name), i18n("Network is Unavailable"), 0 ); currentHost = 0; @@ -490,7 +490,7 @@ void IRCAccount::connectWithPassword(const TQString &password) } IRCHost *host = hosts[ currentHost++ ]; - myServer()->appendMessage( i18n("Connecting to %1...").tqarg( host->host ) ); + myServer()->appendMessage( i18n("Connecting to %1...").arg( host->host ) ); if( host->ssl ) myServer()->appendMessage( i18n("Using SSL") ); @@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands() return; if (!autoConnect.isEmpty()) - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").tqarg(autoConnect), manager); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").arg(autoConnect), manager); TQStringList commands(connectCommands()); for (TQStringList::Iterator it=commands.begin(); it != commands.end(); ++it) @@ -597,7 +597,7 @@ void IRCAccount::slotSearchChannels() if( !m_channelList ) { m_channelList = new ChannelListDialog( m_engine, - i18n("Channel List for %1").tqarg( m_engine->currentHost() ), this, + i18n("Channel List for %1").arg( m_engine->currentHost() ), this, TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) ); } else @@ -714,8 +714,8 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact * {//This should NEVER happen Kopete::MetaContact *old = c->metaContact(); c->setMetaContact( m ); - Kopete::ContactPtrList tqchildren = old->contacts(); - if (tqchildren.isEmpty()) + Kopete::ContactPtrList children = old->contacts(); + if (children.isEmpty()) Kopete::ContactList::self()->removeMetaContact( old ); } else if( c->metaContact()->isTemporary() ) @@ -781,7 +781,7 @@ void IRCAccount::slotJoinChannel() } KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").tqarg(chan), + i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").arg(chan), i18n("IRC Plugin") ); } @@ -789,15 +789,15 @@ void IRCAccount::slotJoinChannel() void IRCAccount::slotNewCtcpReply(const TQString &type, const TQString &/*target*/, const TQString &messageReceived) { - appendMessage( i18n("CTCP %1 REPLY: %2").tqarg(type).tqarg(messageReceived), InfoReply ); + appendMessage( i18n("CTCP %1 REPLY: %2").arg(type).arg(messageReceived), InfoReply ); } void IRCAccount::slotNoSuchNickname( const TQString &nick ) { if( KIRC::Entity::isChannel(nick) ) - appendMessage( i18n("The channel \"%1\" does not exist").tqarg(nick), UnknownReply ); + appendMessage( i18n("The channel \"%1\" does not exist").arg(nick), UnknownReply ); else - appendMessage( i18n("The nickname \"%1\" does not exist").tqarg(nick), UnknownReply ); + appendMessage( i18n("The nickname \"%1\" does not exist").arg(nick), UnknownReply ); } void IRCAccount::appendMessage( const TQString &message, MessageType type ) diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 8ecb59f0..94d67d3a 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -78,7 +78,7 @@ void IRCChannelContact::slotUpdateInfo() /** This woudl be nice, but it generates server errors too often if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline ) - kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").tqarg(m_nickName) ); + kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").arg(m_nickName) ); else setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() ); @@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo() if (manager(Kopete::Contact::CannotCreate)) { setProperty(m_protocol->propChannelMembers, manager()->members().count()); - engine->writeMessage(TQString::fromLatin1("WHO %1").tqarg(m_nickName)); + engine->writeMessage(TQString::fromLatin1("WHO %1").arg(m_nickName)); } else { @@ -272,12 +272,12 @@ void IRCChannelContact::channelTopic(const TQString &topic) if (mTopic.isEmpty()) { Kopete::Message msg((Kopete::Contact*)this, mMyself, - i18n("Topic for %1 is set empty.").tqarg(m_nickName), + i18n("Topic for %1 is set empty.").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); appendMessage(msg); } else { Kopete::Message msg((Kopete::Contact*)this, mMyself, - i18n("Topic for %1 is %2").tqarg(m_nickName).tqarg(mTopic), + i18n("Topic for %1 is %2").arg(m_nickName).arg(mTopic), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); appendMessage(msg); } @@ -362,7 +362,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname) kdDebug() << k_funcinfo << "My view:" << manager(Kopete::Contact::CannotCreate)->view(false) << endl; Kopete::Message msg((Kopete::Contact *)this, mMyself, - i18n("You have joined channel %1").tqarg(m_nickName), + i18n("You have joined channel %1").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low @@ -378,7 +378,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname) contact->setOnlineStatus( m_protocol->m_UserStatusOnline ); manager()->addContact((Kopete::Contact *)contact, true); Kopete::Message msg((Kopete::Contact *)this, mMyself, - i18n("User %1 joined channel %2").tqarg(nickname).tqarg(m_nickName), + i18n("User %1 joined channel %2").arg(nickname).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low manager()->appendMessage(msg); @@ -413,9 +413,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic TQString r; if ((reason != nick) && (reason != nickKicked)) { - r = i18n( "%1 was kicked by %2. Reason: %3" ).tqarg(nickKicked, nick, reason); + r = i18n( "%1 was kicked by %2. Reason: %3" ).arg(nickKicked, nick, reason); } else { - r = i18n( "%1 was kicked by %2." ).tqarg(nickKicked, nick); + r = i18n( "%1 was kicked by %2." ).arg(nickKicked, nick); } manager()->removeContact( c, r ); @@ -434,9 +434,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic TQString r; if ((reason != nick) && (reason != nickKicked)) { - r = i18n( "You were kicked from %1 by %2. Reason: %3" ).tqarg(m_nickName, nickKicked, reason); + r = i18n( "You were kicked from %1 by %2. Reason: %3" ).arg(m_nickName, nickKicked, reason); } else { - r = i18n( "You were kicked from %1 by %2." ).tqarg(m_nickName, nickKicked); + r = i18n( "You were kicked from %1 by %2." ).arg(m_nickName, nickKicked); } KMessageBox::error(Kopete::UI::Global::mainWidget(), r, i18n("IRC Plugin")); @@ -468,7 +468,7 @@ void IRCChannelContact::setTopic(const TQString &topic) else { Kopete::Message msg(account->myServer(), manager()->members(), - i18n("You must be a channel operator on %1 to do that.").tqarg(m_nickName), + i18n("You must be a channel operator on %1 to do that.").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); manager()->appendMessage(msg); } @@ -483,7 +483,7 @@ void IRCChannelContact::topicChanged(const TQString &nick, const TQString &newto setProperty( m_protocol->propChannelTopic, mTopic ); manager()->setDisplayName( caption() ); Kopete::Message msg(account->myServer(), mMyself, - i18n("%1 has changed the topic to: %2").tqarg(nick).tqarg(newtopic), + i18n("%1 has changed the topic to: %2").arg(nick).arg(newtopic), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); @@ -494,7 +494,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) IRCAccount *account = ircAccount(); Kopete::Message msg(account->myServer(), mMyself, - i18n("Topic set by %1 at %2").tqarg(nick).tqarg( + i18n("Topic set by %1 at %2").arg(nick).arg( KGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low @@ -503,7 +503,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) void IRCChannelContact::incomingModeChange( const TQString &nick, const TQString &mode ) { - Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").tqarg(nick).tqarg(mode).tqarg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); + Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").arg(nick).arg(mode).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); @@ -564,7 +564,7 @@ void IRCChannelContact::failedChanBanned() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because you have been banned.").tqarg(m_nickName), + i18n("You can not join %1 because you have been banned.").arg(m_nickName), i18n("IRC Plugin") ); } @@ -572,14 +572,14 @@ void IRCChannelContact::failedChanInvite() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because it is set to invite only, and no one has invited you.").tqarg(m_nickName), i18n("IRC Plugin") ); + i18n("You can not join %1 because it is set to invite only, and no one has invited you.").arg(m_nickName), i18n("IRC Plugin") ); } void IRCChannelContact::failedChanFull() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because it has reached its user limit.").tqarg(m_nickName), + i18n("You can not join %1 because it has reached its user limit.").arg(m_nickName), i18n("IRC Plugin") ); } @@ -587,7 +587,7 @@ void IRCChannelContact::failedChankey() { bool ok; TQString diaPassword = KInputDialog::getText( i18n( "IRC Plugin" ), - i18n( "Please enter key for channel %1: ").tqarg(m_nickName), + i18n( "Please enter key for channel %1: ").arg(m_nickName), TQString(), &ok ); @@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage() const TQString IRCChannelContact::caption() const { - TQString cap = TQString::fromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); + TQString cap = TQString::fromLatin1("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost()); if(!mTopic.isEmpty()) - cap.append( TQString::fromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) ); + cap.append( TQString::fromLatin1(" - %1").arg(Kopete::Message::unescape(mTopic)) ); return cap; } diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index c8d59aef..c45b5303 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -186,7 +186,7 @@ void IRCContact::slotUserDisconnected(const TQString &user, const TQString &reas Kopete::Contact *c = locateUser( nickname ); if ( c ) { - m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(reason), Kopete::Message::RichText); + m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").arg(reason), Kopete::Message::RichText); c->setOnlineStatus(m_protocol->m_UserStatusOffline); } } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index a4fdb655..a8b39299 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -90,7 +90,7 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const return; KUser user( getuid() ); - TQString accountId = TQString::fromLatin1("%1@%2:%3").tqarg( + TQString accountId = TQString::fromLatin1("%1@%2:%3").arg( user.loginName(), url.host(), TQString::number(port) @@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m else { static_cast(manager->account())->engine()-> - writeRawMessage(TQString::fromLatin1("TOPIC %1").tqarg(chan->nickName())); + writeRawMessage(TQString::fromLatin1("TOPIC %1").arg(chan->nickName())); } } else @@ -536,7 +536,7 @@ void IRCProtocol::slotJoinCommand( const TQString &arg, Kopete::ChatSession *man { static_cast( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .tqarg(args[0]), IRCAccount::ErrorReply ); + .arg(args[0]), IRCAccount::ErrorReply ); } } @@ -556,7 +556,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * { static_cast( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .tqarg(argsList[1]), IRCAccount::ErrorReply ); + .arg(argsList[1]), IRCAccount::ErrorReply ); } } else @@ -568,7 +568,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * if( c && c->manager()->contactOnlineStatus( manager->myself() ) == m_UserStatusOp ) { static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("INVITE %1 %2").tqarg( argsList[0] ). + TQString::fromLatin1("INVITE %1 %2").arg( argsList[0] ). arg( c->nickName() ) ); } @@ -599,7 +599,7 @@ void IRCProtocol::slotQueryCommand( const TQString &args, Kopete::ChatSession *m else { static_cast( manager->account() )->appendMessage( - i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").tqarg(user), + i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").arg(user), IRCAccount::ErrorReply ); } } @@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHO %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHO %1").arg( argsList.first() ) ); static_cast( manager->account() )->setCurrentCommandSource( manager ); } @@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession * { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) ); static_cast( manager->account() )->setCurrentCommandSource( manager ); } @@ -691,7 +691,7 @@ void IRCProtocol::slotBanCommand( const TQString &args, Kopete::ChatSession *man Kopete::ContactPtrList members = manager->members(); IRCChannelContact *chan = static_cast( members.first() ); if( chan && chan->locateUser( argsList.front() ) ) - chan->setMode( TQString::fromLatin1("+b %1").tqarg( argsList.front() ) ); + chan->setMode( TQString::fromLatin1("+b %1").arg( argsList.front() ) ); } else { @@ -754,7 +754,7 @@ void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *m for( TQStringList::iterator it = argsList.begin(); it != argsList.end(); ++it ) { if( chan->locateUser( *it ) ) - chan->setMode( TQString::fromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) ); + chan->setMode( TQString::fromLatin1("%1 %2").arg( mode ).arg( *it ) ); } } } @@ -918,7 +918,7 @@ void IRCProtocol::slotDeleteNetwork() if( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("Are you sure you want to delete the network %1?
" "Any accounts which use this network will have to be modified.") - .tqarg(network), i18n("Deleting Network"), + .arg(network), i18n("Deleting Network"), KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); @@ -944,7 +944,7 @@ void IRCProtocol::slotDeleteHost() TQString hostName = netConf->host->text(); if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("Are you sure you want to delete the host %1?") - .tqarg(hostName), i18n("Deleting Host"), + .arg(hostName), i18n("Deleting Host"), KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) { IRCHost *host = m_hosts[ hostName ]; @@ -976,7 +976,7 @@ void IRCProtocol::slotNewNetwork() { int newIdx = 1; do { - netName = TQString::fromLatin1( "New Network #%1" ).tqarg( newIdx++ ); + netName = TQString::fromLatin1( "New Network #%1" ).arg( newIdx++ ); } while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index d0c70cfb..5be40dff 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -92,7 +92,7 @@ void IRCServerContact::updateStatus() const TQString IRCServerContact::caption() const { - return i18n("%1 @ %2").tqarg(ircAccount()->mySelf()->nickName() ).tqarg( + return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg( kircEngine()->currentHost().isEmpty() ? ircAccount()->networkName() : kircEngine()->currentHost() ); } @@ -147,7 +147,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // Prefix missing. // NOTICE AUTH :*** Checking Ident - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(kircEngine()->currentHost(), notice), + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(kircEngine()->currentHost(), notice), IRCAccount::NoticeReply); } else { @@ -155,13 +155,13 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello if (orig.contains('!')) { - ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( + ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").arg( orig.section('!', 0, 0), orig.section('!', 1, 1), notice), IRCAccount::NoticeReply); } else { - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg( + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg( orig, notice), IRCAccount::NoticeReply); } } @@ -184,7 +184,7 @@ void IRCServerContact::slotIncomingMotd(const TQString &message) void IRCServerContact::slotCannotSendToChannel(const TQString &channel, const TQString &message) { - ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply); + ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").arg(channel).arg(message), IRCAccount::ErrorReply); } void IRCServerContact::appendMessage(Kopete::Message &msg) diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index f4b5af10..e579e94a 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -164,7 +164,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job) // if (t->) // kt->userAbort(i18n("User canceled transfer.")); // else -// kt->userAbort(i18n("User canceled transfer for file:%1").tqarg(t->fileName())); +// kt->userAbort(i18n("User canceled transfer for file:%1").arg(t->fileName())); break; default: kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl; diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index b03d465f..c4607cb9 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -165,7 +165,7 @@ void IRCUserContact::slotUserOffline() updateStatus(); if( !metaContact()->isTemporary() ) - kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").tqarg(m_nickName) ); + kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").arg(m_nickName) ); removeProperty( m_protocol->propUserInfo ); removeProperty( m_protocol->propServer ); @@ -185,7 +185,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason) if( manager( Kopete::Contact::CannotCreate ) ) { Kopete::Message msg( (Kopete::Contact*)ircAccount()->myServer(), mMyself, - i18n("%1 is away (%2)").tqarg( m_nickName ).tqarg( reason ), + i18n("%1 is away (%2)").arg( m_nickName ).arg( reason ), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW ); manager(Kopete::Contact::CanCreate)->appendMessage(msg); } @@ -216,7 +216,7 @@ void IRCUserContact::slotUserInfo() const TQString IRCUserContact::caption() const { - return i18n("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); + return i18n("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost()); } void IRCUserContact::slotOp() @@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").tqarg(mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").arg(mInfo.hostName)); } void IRCUserContact::slotBanUserHost() @@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").arg(mInfo.userName, mInfo.hostName)); } void IRCUserContact::slotBanDomain() @@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").tqarg(domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").arg(domain)); } void IRCUserContact::slotBanUserDomain() @@ -336,7 +336,7 @@ void IRCUserContact::slotBanUserDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").arg(mInfo.userName, domain)); } void IRCUserContact::slotKick() @@ -350,7 +350,7 @@ void IRCUserContact::contactMode(const TQString &mode) { Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName)); + kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").arg(mode).arg(m_nickName)); } void IRCUserContact::slotCtcpPing() @@ -373,7 +373,7 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host if( onlineStatus().status() == Kopete::OnlineStatus::Offline ) { setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") - .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); + .arg(mInfo.userName).arg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propFullName, mInfo.realName ); } @@ -433,26 +433,26 @@ void IRCUserContact::whoIsComplete() { //User info TQString msg = i18n("%1 is (%2@%3): %4
") - .tqarg(m_nickName) - .tqarg(mInfo.userName) - .tqarg(mInfo.hostName) - .tqarg(mInfo.realName); + .arg(m_nickName) + .arg(mInfo.userName) + .arg(mInfo.hostName) + .arg(mInfo.realName); if( mInfo.isIdentified ) - msg += i18n("%1 is authenticated with NICKSERV
").tqarg(m_nickName); + msg += i18n("%1 is authenticated with NICKSERV
").arg(m_nickName); if( mInfo.isOperator ) - msg += i18n("%1 is an IRC operator
").tqarg(m_nickName); + msg += i18n("%1 is an IRC operator
").arg(m_nickName); //Channels - msg += i18n("on channels %1
").tqarg(mInfo.channels.join(" ; ")); + msg += i18n("on channels %1
").arg(mInfo.channels.join(" ; ")); //Server - msg += i18n("on IRC via server %1 ( %2 )
").tqarg(mInfo.serverName).tqarg(mInfo.serverInfo); + msg += i18n("on IRC via server %1 ( %2 )
").arg(mInfo.serverName).arg(mInfo.serverInfo); //Idle TQString idleTime = formattedIdleTime(); - msg += i18n("idle: %2
").tqarg( idleTime.isEmpty() ? TQString::number(0) : idleTime ); + msg += i18n("idle: %2
").arg( idleTime.isEmpty() ? TQString::number(0) : idleTime ); //End ircAccount()->appendMessage(msg, IRCAccount::InfoReply ); @@ -466,12 +466,12 @@ void IRCUserContact::whoWasComplete() { //User info TQString msg = i18n("%1 was (%2@%3): %4\n") - .tqarg(m_nickName) - .tqarg(mInfo.userName) - .tqarg(mInfo.hostName) - .tqarg(mInfo.realName); + .arg(m_nickName) + .arg(mInfo.userName) + .arg(mInfo.hostName) + .arg(mInfo.realName); - msg += i18n("Last Online: %1\n").tqarg( + msg += i18n("Last Online: %1\n").arg( KGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) @@ -490,7 +490,7 @@ TQString IRCUserContact::formattedName() const void IRCUserContact::updateInfo() { setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") - .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); + .arg(mInfo.userName).arg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propChannels, mInfo.channels.join(" ") ); setProperty( m_protocol->propHops, TQString::number(mInfo.hops) ); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index 25421d4d..514421ff 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -152,7 +152,7 @@ TQCString KSParser::_parse(const TQCString &message) break; default: if (cur < TQChar(' ')) // search for control characters - toAppend = TQString::fromLatin1("<%1>").tqarg(cur, 2, 16).upper(); + toAppend = TQString::fromLatin1("<%1>").arg(cur, 2, 16).upper(); else toAppend = TQStyleSheet::escape(cur); } @@ -193,12 +193,12 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString tagStyle; if (fgColor.isValid()) - tagStyle += TQString::fromLatin1("color:%1;").tqarg(fgColor.name()); + tagStyle += TQString::fromLatin1("color:%1;").arg(fgColor.name()); if (bgColor.isValid()) - tagStyle += TQString::fromLatin1("background-color:%1;").tqarg(bgColor.name()); + tagStyle += TQString::fromLatin1("background-color:%1;").arg(bgColor.name()); if(!tagStyle.isEmpty()) - tagStyle = TQString::fromLatin1("style=\"%1\"").tqarg(tagStyle); + tagStyle = TQString::fromLatin1("style=\"%1\"").arg(tagStyle); return pushTag(TQString::fromLatin1("span"), tagStyle);; } diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 0e1b3bc1..0fddaab7 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -54,7 +54,7 @@ using namespace KIRC; const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") ); Engine::Engine(TQObject *parent, const char *name) - : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), + : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()), m_status(Idle), m_FailedNickOnLogin(false), m_useSSL(false), @@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict &map, Me kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl; writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(), - TQString::fromLatin1("%1 internal error(s)").tqarg(errors.size())); + TQString::fromLatin1("%1 internal error(s)").arg(errors.size())); } else { diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index c9d71cd2..8a48ce52 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -106,7 +106,7 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ // FIXME: Should check the amount of data really writen. int wrote = engine->socket()->writeBlock(s.data(), s.length()); - kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl; + kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl; } void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message) @@ -169,10 +169,10 @@ Message Message::parse(Engine *engine, const TQTextCodec *codec, bool *parseSucc // Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending. if (length > 1 && raw.at(length-2) == '\n') { - raw.tqat(length-2) = '\0'; + raw.at(length-2) = '\0'; } if (length > 2 && raw.at(length-3) == '\r') { - raw.tqat(length-3) = '\0'; + raw.at(length-3) = '\0'; } kdDebug(14121) << "<< " << raw << endl; diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index 7ff74ecc..2e1d0b4c 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp @@ -80,9 +80,9 @@ bool MessageRedirector::checkValidity(const Message &msg) /* if ( msg.isNumeric() && ( msg.argsSize() > 0 && ( - msg.tqarg(0) == m_Nickname || - msg.tqarg(0) == m_PendingNick || - msg.tqarg(0) == TQString::fromLatin1("*") + msg.arg(0) == m_Nickname || + msg.arg(0) == m_PendingNick || + msg.arg(0) == TQString::fromLatin1("*") ) ) ) diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 2bf3910a..6d6c2ba2 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -372,7 +372,7 @@ int KSSLSocket::verifyCertificate() "does not match the one the " "certificate was issued to."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); @@ -382,7 +382,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index bed61568..3c417075 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -88,7 +88,7 @@ <i>(for example: joe_bob or #somechannel)</i> - + AlignVCenter|AlignRight diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index 34ef83b7..f04c8e09 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -91,7 +91,7 @@ <p><b>Note:</b> Most IRC servers do not require a password, and only a nickname is required to connect</p> - + WordBreak|AlignTop diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 9012a924..c0d5a87a 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) TQString nextId = network; uint accountNumber = 1; - while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) ) + while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) ) { - nextId = TQString::fromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber ); + nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber ); } kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl; return nextId; diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 4865f8b1..a8597658 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -787,7 +787,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the protocol stream: %1").tqarg(errorCondition); + errorText = i18n("There was an error in the protocol stream: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrConnection: @@ -845,7 +845,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } if(!errorCondition.isEmpty()) - errorText = i18n("There was a connection error: %1").tqarg(errorCondition); + errorText = i18n("There was a connection error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrNeg: @@ -870,7 +870,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a negotiation error: %1").tqarg(errorCondition); + errorText = i18n("There was a negotiation error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrTLS: @@ -887,7 +887,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(errorCondition); + errorText = i18n("There was a Transport Layer Security (TLS) error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrAuth: @@ -931,7 +931,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error authenticating with the server: %1").tqarg(errorCondition); + errorText = i18n("There was an error authenticating with the server: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrSecurityLayer: @@ -948,7 +948,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the security layer: %1").tqarg(errorCondition); + errorText = i18n("There was an error in the security layer: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrBind: @@ -965,7 +965,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("Could not bind a resource: %1").tqarg(errorCondition); + errorText = i18n("Could not bind a resource: %1").arg(errorCondition); break; default: @@ -981,7 +981,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int if(!errorText.isEmpty()) KMessageBox::error (Kopete::UI::Global::mainWidget (), errorText, - i18n("Connection problem with Jabber server %1").tqarg(server)); + i18n("Connection problem with Jabber server %1").arg(server)); } @@ -1512,7 +1512,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::InvalidPasswordForMUC: { TQCString password; - int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(jid.node())); + int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node())); if (result == KPasswordDialog::Accepted) m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password); } @@ -1521,7 +1521,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::NicknameConflict: { bool ok; - TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(jid.node(), jid.resource()), + TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").arg(jid.node(), jid.resource()), i18n("Give your nickname"), TQString(), &ok); @@ -1535,14 +1535,14 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::BannedFromThisMUC: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because you were banned").tqarg(jid.node()), + i18n ("You can't join the room %1 because you were banned").arg(jid.node()), i18n ("Jabber Group Chat") ); break; case JabberClient::MaxUsersReachedForThisMuc: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(jid.node()), + i18n ("You can't join the room %1 because the maximum users has been reached").arg(jid.node()), i18n ("Jabber Group Chat") ); break; @@ -1659,7 +1659,7 @@ void JabberAccount::slotIncomingVoiceCall( const Jid &jid ) // if(sessionType == "http://www.google.com/session/phone") // { // TQString from = ((XMPP::Jid)session->peers().first()).full(); -// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) ); +// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").arg(from) ); // JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast(session) ); // voiceDialog->show(); // } @@ -1687,7 +1687,7 @@ bool JabberAccount::removeAccount( ) int result=KMessageBox::warningYesNoCancel( Kopete::UI::Global::mainWidget () , i18n( "Do you want to also unregister \"%1\" from the Jabber server ?\n" "If you unregister, all your contact list may be removed on the server," - "And you will never be able to connect to this account with any client").tqarg( accountLabel() ), + "And you will never be able to connect to this account with any client").arg( accountLabel() ), i18n("Unregister"), KGuiItem(i18n( "Remove and Unregister" ), "editdelete"), KGuiItem(i18n( "Remove from kopete only"), "edittrash"), @@ -1734,7 +1734,7 @@ void JabberAccount::slotUnregisterFinished( ) if ( task && ! task->success ()) { KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the account:\n%1").tqarg(task->statusString()), + i18n ("An error occured when trying to remove the account:\n%1").arg(task->statusString()), i18n ("Jabber Account Unregistration")); m_removing=false; return; diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 42089333..3688565a 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const { if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl; d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1); requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions()); @@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const else { // Remove all caps specifications - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl; d->jidCapabilitiesMap.remove( jid.full() ); } @@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished() DiscoItem item = discoInfo->item(); Jid jid = discoInfo->jid(); - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished() TQPair jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() ); } else @@ -497,7 +497,7 @@ void JabberCapabilitiesManager::discoRequestFinished() } } else - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").arg(jidCapabilities.node()).arg(node) << endl; //for (unsigned int i = 0; i < item.features().list().count(); i++) // printf(" Feature: %s\n",item.features().list()[i].latin1()); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 532cfd22..c18c9071 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -118,7 +118,7 @@ void JabberChatSession::slotUpdateDisplayName () jid.setResource ( mResource ); TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") - .tqarg( chatMembers.first()->onlineStatus().description() ); + .arg( chatMembers.first()->onlineStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); else diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index f7b1741f..58ca2409 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -263,11 +263,11 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) { TQString room=message.invite(); TQString originalBody=message.body().isEmpty() ? TQString() : - i18n( "The original message is : \" %1 \"
" ).tqarg(TQStyleSheet::escape(message.body())); + i18n( "The original message is : \" %1 \"
" ).arg(TQStyleSheet::escape(message.body())); TQString mes=i18n("%1 invited you to join the conference %2
%3
" "If you want to accept and join, just enter your nickname and press ok
" "If you want to decline, press cancel") - .tqarg(message.from().full(), room , originalBody); + .arg(message.from().full(), room , originalBody); bool ok=false; TQString futureNewNickName = KInputDialog::getText( i18n( "Invited to a conference - Jabber Plugin" ), @@ -299,7 +299,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) if(mManager->view( Kopete::Contact::CannotCreate )) { //show an internal message if the user has not already closed his window Kopete::Message m=Kopete::Message ( this, mManager->members(), - i18n("%1 has ended their participation in the chat session.").tqarg(metaContact()->displayName()), + i18n("%1 has ended their participation in the chat session.").arg(metaContact()->displayName()), Kopete::Message::Internal ); m.setImportance(Kopete::Message::Low); mManager->view()->appendMessage ( m ); //use KopeteView::AppendMessage to bypass notifications diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index f536a1c9..e098fdad 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -145,7 +145,7 @@ void JabberGroupChatManager::inviteContact( const TQString & contactId ) jabberMessage.setFrom ( account()->client()->jid() ); jabberMessage.setTo ( contactId ); jabberMessage.setInvite( mRoomJid.userHost() ); - jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) ); + jabberMessage.setBody( i18n("You have been invited to %1").arg( mRoomJid.userHost() ) ); // send the message account()->client()->sendMessage ( jabberMessage ); diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 717d36be..1fa6d884 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -354,7 +354,7 @@ void JabberGroupContact::slotChangeNick( ) bool ok; TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ), - i18n( "Please enter the new nick name you want to have on the room %1" ).tqarg(rosterItem().jid().userHost()), + i18n( "Please enter the new nick name you want to have on the room %1" ).arg(rosterItem().jid().userHost()), mNick, &ok ); if ( !ok || !account()->isConnected()) return; diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index abec26bc..26d16b28 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -127,7 +127,7 @@ KActionMenu *JabberTransport::actionMenu () TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) ); TQPtrList *customActions = myself()->customContextMenuActions( ); @@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( ) /* if ( ! task->success ()) KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()), + i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()), i18n ("Jabber Service Unregistration")); */ //we don't really care, we remove everithing anyway. diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 4208e0d8..f6911a3b 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) qDebug("JingleClientSlots: Call destroyed"); Jid jid(call->sessions()[0]->remote_address().c_str()); if (voiceCaller_->calling(jid)) { - qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full())); + qDebug(TQString("Removing unterminated call to %1").arg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling() void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) { - qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state)); + qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); // Why is c_str() stuff needed to make it compile on OS X ? Jid jid(session->remote_address().c_str()); @@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess } else if (state == cricket::Session::STATE_SENTMODIFY) { } else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); + qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) { } else if (state == cricket::Session::STATE_RECEIVEDREJECT) { @@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize() return; TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); - qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid)); + qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); if (jid.isEmpty()) { qWarning("jinglevoicecaller.cpp: Empty JID"); return; @@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid) void JingleVoiceCaller::call(const Jid& jid) { - qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full())); + qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall(); c->InitiateSession(buzz::Jid(jid.full().ascii())); phone_client_->SetFocus(c); @@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j) void JingleVoiceCaller::terminate(const Jid& j) { - qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full())); + qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) void JingleVoiceCaller::removeCall(const Jid& j) { - qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full())); + qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); calls_.remove(j.full()); } @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) // Spread the word if (ok) { - qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza)); + qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index c5bc775d..daa0d7c0 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); + //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index 446d1d41..86fc606f 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -44,7 +44,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); - setCaption( i18n("Voice session with %1").tqarg(contactJid) ); + setCaption( i18n("Voice session with %1").arg(contactJid) ); connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index 6d85cb0d..a5a94941 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -194,12 +194,12 @@ int Task::Process(int state) { void Task::AddChild(Task * child) { - tqchildren_.insert(child); + children_.insert(child); } bool Task::AllChildrenDone() { - for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) { + for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) { if (!(*it)->IsDone()) return false; } @@ -213,8 +213,8 @@ Task::AnyChildError() { void Task::AbortAllChildren() { - if (tqchildren_.size() > 0) { - ChildSet copy = tqchildren_; + if (children_.size() > 0) { + ChildSet copy = children_; for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) { (*it)->Abort(true); // Note we do not wake } @@ -231,7 +231,7 @@ void Task::OnChildStopped(Task * child) { if (child->HasError()) child_error_ = true; - tqchildren_.erase(child); + children_.erase(child); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index 7140b691..5a486198 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,13 +61,13 @@ // might be working on something as you send it infomration, you may want // to have a queue in the task. // -// (3) Finally it helps manage parent tasks and tqchildren. If a parent -// task gets aborted, all the tqchildren tasks are too. The nice thing +// (3) Finally it helps manage parent tasks and children. If a parent +// task gets aborted, all the children tasks are too. The nice thing // about this, for example, is if you have one parent task that // represents, say, and Xmpp connection, then you can spawn a whole bunch // of infinite lifetime child tasks and now worry about cleaning them up. // When the parent task goes to STATE_DONE, the task engine will make -// sure all those tqchildren are aborted and get deleted. +// sure all those children are aborted and get deleted. // // Notice that Task has a few built-in states, e.g., // @@ -122,7 +122,7 @@ public: // Called from outside to stop task without any more callbacks void Abort(bool nowake = false); - // For managing tqchildren + // For managing children bool AllChildrenDone(); bool AnyChildError(); @@ -153,7 +153,7 @@ protected: virtual int ProcessStart() = 0; virtual int ProcessResponse() { return STATE_DONE; } - // for managing tqchildren (if any) + // for managing children (if any) void AddChild(Task * child); void AbortAllChildren(); @@ -172,9 +172,9 @@ private: bool child_error_; unsigned long long start_time_; - // for managing tqchildren + // for managing children typedef std::set ChildSet; - ChildSet tqchildren_; + ChildSet children_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc index 43728eb7..b5ecc55e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc @@ -33,7 +33,7 @@ namespace buzz { TaskRunner::~TaskRunner() { - // this kills and deletes tqchildren silently! + // this kills and deletes children silently! AbortAllChildren(); RunTasks(); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc index a021f67a..08ccd288 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc @@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) : } pLastAttr_ = newAttr; - // copy tqchildren + // copy children XmlChild * pChild; XmlChild ** ppLast = &pFirstChild_; XmlChild * newChild = NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc index 8e36ac02..e0d2c006 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc @@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { i += 2; } - // now the tqchildren + // now the children const XmlChild * pchild = element->FirstChild(); if (pchild == NULL) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index 7987856e..cdcfa9e7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -223,7 +223,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, error_element.AddAttr(name, attribute->Value()); } - // copy tqchildren + // copy children for (const XmlChild * child = element_original->FirstChild(); child; child = child->NextChild()) { diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch index 2a6a4806..058825db 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -34,7 +34,7 @@ Index: iris/xmpp-im/client.cpp + ++it; + } + -+ debug(QString("Client: Joined: [%1]\n").tqarg(jid.full())); ++ debug(QString("Client: Joined: [%1]\n").arg(jid.full())); + GroupChat i; + i.j = jid; + i.status = GroupChat::Connecting; @@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + if(!s.status().isEmpty()) + tag.appendChild(textTag(doc(), "status", s.status())); + -+ tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) ); ++ tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) ); + + if(!s.keyID().isEmpty()) { + QDomElement x = textTag(doc(), "x", s.keyID()); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 89c98a91..f96fd795 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) e.setAttribute("mechanism", sasl_mech); if(!sasl_step.isEmpty()) { #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); #endif e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step))); } @@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) else { TQByteArray stepData = sasl_step; #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); #endif TQDomElement e = doc.createElementNS(NS_SASL, "response"); if(!stepData.isEmpty()) @@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) #ifdef XMPP_TEST TQString s = "SASL mechs:"; for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it) - s += TQString(" [%1]").tqarg((*it)); + s += TQString(" [%1]").arg((*it)); TD::msg(s); #endif } @@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) if(e.tagName() == "challenge") { TQByteArray a = Base64::stringToArray(e.text()); #ifdef XMPP_TEST - TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a))); + TD::msg(TQString("SASL IN: [%1]").arg(printArray(a))); #endif sasl_step = a; need = NSASLNext; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index 0e324cb1..51041c1d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -1358,9 +1358,9 @@ void ClientStream::processNext() #endif #ifdef XMPP_TEST - TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang); + TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang); if(!d->client.from.isEmpty()) - s += TQString(", from=[%1]").tqarg(d->client.from); + s += TQString(", from=[%1]").arg(d->client.from); s += ')'; TD::msg(s); #endif diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index d1650842..93748aa8 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e) i.setAttributeNodeNS(a); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 69737a24..b7d5e00c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -303,7 +303,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -332,7 +332,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -378,7 +378,7 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) continue; i.status = GroupChat::Closing; - debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); Status s; @@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -514,7 +514,7 @@ void Client::streamReadyRead() Stanza s = d->stream->read(); TQString out = s.toString(); - debug(TQString("Client: incoming: [\n%1]\n").tqarg(out)); + debug(TQString("Client: incoming: [\n%1]\n").arg(out)); xmlIncoming(out); TQDomElement x = oldStyleNS(s.element()); @@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(a.cloneNode().toAttr()); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x) //x.save(ts, 0); //TQString out = Stream::xmlToString(x); - //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); + //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); //xmlOutgoing(out); TQDomElement e = addCorrectNS(x); @@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x) } TQString out = s.toString(); - debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); + debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); @@ -654,7 +654,7 @@ void Client::send(const TQString &str) if(!d->stream) return; - debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); xmlOutgoing(str); static_cast(d->stream)->writeDirect(str); } @@ -716,9 +716,9 @@ void Client::ppSubscription(const Jid &j, const TQString &s) void Client::ppPresence(const Jid &j, const Status &s) { if(s.isAvailable()) - debug(TQString("Client: %1 is available.\n").tqarg(j.full())); + debug(TQString("Client: %1 is available.\n").arg(j.full())); else - debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; @@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const Status &s) if(i.j.compare(j, false)) { bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false; - debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us)); + debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -797,7 +797,7 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); (*rit).setStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); @@ -809,12 +809,12 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); } resourceAvailable(j, r); @@ -830,7 +830,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!s.isAvailable()) { if(found) { (*rit).setStatus(s); - debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); i->setLastUnavailableStatus(s); @@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } resourceAvailable(j, r); @@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(TQString("Client: Message from %1\n").tqarg(m.from().full())); + debug(TQString("Client: Message from %1\n").arg(m.from().full())); if(m.type() == "groupchat") { for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...) void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 5700c343..f33e428f 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -295,7 +295,7 @@ Stanza::Error Message::error() const return d->error; } -//! \brief Set tqreceivers information +//! \brief Set receivers information //! //! \param to - Receivers Jabber id void Message::setTo(const Jid &j) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index c6e05909..edc8762e 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -504,7 +504,7 @@ void JT_Presence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(al.item(x).cloneNode().toAttr()); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -1343,7 +1343,7 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); // query.appendChild(textTag("tz", str)); - // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str))); + // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str))); // send(iq); // return TRUE; //} @@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 43b063e4..ee258105 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -40,7 +40,7 @@ &Jabber ID: - + AlignTop @@ -73,7 +73,7 @@ <i>(for example: joe@jabber.org)</i> - + WordBreak|AlignVCenter|AlignRight diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index a1d61833..66cfcfc5 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -47,7 +47,7 @@ Please wait while retrieving search form... - + WordBreak|AlignVCenter diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index c1469a8d..bed6e8d4 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -71,7 +71,7 @@ Please enter your current password first and then your new password twice. - + AlignCenter diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 71f44d17..71400791 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -162,7 +162,7 @@ To connect to the Jabber network, you will need an account on a Jabber server. If you do not yet have an account, please click the button to create one. - + WordBreak|AlignVCenter @@ -227,7 +227,7 @@ If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password. - + WordBreak|AlignVCenter @@ -517,7 +517,7 @@ P&riority: - + AlignVCenter @@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co <li>Changes to these fields will only take effect the next time you start Kopete.</li> <li>The "Proxy JID" can be configured per account.</li></ul></i> - + WordBreak|AlignVCenter diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 4f1f7502..e34c208b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -266,7 +266,7 @@ - + WordBreak|AlignVCenter @@ -294,7 +294,7 @@ - + AlignCenter diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 29b2b617..1bd1310c 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished () if (!task->success ()) { TQString error = task->statusString(); - KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 58c70f68..8f795724 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList() for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) { TQString name = TQString("%1 (0x%2)") - .tqarg(TQString(id->name)) - .tqarg(id->id, 0, 16); + .arg(TQString(id->name)) + .arg(id->id, 0, 16); mClientID->insertItem(name, i); diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index b4aff75d..bdfea37f 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -84,7 +84,7 @@ <i>(for example: johndoe)</i> - + AlignVCenter|AlignRight diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index e9fed90a..c415b062 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -298,7 +298,7 @@ . - + AlignCenter diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 34aa7425..f81ef8cc 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -140,14 +140,14 @@ void Dispatcher::sendFile(const TQString& path, TQ_INT64 fileSize, const TQStrin // Write the file name in utf-16 to the stream. TQTextStream ts(header, IO_WriteOnly); ts.setEncoding(TQTextStream::RawUnicode); - ts.tqdevice()->tqat(20); + ts.device()->at(20); ts << path.section('/', -1); // NOTE Background Sharing base64 [540..569] // TODO add support for background sharing. // Write file exchange type to the stream. // NOTE File - 0xFFFFFFFF // NOTE Background Sharing - 0xFFFFFFFE - writer.tqdevice()->tqat(570); + writer.device()->at(570); writer << (TQ_UINT32)0xFFFFFFFF; // Encode the file context header to base64 encoding. @@ -250,7 +250,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream if(m_messageBuffer.contains(receivedMessage.header.identifier)) { kdDebug(14140) << k_funcinfo - << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier) + << TQString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier) << endl; // The message was split, try to reconstruct the message @@ -347,7 +347,7 @@ void Dispatcher::dispatch(const P2P::Message& message) // The entire message has not been received; // buffer the recevied portion of the original message. kdDebug(14140) << k_funcinfo - << TQString("Buffering messsage, %1").tqarg(message.header.identifier) + << TQString("Buffering messsage, %1").arg(message.header.identifier) << endl; m_messageBuffer.insert(message.header.identifier, message); return; @@ -427,7 +427,7 @@ void Dispatcher::dispatch(const P2P::Message& message) current->m_ackSessionIdentifier = message.header.identifier; current->m_ackUniqueIdentifier = message.header.ackSessionIdentifier; // Send a 200 OK message to the recipient. - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); current->sendMessage(OK, content); } else if(applicationId == 2) @@ -457,7 +457,7 @@ void Dispatcher::dispatch(const P2P::Message& message) reader.setByteOrder(TQDataStream::LittleEndian); //Retrieve the file info from the context field. // File Size [8..15] Int64 - reader.tqdevice()->tqat(8); + reader.device()->at(8); TQ_INT64 fileSize; reader >> fileSize; // Flag [15..18] Int32 @@ -478,7 +478,7 @@ void Dispatcher::dispatch(const P2P::Message& message) emit incomingTransfer(from, fileName, fileSize); kdDebug(14140) << - TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize)) + TQString("%1, %2 bytes.").arg(fileName, TQString::number(fileSize)) << endl << endl; diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index b7b90296..dd616a1b 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -68,7 +68,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); m_transfer = transfer; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); sendMessage(OK, content); TQObject::disconnect(Kopete::TransferManager::transferManager(), 0l, this, 0l); @@ -80,7 +80,7 @@ void IncomingTransfer::slotTransferRefused(const Kopete::FileTransferInfo& info) if(sessionId!=m_sessionId) return; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); // Send the sending client a cancelation message. sendMessage(DECLINE, content); m_state=Finished; @@ -141,7 +141,7 @@ void IncomingTransfer::processMessage(const Message& message) { // UserDisplayIcon data or File data is in this message. // Write the recieved data to the file. - kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(message.header.dataSize) << endl; + kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").arg(message.header.dataSize) << endl; m_file->writeBlock(message.body.data(), message.header.dataSize); if(m_transfer){ @@ -254,9 +254,9 @@ void IncomingTransfer::processMessage(const Message& message) content = "Bridge: TCPv1\r\n" "Listening: true\r\n" + - TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) + - TQString("IPv4Internal-Addrs: %1\r\n").tqarg(m_listener->localAddress().nodeName()) + - TQString("IPv4Internal-Port: %1\r\n").tqarg(m_listener->localAddress().serviceName()) + + TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) + + TQString("IPv4Internal-Addrs: %1\r\n").arg(m_listener->localAddress().nodeName()) + + TQString("IPv4Internal-Port: %1\r\n").arg(m_listener->localAddress().serviceName()) + "\r\n"; } else diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp index 40bd8877..0ca71789 100644 --- a/kopete/protocols/msn/messageformatter.cpp +++ b/kopete/protocols/msn/messageformatter.cpp @@ -75,7 +75,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact) reader.setByteOrder(TQDataStream::LittleEndian); // Seek to the start position of the message // transport header. - reader.tqdevice()->tqat(index); + reader.device()->at(index); // Read the message transport headers from the stream. reader >> inbound.header.sessionId; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 760f7cba..6c4aa9cc 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist - TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); manager->appendMessage( tmpMsg ); } diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 3fcecc47..6709f0f1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -408,7 +408,7 @@ void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack) if ( !ack ) { Kopete::Message m = m_messagesSent[ id ]; - TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( m.plainBody() ); + TQString body = i18n( "The following message has not been sent correctly:\n%1" ).arg( m.plainBody() ); Kopete::Message msg = Kopete::Message( m.to().first(), members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( msg ); //stop the stupid animation @@ -467,7 +467,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) TQString body = i18n( "%1 has sent an unimplemented invitation, the invitation was rejected.\n" "The invitation was: %2" ) - .tqarg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName ); + .arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName ); Kopete::Message tmpMsg = Kopete::Message( c , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage(tmpMsg); @@ -621,7 +621,7 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if ( notifyNewChat ) { // this internal message should open the window if they not exist - TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( tmpMsg ); } @@ -715,14 +715,14 @@ void MSNChatSession::cleanMessageQueue( const TQString & reason ) else m=m_messagesSent.begin().data(); - TQString body=i18n("The following message has not been sent correctly (%1): \n%2").tqarg(reason, m.plainBody()); + TQString body=i18n("The following message has not been sent correctly (%1): \n%2").arg(reason, m.plainBody()); Kopete::Message msg = Kopete::Message(m.to().first() , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage(msg); } else { Kopete::Message m; - TQString body=i18n("These messages have not been sent correctly (%1):
    ").tqarg(reason); + TQString body=i18n("These messages have not been sent correctly (%1):
      ").arg(reason); for ( TQMap::iterator it = m_messagesSent.begin(); it!=m_messagesSent.end(); it = m_messagesSent.begin() ) { m=it.data(); diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 0b38f2c3..700bf213 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status) protocol() , status.internalStatus()+15 , status.overlayIcons() + TQStringList("msn_blocked") , - i18n("%1|Blocked").tqarg( status.description() ) ) ); + i18n("%1|Blocked").arg( status.description() ) ) ); } else if(!isBlocked() && status.internalStatus() >= 15) { //the user is not blocked, but the status is blocked diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 89714326..b9dbb921 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) case 205: case 208: { - msg = i18n( "The MSN user '%1' does not exist.
      Please check the MSN ID.      " ).tqarg( handle ); + msg = i18n( "The MSN user '%1' does not exist.
      Please check the MSN ID.      " ).arg( handle ); type = MSNSocket::ErrorServerError; break; } @@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) "MSN Error: %1
      " "please send us a detailed bug report " "at kopete-devel@kde.org containing the raw debug output on the " - "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code); + "console (in gzipped format, as it is probably a lot of output.)" ).arg(code); type = MSNSocket::ErrorServerError; break; } @@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) msg = i18n( "The user '%1' already exists in this group on the MSN server;
      " "if Kopete does not show the user, please send us a detailed bug report " "at kopete-devel@kde.org containing the raw debug output on the " - "console (in gzipped format, as it is probably a lot of output.)      " ).tqarg(handle); + "console (in gzipped format, as it is probably a lot of output.)" ).arg(handle); type = MSNSocket::ErrorInformation; break; } @@ -180,7 +180,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) } case 219: { - msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle); + msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).arg(handle); type = MSNSocket::ErrorServerError; break; } @@ -775,7 +775,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) mailCount++; //TODO: it is also possible to get the subject (but warning about the encoding) - TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m), + TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m), 0 , 0 , i18n( "Open Inbox..." ) ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } @@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement ) currentMedia = format; for(uint i=0; ipeerResolver().nodeName() ); + errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() ); else errormsg += m_socket->KSocketBase::errorString() ; @@ -594,7 +594,7 @@ void MSNSocket::handleError( uint code, uint /* id */ ) default: // FIXME: if the error causes a disconnect, it will crash, but we can't disconnect every time msg = i18n( "Unhandled MSN error code %1 \n" - "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code ); + "Please fill a bug report with a detailed description and if possible the last console debug output." ).arg( code ); // "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes." break; } diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index b5519ed8..7d678760 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 215: { - msg = i18n( "The user %1 is already in this chat." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle ); type = MSNSocket::ErrorServerError; //userLeftChat(m_msgHandle , i18n("user was twice in this chat") ); //(the user shouln't join there @@ -136,7 +136,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 216: { - msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).arg( m_msgHandle ); type = MSNSocket::ErrorInformation; userLeftChat(m_msgHandle, i18n("user blocked you")); @@ -145,7 +145,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) case 217: { // TODO: we need to know the nickname instead of the handle. - msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).arg( m_msgHandle ); type = MSNSocket::ErrorServerError; userLeftChat(m_msgHandle, i18n("user disconnected")); @@ -153,7 +153,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 713: { - TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle ); + TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).arg( m_msgHandle ); type = MSNSocket::ErrorInformation; userLeftChat(m_msgHandle, i18n("user blocked you")); @@ -768,7 +768,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size)); if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ , - i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) , + i18n("The message you are trying to send is too long; it will be split into %1 messages.").arg(nb) , i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" ) == KMessageBox::Continue ) { @@ -920,7 +920,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin } else if(msnObj == "inkformatgif") { - TQString msg=i18n("\"Typewrited" ).tqarg( file->name() ); + TQString msg=i18n("\"Typewrited" ).arg( file->name() ); kdDebug(14140) << k_funcinfo << file->name() <<]*>)").tqarg(TQRegExp::escape(es))), + message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))), TQString::fromLatin1("size()) { @@ -254,11 +254,11 @@ void OutgoingTransfer::processMessage(const Message& message) // Send the direct connection invitation message. TQString content = "Bridges: TRUDPv1 TCPv1\r\n" + - TQString("NetID: %1\r\n").tqarg("-123657987") + - TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") + + TQString("NetID: %1\r\n").arg("-123657987") + + TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") + "UPnPNat: false\r\n" "ICF: false\r\n" + - TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) + + TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) + "\r\n"; sendMessage(INVITE, content); } diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index da0b856e..57b1f356 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -213,7 +213,7 @@ void TcpTransportBridge::slotOnDisconnect() void TcpTransportBridge::slotOnError(int errorCode) { kdDebug(14140) << k_funcinfo << "Bridge (" << name() << ") ERROR occurred on {" << mSocket->localAddress().toString() << " <-> " << mSocket->peerAddress().toString() << "} - " << mSocket->errorString() << endl; - emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(mSocket->errorString())); + emit bridgeError(TQString("Bridge ERROR %1: %2").arg(errorCode).arg(mSocket->errorString())); if (mConnected){ mSocket->disconnect(); mConnected = false; diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index cee5897d..3bf74195 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -37,7 +37,7 @@ &MSN Passport ID: - + AlignTop @@ -70,7 +70,7 @@ <i>(for example: joe@hotmail.com)</i> - + AlignVCenter|AlignRight diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index b511de42..9c453e7c 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -101,7 +101,7 @@ To connect to the Microsoft network, you will need a Microsoft Passport.<br><br>If you do not currently have a Passport, please click the button to create one. - + WordBreak|AlignVCenter @@ -229,7 +229,7 @@ <qt><b>Note:</b> These settings are applicable to all MSN accounts - + WordBreak|AlignCenter @@ -482,7 +482,7 @@ Only works for emoticons in the PNG format. There are also privacy options in the "Contacts" tab - + WordBreak|AlignCenter @@ -673,7 +673,7 @@ Only works for emoticons in the PNG format. Please select a square image. The image will be scaled to 96x96. - + WordBreak|AlignVCenter @@ -836,7 +836,7 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page. - + WordBreak|AlignVCenter @@ -1086,7 +1086,7 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page - + WordBreak|AlignVCenter @@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work. - + AlignCenter diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index a91d3460..88fe7d33 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -87,12 +87,12 @@ void Webcam::askIncommingInvitation() TQString message= (m_who==wProducer) ? i18n("The contact %1 wants to see your webcam, do you want them to see it?") : i18n("The contact %1 wants to show you his/her webcam, do you want to see it?") ; - int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient), + int result=KMessageBox::questionYesNo( 0L , message.arg(m_recipient), i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline")); if(!_this) return; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(m_sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId); if(result==KMessageBox::Yes) { //Send two message, an OK, and an invite. @@ -305,7 +305,7 @@ void Webcam::processMessage(const Message& message) { uint sess=rand()%1000+5000; uint rid=rand()%100+50; - m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(sess); + m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid).arg(sess); kdDebug(14140) << k_funcinfo << "m_myAuth= " << m_myAuth << endl; TQString producerxml=xml(sess , rid); kdDebug(14140) << k_funcinfo << "producerxml= " << producerxml << endl; @@ -324,12 +324,12 @@ void Webcam::processMessage(const Message& message) TQString viewerxml=xml(sess.toUInt() , rid.toUInt()); kdDebug(14140) << k_funcinfo << "vewerxml= " << viewerxml << endl; makeSIPMessage( viewerxml ,0x00,0x09,0x00 ); - m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); + m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess); kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl; } else { - m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); + m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess); makeSIPMessage("receivedViewerData", 0xec , 0xda , 0x03); } @@ -346,7 +346,7 @@ void Webcam::processMessage(const Message& message) TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int))); // Listen for incoming connections. bool isListening = m_listener->listen(); - kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; + kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; rx=TQRegExp("([^<]*)"); rx.search(m_content); @@ -370,9 +370,9 @@ void Webcam::processMessage(const Message& message) while(true) { an++; - if(!m_content.contains( TQString("").tqarg(an) )) + if(!m_content.contains( TQString("").arg(an) )) break; - rx=TQRegExp(TQString("([^<]*)").tqarg(an).tqarg(an)); + rx=TQRegExp(TQString("([^<]*)").arg(an).arg(an)); rx.search(m_content); TQString ip=rx.cap(1); if(ip.isNull()) @@ -503,7 +503,7 @@ TQString Webcam::xml(uint session , uint rid) TQStringList ips=m_dispatcher->localIp(); for ( it = ips.begin(); it != ips.end(); ++it ) { - ip+=TQString("%2").tqarg(ip_number).tqarg(*it).tqarg(ip_number); + ip+=TQString("%2").arg(ip_number).arg(*it).arg(ip_number); ++ip_number; } diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index d5ed4865..39b7049b 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -28,7 +28,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name ) - : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ), + : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contact ), KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ), m_imageContainer( this ) { @@ -72,7 +72,7 @@ void MSNWebcamDialog::webcamClosed( int reason ) { kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " << reason < //font-weight:600 -> (anything > 400 should be , 400 is not bold) @@ -306,7 +306,7 @@ KActionMenu* AIMAccount::actionMenu() TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); + i18n( "%2 <%1>" ).arg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index ed380b15..5791c58d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -351,11 +351,11 @@ void AIMContact::warnUser() "(Warning a user on AIM will result in a \"Warning Level\"" \ " increasing for the user you warn. Once this level has reached a" \ " certain point, they will not be able to sign on. Please do not abuse" \ - " this function, it is meant for legitimate practices.)" ).tqarg( nick ); + " this function, it is meant for legitimate practices.)" ).arg( nick ); int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message, - i18n( "Warn User %1?" ).tqarg( nick ), + i18n( "Warn User %1?" ).arg( nick ), i18n( "Warn Anonymously" ), i18n( "Warn" ) ); if ( result == KMessageBox::Yes ) @@ -383,7 +383,7 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) return; //okay, now we need to change the message.escapedBody from real HTML to aimhtml. //looking right now for docs on that "format". - //looks like everything except for tqalignment codes comes in the format of spans + //looks like everything except for alignment codes comes in the format of spans //font-style:italic -> //font-weight:600 -> (anything > 400 should be , 400 is not bold) diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 2e412491..0b70ac89 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -189,7 +189,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const } if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add '%1' to your contact list?").tqarg(command), + i18n("Do you want to add '%1' to your contact list?").arg(command), TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { @@ -212,7 +212,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const else KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n( "Unable to connect to the chat room %1 because the account" - " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ), + " for %2 is not connected." ).arg( firstParam ).arg( aimAccount->accountId() ), TQString() ); } diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 2ed71d94..c1eef1ab 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -39,7 +39,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, TQWidget *parent, const char* name ) : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) - .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), + .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl; @@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").tqarg(newNick)); + setCaption(i18n("User Information on %1").arg(newNick)); } } @@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").tqarg(newNick)); + setCaption(i18n("User Information on %1").arg(newNick)); } mAccount->setUserProfile(userInfoEdit->text()); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 4d9352ee..87450fc8 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -40,7 +40,7 @@ - + AlignCenter @@ -174,7 +174,7 @@ To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an AIM screen name, please click the button to create one. - + WordBreak|AlignVCenter diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 7de495f2..125c711b 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -173,7 +173,7 @@ Away message: - + AlignTop diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 9d996724..f2a9bce9 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -250,7 +250,7 @@ void ICQAccount::slotSetVisiblility() if ( oc ) { //for better orientation in lists use nickName and icq number TQString screenName( "%1 (%2)" ); - screenName = screenName.tqarg( oc->nickName(), contactId); + screenName = screenName.arg( oc->nickName(), contactId); contactMap.insert( screenName, contactId ); revContactMap.insert( contactId, screenName ); } diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index d5f1245c..e4943c37 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -117,7 +117,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de if ( Oscar::normalize( contact ) != Oscar::normalize( contactId() ) ) return; - // tqinvalidate old away message if user was offline + // invalidate old away message if user was offline if ( !isOnline() ) removeProperty( mProtocol->awayMessage ); @@ -276,8 +276,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas if( granted ) { message = i18n( "User %1 has granted your authorization request.\nReason: %2" ) - .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .tqarg( reason ); + .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .arg( reason ); // remove the unknown status setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() ); @@ -285,8 +285,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas else { message = i18n( "User %1 has rejected the authorization request.\nReason: %2" ) - .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .tqarg( reason ); + .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .arg( reason ); } KNotifyClient::event( Kopete::UI::Global::sysTrayWId(), "icq_authorization", message ); } @@ -539,7 +539,7 @@ void ICQContact::slotContactChanged(const UserInfo &u) if (!mInfo.clientVersion.isEmpty()) { capList << i18n("Translators: client-name client-version", - "%1 %2").tqarg(mInfo.clientName, mInfo.clientVersion); + "%1 %2").arg(mInfo.clientName, mInfo.clientVersion); } else { diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index 9e85c1ad..cf86118f 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -141,11 +141,11 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c } TQString nickuin = nick.isEmpty() ? - i18n("'%1'").tqarg(uin) : - i18n("'%1' (%2)").tqarg(nick, uin); + i18n("'%1'").arg(uin) : + i18n("'%1' (%2)").arg(nick, uin); if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add %1 to your contact list?").tqarg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add")) + i18n("Do you want to add %1 to your contact list?").arg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { kdDebug(14153) << k_funcinfo << "Cancelled" << endl; diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index abbc8eb2..772650fb 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -37,7 +37,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) mAccount = static_cast(c->account()); mContact = c; - setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").arg(c->displayName()).arg(c->onlineStatus().description())); TQVBox *mMainWidget = makeVBoxMainWidget(); @@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage() mAccount->engine()->requestAwayMessage(mContact); - setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); + setCaption(i18n("Fetching '%2' Message for %1...").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); } // END slotFetchAwayMessage() void ICQReadAway::slotAwayMessageChanged() { - setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); awayMessageBrowser->setText(mContact->awayMessage()); awayMessageBrowser->setDisabled(false); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index 59b6ce82..9041a131 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -50,9 +50,9 @@ void ICQAuthReplyDialog::setUser( const TQString & user ) { if ( m_wasRequested ) m_ui->lblUserReq->setText( - i18n( "%1 requested authorization to add you to his/her contact list." ).tqarg( user ) ); + i18n( "%1 requested authorization to add you to his/her contact list." ).arg( user ) ); else - m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).tqarg( user ) ); + m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).arg( user ) ); } void ICQAuthReplyDialog::setRequestReason( const TQString & reason ) diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 541308e2..b60974e7 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -159,7 +159,7 @@ To connect to the ICQ network, you will need an ICQ account.<br><br> If you do not currently have an ICQ account, please click the button to create one. - + WordBreak|AlignVCenter @@ -411,7 +411,7 @@ If you do not currently have an ICQ account, please click the button to create o - + AlignCenter diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp index c778d382..48f68349 100644 --- a/kopete/protocols/oscar/liboscar/buffer.cpp +++ b/kopete/protocols/oscar/liboscar/buffer.cpp @@ -376,7 +376,7 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange, void Buffer::expandBuffer(unsigned int inc) { - mBuffer.tqresize(mBuffer.size()+inc, TQGArray::SpeedOptim); + mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim); } TQCString Buffer::getLNTS() @@ -477,7 +477,7 @@ TQString Buffer::toString() const if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 23136db4..3004af0c 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -262,7 +262,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t ) kdDebug(OSCAR_RAW_DEBUG) << "moderator" << endl; break; case 0x6D: - kdDebug(OSCAR_RAW_DEBUG) << "num tqchildren" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "num children" << endl; break; case 0x06F: kdDebug(OSCAR_RAW_DEBUG) << "occupancy" << endl; diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 638ed6c0..2a4d96f5 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -54,7 +54,7 @@ static TQString toString( const TQByteArray& buffer ) if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index e9048c21..67753b20 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -2078,7 +2078,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index 47d1bdf7..c43aeaea 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -515,7 +515,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index 9e637d45..d797031d 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -271,7 +271,7 @@ void Task::debug(const TQString &str) { //black hole Q_UNUSED( str ); - //client()->debug(TQString("%1: ").tqarg(className()) + str); + //client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp index 9c2202a6..7669a945 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp @@ -53,28 +53,28 @@ void SSITest::testIt() //try to find a group by name ssi = m_manager->findGroup("SecondGroup"); if ( ssi ) - qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( ssi->gid() ).latin1()); + qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1()); else qDebug( "Oops, group SecondGroup not found" ); //try to find a group by gid ssi = m_manager->findGroup( 3 ); if ( ssi ) - qDebug( TQString("Found group 3 with name=%1").tqarg( ssi->name() ).latin1() ); + qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() ); else qDebug( "Oops, group 3 not found" ); //try to find a contact by name ssi = m_manager->findContact("ThirdContact"); if ( ssi ) - qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( ssi->gid() ).latin1() ); + qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() ); else qDebug( "Oops, contact ThirdContact not found" ); //try to find a contact using the name and the group name ssi = m_manager->findContact("FourthContact","SecondGroup"); if ( ssi ) - qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() ); + qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() ); else qDebug( "Oops, contact FourthContact not found" ); @@ -89,13 +89,13 @@ void SSITest::testIt() TQValueList::iterator it; qDebug( "Contacts from group FirtsGroup:" ); for ( it = list.begin(); it != list.end(); ++it) - qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //the group list TQValueList list2 = m_manager->groupList(); qDebug( "Group list:" ); for ( it = list2.begin(); it != list2.end(); ++it) - qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //remove a group - this shouldn't report any debug line m_manager->removeGroup( "SecondGroup" ); diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp index 100bcf9d..9af57b30 100644 --- a/kopete/protocols/oscar/liboscar/transfer.cpp +++ b/kopete/protocols/oscar/liboscar/transfer.cpp @@ -90,7 +90,7 @@ TQString Transfer::toString() const if(c < 0x10) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index bc6ac70a..8a1b6c4e 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -126,7 +126,7 @@ TQString UserDetails::clientName() const { if ( !m_clientVersion.isEmpty() ) return i18n("Translators: client-name client-version", - "%1 %2").tqarg(m_clientName, m_clientVersion); + "%1 %2").arg(m_clientName, m_clientVersion); else return m_clientName; } diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index da6d534b..719e9122 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -727,7 +727,7 @@ void OscarAccount::userStoppedTyping( const TQString & contact ) void OscarAccount::slotSocketError( int errCode, const TQString& errString ) { Q_UNUSED( errCode ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), errString, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); @@ -744,7 +744,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) if ( s.family == 0 && s.subtype == 0 ) { message = getFLAPErrorMessage( code ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), message, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); switch ( code ) @@ -819,44 +819,44 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n( "You have logged in more than once with the same %1," \ " account %2 is now disconnected.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } else // error while logging in { reason = i18n( "Sign on failed because either your %1 or " \ "password are invalid. Please check your settings for account %2.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } break; case 0x0002: // Service temporarily unavailable case 0x0014: // Reservation map error reason = i18n("The %1 service is temporarily unavailable. Please try again later.") - .tqarg( acctType ); + .arg( acctType ); break; case 0x0004: // Incorrect nick or password, re-enter case 0x0005: // Mismatch nick or password, re-enter reason = i18n("Could not sign on to %1 with account %2 because the " \ - "password was incorrect.").tqarg( acctType ).tqarg( accountId() ); + "password was incorrect.").arg( acctType ).arg( accountId() ); break; case 0x0007: // non-existant ICQ# case 0x0008: // non-existant ICQ# reason = i18n("Could not sign on to %1 with nonexistent account %2.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0009: // Expired account reason = i18n("Sign on to %1 failed because your account %2 expired.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0011: // Suspended account reason = i18n("Sign on to %1 failed because your account %2 is " \ - "currently suspended.").tqarg( acctType ).tqarg( accountId() ); + "currently suspended.").arg( acctType ).arg( accountId() ); break; case 0x0015: // too many clients from same IP case 0x0016: // too many clients from same IP case 0x0017: // too many clients from same IP (reservation) reason = i18n("Could not sign on to %1 as there are too many clients" \ - " from the same computer.").tqarg( acctType ); + " from the same computer.").arg( acctType ); break; case 0x0018: // rate exceeded (turboing) if ( isConnected() ) @@ -866,7 +866,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); } else { @@ -875,7 +875,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType) ; + .arg( accountId() ).arg( acctType) ; } break; case 0x001C: @@ -883,7 +883,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) if ( !d->versionAlreadyUpdated ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); d->versionAlreadyUpdated = true; } @@ -891,19 +891,19 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n("The %1 server thinks the client you are using is " \ "too old. Please report this as a bug at http://bugs.kde.org") - .tqarg( acctType ); + .arg( acctType ); } break; case 0x0022: // Account suspended because of your age (age < 13) reason = i18n("Account %1 was disabled on the %2 server because " \ "of your age (less than 13).") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); break; default: if ( !isConnected() ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); } break; } diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 936c61f3..c145b467 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -177,7 +177,7 @@ void OscarContact::userInfoUpdated( const TQString& contact, const UserDetails& if ( !m_details.clientName().isEmpty() ) { capList << i18n( "Translators: client name and version", - "%1").tqarg( m_details.clientName() ); + "%1").arg( m_details.clientName() ); } } diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index b3f497be..0ebbe7fa 100644 --- a/kopete/protocols/sms/serviceloader.cpp +++ b/kopete/protocols/sms/serviceloader.cpp @@ -43,7 +43,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac #endif else { - KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name), + KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").arg(name), i18n("Error Loading Service")); s = 0L; } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 1d4836a1..9e941132 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -308,7 +308,7 @@ void GSMLib::saveConfig() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device); + c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device); } } @@ -320,7 +320,7 @@ void GSMLib::loadConfig() TQString temp; KConfigGroup* c = m_account->configGroup(); - temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString()); + temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString()); if( temp != TQString() ) m_device = temp; } @@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e) const TQString& GSMLib::description() { TQString url = "http://www.pxh.de/fs/gsmlib/"; - m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").tqarg(url).tqarg(url); + m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 05712501..0871266c 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; KConfigGroup* c = m_account->configGroup(); - TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString()); + TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString()); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); + TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), TQString()); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString()); if (configDir.isNull()) configDir = "/etc/sms"; prefWidget->configDir->setURL(configDir); TQString programName; if (m_account) - programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), + programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) if (m_account) { - TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName")); + TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); for (int i=0; i < prefWidget->provider->count(); i++) { if (prefWidget->provider->text(i) == pName) @@ -136,9 +136,9 @@ void SMSClient::savePreferences() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), prefWidget->program->url()); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), prefWidget->configDir->url()); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), prefWidget->provider->currentText()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), prefWidget->provider->currentText()); } } @@ -147,7 +147,7 @@ TQStringList SMSClient::providers() TQStringList p; TQDir d; - d.setPath(TQString("%1/services/").tqarg(prefWidget->configDir->url())); + d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url())); p += d.entryList("*", TQDir::Files); return p; @@ -176,7 +176,7 @@ int SMSClient::maxSize() const TQString& SMSClient::description() { TQString url = "http://www.smsclient.org"; - m_description = i18n("SMSClient is a program for sending SMS with the modem. The program can be found on %1").tqarg(url).tqarg(url); + m_description = i18n("SMSClient is a program for sending SMS with the modem. The program can be found on %1").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 442d7f16..732fc119 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -181,7 +181,7 @@ void SMSSend::setOptions(const TQString& name) kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if(!prefWidget) return; // sanity check - prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name)); + prefWidget->providerLabel->setText(i18n("%1 Settings").arg(name)); labels.setAutoDelete(true); labels.clear(); @@ -237,7 +237,7 @@ int SMSSend::maxSize() const TQString& SMSSend::description() { TQString url = "http://zekiller.skytech.org/smssend_en.php"; - m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").tqarg(url).tqarg(url); + m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index ffd0897e..8feb94a9 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -49,7 +49,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p if (f.open(IO_ReadOnly)) { TQTextStream t(&f); - TQString group = TQString("SMSSend-%1").tqarg(provider); + TQString group = TQString("SMSSend-%1").arg(provider); bool exactNumberMatch = false; TQStringList numberWords; numberWords.append("Tel"); @@ -87,7 +87,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p descriptions.append(args[1]); if (m_account) - values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]), + values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]), TQString())); else values.append(""); @@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList& args) kdDebug( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; if (!m_account) return; // prevent crash in worst case - TQString group = TQString("SMSSend-%1").tqarg(provider); + TQString group = TQString("SMSSend-%1").arg(provider); int namesI=0; for (unsigned i=0; i < args.count(); i++) @@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList& args) // kdDebug(14160) << k_funcinfo << "saving " << args.at(i) << " to " << names[namesI] << endl; if (!args.at(i)->text().isEmpty()) { values[namesI] = args.at(i)->text(); - m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(names[namesI]), values[namesI]); + m_account->configGroup()->writeEntry(TQString("%1:%2").arg(group).arg(names[namesI]), values[namesI]); } namesI++; } @@ -239,9 +239,9 @@ void SMSSendProvider::send(const Kopete::Message& msg) KProcess* p = new KProcess; - kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; + kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; - *p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values; + *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 1788517d..10e09ae8 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -83,7 +83,7 @@ const bool SMSAccount::splitNowMsgTooLong(int msgLength) int max = theService->maxSize(); if(theLongMsgAction == ACT_CANCEL) return false; if(theLongMsgAction == ACT_SPLIT) return true; - if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").tqarg(max).tqarg(msgLength / max + 1), + if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").arg(max).arg(msgLength / max + 1), i18n("Message Too Long"), i18n("Divide"), i18n("Do Not Divide")) == KMessageBox::Yes) return true; else diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index f2d5e61b..cd28df83 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -187,7 +187,7 @@ To use SMS, you will need an account with a delivery service. - + WordBreak|AlignTop @@ -396,7 +396,7 @@ - + AlignCenter diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index 26e7fd4d..d678c4f0 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -117,7 +117,7 @@ To use the testbed protocol, just make up an account name. This protocol has no real networking capability. - + WordBreak|AlignTop @@ -150,7 +150,7 @@ - + AlignCenter diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index 9b98db7e..14e45dc3 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -28,7 +28,7 @@ #include TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ), +: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ), KDialogBase::Close, KDialogBase::Close, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 28f1336f..8efe247a 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -107,7 +107,7 @@ bool WinPopupLib::checkMessageDir() "If you have not configured anything yet (samba) please see\n" "Install Into Samba (Configure... -> Account -> Edit) information\n" "on how to do this.\n" - "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR), + "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR), TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); if (tmpYesNo == KMessageBox::Yes) { TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); @@ -126,7 +126,7 @@ bool WinPopupLib::checkMessageDir() "%1 are wrong!\n" "You will not receive messages if you say no.\n" "You can also correct it manually (chmod 0777 %1) and restart kopete.\n" - "Fix? (May need root password)").tqarg(WP_POPUP_DIR), + "Fix? (May need root password)").arg(WP_POPUP_DIR), TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index 91522218..5029190c 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -32,7 +32,7 @@ - + AlignCenter @@ -142,7 +142,7 @@ To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname. - + WordBreak|AlignTop @@ -163,7 +163,7 @@ However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add 'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section. - + WordBreak|AlignTop diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 004750ca..d7439628 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -160,7 +160,7 @@ KActionMenu* WPAccount::actionMenu() /// How to remove an action from Kopete::Account::actionMenu()? GF KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); - theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); + theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); if (mProtocol) { diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index c602b70e..162374b7 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -38,7 +38,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa { // kdDebug( 14170 ) << k_funcinfo << endl; - setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) ); + setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) ); m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" ); setMainWidget( m_mainWidget ); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index 30867e02..e5ca520d 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -711,7 +711,7 @@ void Client::leaveChat() void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level ) { kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") - .tqarg(info).tqarg(errorString).tqarg(level) << endl; + .arg(info).arg(errorString).arg(level) << endl; d->errorString = errorString; d->errorInformation = info; emit error( level ); diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp index 6ca9ae06..59d3b3fa 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp @@ -178,7 +178,7 @@ void ConferenceTask::addInvite( const TQString &room, const TQStringList &who, c TQString whoList = who.first(); for( int i = 1; i < who.size(); i++ ) - whoList += TQString(",%1").tqarg( who[i] ); + whoList += TQString(",%1").arg( who[i] ); t->setParam( 51, whoList.local8Bit() ); t->setParam( 57, room.local8Bit() ); diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 301b5083..f6b8a47e 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -212,7 +212,7 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) m_stage1Data= TQString(); /* construct a URL from the seed and request tokens */ TQByteArray encodedUrl; - TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed); + TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); KIO::Job* job = KIO::get(tokenUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -292,7 +292,7 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1"; kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl; m_stage2Data = TQString(); - TQString fullUrl = YahooLoginUrl.tqarg(token); + TQString fullUrl = YahooLoginUrl.arg(token); KURL loginUrl(fullUrl); KIO::Job* job = KIO::get(loginUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index 1a813a66..de6a1080 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t ) TQString subject = t->firstParam( 18 ); if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() ) - emit mailNotify( TQString::fromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); + emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() ); else emit mailNotify( TQString(), TQString(), count.toInt()); } diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 4da8517f..4dd00d90 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i) { m_socket->close(); client()->notifyError( i18n( "An error occurred while saving the address book entry." ), - TQString( "%1 - %2").tqarg(i).tqarg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); + TQString( "%1 - %2").arg(i).arg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() @@ -105,8 +105,8 @@ void ModifyYABTask::connectSucceeded() "Host: address.yahoo.com\r\n" "Content-length: %4\r\n" "Cache-Control: no-cache\r\n\r\n") - .tqarg(client()->yCookie()).tqarg(client()->tCookie()) - .tqarg(client()->cCookie()).tqarg(m_postData.utf8().size()); + .arg(client()->yCookie()).arg(client()->tCookie()) + .arg(client()->cCookie()).arg(m_postData.utf8().size()); TQByteArray buffer; TQByteArray paket; @@ -174,21 +174,21 @@ void ModifyYABTask::slotRead() case EditEntry: if( !e.attribute( "es" ).isEmpty() && e.attribute( "es" ) != "0" ) // Check for edit errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( e.attribute("ee") ) ); continue; } break; case AddEntry: if( !e.attribute( "as" ).isEmpty() && e.attribute( "as" ) != "0" ) // Check for add errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( e.attribute("ae") ) ); continue; } break; case DeleteEntry: if( !e.attribute( "ds" ).isEmpty() && e.attribute( "ds" ) != "0" ) // Check for delete errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) ); continue; } break; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 5910fbfe..ec2e9f5f 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -188,19 +188,19 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) send( t ); // The server expects a HTTP HEAD command prior to the GET m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false); + .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false); m_mimetypeJob->addMetaData("cookies", "manual"); m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") - .tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) ); + .arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) ); m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false ); + .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") - .tqarg(client()->tCookie()).tqarg(client()->yCookie()) ); + .arg(client()->tCookie()).arg(client()->yCookie()) ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 48d2af8c..04673c62 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -76,7 +76,7 @@ void SendPictureTask::connectFailed( int i) { kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast( sender() )->KSocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); setError(); } @@ -105,7 +105,7 @@ void SendPictureTask::connectSucceeded() else { kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << TQString(file.errorString()).ascii() << endl; - client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error ); + client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error ); return; } @@ -116,7 +116,7 @@ void SendPictureTask::connectSucceeded() "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: filetransfer.msg.yahoo.com\r\n" "Content-length: %4\r\n" - "Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size()); + "Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size()); stream.writeRawBytes( header.local8Bit(), header.length() ); stream.writeRawBytes( paket.data(), paket.size() ); stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index ac900a83..ddb249bd 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -46,7 +46,7 @@ bool StatusNotifierTask::take( Transfer* transfer ) else if( t->service() == Yahoo::ServiceAuthorization ) parseAuthorization( t ); else - parseStatus( t ); + parsetStatus( t ); return true; } @@ -77,7 +77,7 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const return false; } -void StatusNotifierTask::parseStatus( YMSGTransfer* t ) +void StatusNotifierTask::parsetStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -156,7 +156,7 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t ) TQString lname = t->firstParam( 254 ); TQString name; if( !fname.isEmpty() || !lname.isEmpty() ) - name = TQString("%1 %2").tqarg(fname).tqarg(lname); + name = TQString("%1 %2").arg(fname).arg(lname); kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl; emit gotAuthorizationRequest( nick, msg, name ); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 4941d479..d819d54a 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -38,7 +38,7 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; - void parseStatus( YMSGTransfer *transfer ); + void parsetStatus( YMSGTransfer *transfer ); void parseStealthStatus( YMSGTransfer *transfer ); void parseAuthorization( YMSGTransfer *transfer ); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index 6ad9994c..ccebaef3 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) @@ -252,7 +252,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index addcb15a..90245b29 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established() if( socketMap[socket].direction == Incoming ) { socket->writeBlock( TQCString("").data(), 8 ); - s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender); + s = TQString("g=%1\r\n").arg(socketMap[socket].sender); } else { @@ -172,7 +172,7 @@ void WebcamTask::slotConnectionStage2Established() socket->writeBlock( TQCString("").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\ne=21\r\nu=%1\r\nt=%2\r\ni=\r\ng=%3\r\no=w-2-5-1\r\np=1") - .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender); + .arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender); // Header: 08 00 01 00 00 00 00 stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); } @@ -182,7 +182,7 @@ void WebcamTask::slotConnectionStage2Established() socket->writeBlock( TQCString("").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\nu=%1\r\nt=%2\r\ni=%3\r\no=w-2-5-1\r\np=2\r\nb=KopeteWebcam\r\nd=\r\n") - .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName()); + .arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName()); // Header: 08 00 05 00 00 00 00 01 00 00 00 01 stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)s.length() << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; @@ -197,7 +197,7 @@ void WebcamTask::slotConnectionFailed( int error ) KStreamSocket* socket = const_cast( dynamic_cast( sender() ) ); kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl; client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.") - .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error ); + .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error ); socketMap.remove( socket ); socket->deleteLater(); } @@ -579,7 +579,7 @@ void WebcamTask::grantAccess( const TQString &userId ) } TQByteArray ar; TQDataStream stream( ar, IO_WriteOnly ); - TQString user = TQString("u=%1").tqarg(userId); + TQString user = TQString("u=%1").arg(userId); stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)user.length() << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index 65c48f54..9ca9af3d 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -146,8 +146,8 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); e.setAttribute( "hn", privateCountry ); - e.setAttribute( "bi", TQString("%1/%2/%3").tqarg( birthday.day() ).tqarg( birthday.month() ).tqarg( birthday.year() ) ); - e.setAttribute( "an", TQString("%1/%2/%3").tqarg( anniversary.day() ).tqarg( anniversary.month() ).tqarg( anniversary.year() ) ); + e.setAttribute( "bi", TQString("%1/%2/%3").arg( birthday.day() ).arg( birthday.month() ).arg( birthday.year() ) ); + e.setAttribute( "an", TQString("%1/%2/%3").arg( anniversary.day() ).arg( anniversary.month() ).arg( anniversary.year() ) ); e.setAttribute( "c1", additional1 ); e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 391d494e..951f88d8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -95,12 +95,12 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl; m_data = TQString(); TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") - .tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING ); + .arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING ); m_transferJob = KIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") - .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) ); + .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index a317cb12..025386f0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -81,7 +81,7 @@ void YahooBuddyIconLoader::slotComplete( KIO::Job *job ) { kdDebug(YAHOO_RAW_DEBUG) << "An error occurred while downloading buddy icon." << endl; if( m_client ) - m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); + m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); } else { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index ad70d3c6..1c9528ff 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -95,7 +95,7 @@ void YahooChatTask::getYahooChatCategories() transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) ); @@ -107,11 +107,11 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl; KIO::TransferJob *transfer; - transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( category.id )), false, false ); + transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false ); transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) ); @@ -214,7 +214,7 @@ void YahooChatTask::login() YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceChatOnline); t->setId( client()->sessionID() ); t->setParam( 1, client()->userId().local8Bit() ); - t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); + t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); send( t ); } diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index 252bc424..7faf0035 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -70,7 +70,7 @@ <i>(for example: joe8752)</i> - + AlignVCenter|AlignRight diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 60dcf519..97be5673 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -156,7 +156,7 @@ To connect to the Yahoo network, you will need a Yahoo account.<br><br>If you do not currently have a Yahoo account, please click the button to create one. - + WordBreak|AlignVCenter @@ -416,7 +416,7 @@ - + AlignCenter diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index bdf56e79..700c91e5 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -219,9 +219,9 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) m_genInfoWidget->titleEdit->setText( yab.title ); if( yab.birthday.isValid() ) - m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() )); + m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() )); if( yab.anniversary.isValid() ) - m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() )); + m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() )); m_genInfoWidget->addressEdit->setText( yab.privateAdress ); m_genInfoWidget->cityEdit->setText( yab.privateCity ); diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index 0bff9120..caa3c75a 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -28,7 +28,7 @@ #include YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), +: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ), KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); @@ -77,15 +77,15 @@ void YahooWebcamDialog::webcamClosed( int reason ) switch ( reason ) { case 1: - closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has stopped broadcasting" ).arg( contactName ); break; case 2: - closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break; case 3: - closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break; case 4: - closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break; + closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break; default: - closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( contactName); + closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName); } m_imageContainer->clear(); @@ -94,7 +94,7 @@ void YahooWebcamDialog::webcamClosed( int reason ) void YahooWebcamDialog::setViewer( const TQStringList &viewer ) { - TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() ); + TQString s = i18n( "%1 viewer(s)" ).arg( viewer.size() ); if( viewer.size() ) { s += ": "; diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index c6c861c9..7cc330f2 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -750,7 +750,7 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url ) else if(succ == Yahoo::LoginLock) { initConnectionSignals( DeleteConnections ); - errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").tqarg(url); + errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url); KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg); static_cast( myself() )->setOnlineStatus( m_protocol->Offline ); disconnected( BadUserName ); // FIXME: add a more appropriate disconnect reason @@ -801,7 +801,7 @@ void YahooAccount::slotDisconnected() TQString message; message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" ) - .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + .arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() ); KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() ); } @@ -814,7 +814,7 @@ void YahooAccount::slotLoginFailed() TQString message; message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" ) - .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + .arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() ); KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() ); } @@ -825,11 +825,11 @@ void YahooAccount::slotError( int level ) return; else if( level <= Client::Warning ) KMessageBox::information( Kopete::UI::Global::mainWidget(), - i18n( "%1\n\nReason: %2").tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), + i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); else KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" ) - .tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); + .arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotBuddy( const TQString &userid, const TQString &alias, const TQString &group ) @@ -888,7 +888,7 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who ) { kdDebug(YAHOO_GEN_DEBUG) ; TQString message; - message = i18n( "User %1 has granted your authorization request." ).tqarg( who ); + message = i18n( "User %1 has granted your authorization request." ).arg( who ); KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); if( contact( who ) ) @@ -900,7 +900,7 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin kdDebug(YAHOO_GEN_DEBUG) ; TQString message; message = i18n( "User %1 has rejected your authorization request.\n%2" ) - .tqarg( who ).tqarg( msg ); + .arg( who ).arg( msg ); KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); } @@ -1222,13 +1222,13 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo { if( *it != m_session->userId() ) { - m.append( TQString(", %1").tqarg( *it ) ); + m.append( TQString(", %1").arg( *it ) ); myMembers.push_back( *it ); } } if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to join a conference with %2.\n\nHis/her message: %3\n\nAccept?") - .tqarg(who).tqarg(m).tqarg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .arg(who).arg(m).arg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_session->joinConference( room, myMembers ); if( !m_conferences[room] ) @@ -1267,7 +1267,7 @@ void YahooAccount::prepareConference( const TQString &who ) char c = rand()%52; room += (c > 25) ? c + 71 : c + 65; } - room = TQString("%1-%2--").tqarg(accountId()).tqarg(room); + room = TQString("%1-%2--").arg(accountId()).arg(room); kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl; TQStringList buddies; @@ -1329,7 +1329,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo YahooConferenceChatSession *session = m_conferences[room]; - TQString body = i18n( "%1 has declined to join the conference: \"%2\"").tqarg( who ).tqarg( msg ); + TQString body = i18n( "%1 has declined to join the conference: \"%2\"").arg( who ).arg( msg ); Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); session->appendMessage( message ); @@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec else if ( cnt > 0 ) { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; - TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox.

      Subject: %2").tqarg( from ).tqarg( subject ), + TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox.

      Subject: %2").arg( from ).arg( subject ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; @@ -1681,7 +1681,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) m_pendingWebcamInvites.append( who ); - if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").tqarg( who ), + if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_pendingWebcamInvites.remove( who ); @@ -1690,7 +1690,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) } void YahooAccount::slotWebcamNotAvailable( const TQString &who ) { - KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").tqarg(who), i18n( "Yahoo Plugin" ) ); + KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotWebcamImage( const TQString& who, const TQPixmap& image ) @@ -1893,7 +1893,7 @@ void YahooAccount::slotWebcamViewerJoined( const TQString &viewer ) void YahooAccount::slotWebcamViewerRequest( const TQString &viewer ) { if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. Grant access?") - .tqarg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .arg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) ) m_session->grantWebcamAccess( viewer ); } diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index f74fd1b6..3bd55b85 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -114,7 +114,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status) protocol() , status.internalStatus()+1000 , status.overlayIcons() + TQStringList("yahoo_stealthed") , - i18n("%1|Stealthed").tqarg( status.description() ) ) ); + i18n("%1|Stealthed").arg( status.description() ) ) ); } else if( !m_stealthed && status.internalStatus() > 999 )// Stealthed -> Not Stealthed Contact::setOnlineStatus( static_cast< YahooProtocol *>( protocol() )->statusFromYahoo( status.internalStatus() - 1000 ) ); @@ -607,7 +607,7 @@ void YahooContact::inviteWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } m_account->yahooSession()->sendWebcamInvite( m_userId ); @@ -662,7 +662,7 @@ void YahooContact::requestWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } -- cgit v1.2.1