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/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 +++--- kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp | 4 ++-- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kopete/protocols/oscar/icq') 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 -- cgit v1.2.1