diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:58:08 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-19 11:58:08 -0600 |
commit | 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 (patch) | |
tree | e24fdc0514249de1233dd5dc07f09d07a35f4269 /kopete/protocols/yahoo/yahooaccount.cpp | |
parent | 089118c18533dfa3e6ce5065dbebdd4db94051f1 (diff) | |
download | tdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.tar.gz tdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kopete/protocols/yahoo/yahooaccount.cpp')
-rw-r--r-- | kopete/protocols/yahoo/yahooaccount.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
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<YahooContact *>( 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. <br><br>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. <br><br>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 ); } |