diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:58:08 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 15:53:30 +0200 |
commit | e7bee19a9f42cffe3a0792348a60e5bee1d3da71 (patch) | |
tree | 92dabc7114bd352b2e4ebb5f64cd3d6429e162f7 /kopete/protocols/msn/msnnotifysocket.cpp | |
parent | 4b54ad17739d1075235f2960ecde230a58b5621c (diff) | |
download | tdenetwork-e7bee19a9f42cffe3a0792348a60e5bee1d3da71.tar.gz tdenetwork-e7bee19a9f42cffe3a0792348a60e5bee1d3da71.zip |
Remove additional unneeded tq method conversions
(cherry picked from commit 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98)
Diffstat (limited to 'kopete/protocols/msn/msnnotifysocket.cpp')
-rw-r--r-- | kopete/protocols/msn/msnnotifysocket.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 5a15aa6f..816ccac9 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( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( handle ); + msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).arg( handle ); type = MSNSocket::ErrorServerError; break; } @@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) "MSN Error: %1<br>" "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( "<qt>The user '%1' already exists in this group on the MSN server;<br>" "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.)</qt>" ).tqarg(handle); + "console (in gzipped format, as it is probably a lot of output.)</qt>" ).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; i<formatterStrings.size(); i++) { - currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]); + currentMedia = currentMedia.replace(TQString("{%1}").arg(i), formatterStrings[i]); } if( type == TQString::fromUtf8("Music") ) { // the "♫" is encoded in utf8 (and should be in utf8) - currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(currentMedia); + currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia); } kdDebug(1414) << "Current Media received: " << currentMedia << endl; @@ -1049,25 +1049,25 @@ void MSNNotifySocket::addContact( const TQString &handle, int list, const TQStri // Adding the contact to a group if( !contactGuid.isEmpty() ) { - args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid ); + args = TQString("FL C=%1 %2").arg( contactGuid ).arg( groupGuid ); kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl; } // Adding a new contact else { - args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) ); + args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) ); kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl; } break; } case MSNProtocol::AL: - args = TQString("AL N=%1").tqarg( handle ); + args = TQString("AL N=%1").arg( handle ); break; case MSNProtocol::BL: - args = TQString("BL N=%1").tqarg( handle ); + args = TQString("BL N=%1").arg( handle ); break; case MSNProtocol::RL: - args = TQString("RL N=%1").tqarg( handle ); + args = TQString("RL N=%1").arg( handle ); break; default: kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl; @@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty if( !mediaList[0].isEmpty() ) // Current Track { xmlCurrentMedia += "{0}"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[0]); + formatterArguments += TQString("%1\\0").arg(mediaList[0]); } if( !mediaList[1].isEmpty() ) // Current Artist { xmlCurrentMedia += " - {1}"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[1]); + formatterArguments += TQString("%1\\0").arg(mediaList[1]); } if( !mediaList[2].isEmpty() ) // Current Album { xmlCurrentMedia += " ({2})"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[2]); + formatterArguments += TQString("%1\\0").arg(mediaList[2]); } xmlCurrentMedia += "\\0" + formatterArguments + "\\0"; break; |