diff options
Diffstat (limited to 'kopete/protocols/msn')
| -rw-r--r-- | kopete/protocols/msn/dispatcher.cpp | 14 | ||||
| -rw-r--r-- | kopete/protocols/msn/incomingtransfer.cpp | 12 | ||||
| -rw-r--r-- | kopete/protocols/msn/messageformatter.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/msn/msnaccount.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/msn/msnchatsession.cpp | 10 | ||||
| -rw-r--r-- | kopete/protocols/msn/msncontact.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/msn/msnnotifysocket.cpp | 30 | ||||
| -rw-r--r-- | kopete/protocols/msn/msnsocket.cpp | 4 | ||||
| -rw-r--r-- | kopete/protocols/msn/msnswitchboardsocket.cpp | 16 | ||||
| -rw-r--r-- | kopete/protocols/msn/outgoingtransfer.cpp | 8 | ||||
| -rw-r--r-- | kopete/protocols/msn/transport.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/msn/ui/msnadd.ui | 4 | ||||
| -rw-r--r-- | kopete/protocols/msn/ui/msneditaccountui.ui | 14 | ||||
| -rw-r--r-- | kopete/protocols/msn/webcam.cpp | 18 | ||||
| -rw-r--r-- | kopete/protocols/msn/webcam/msnwebcamdialog.cpp | 4 |
15 files changed, 71 insertions, 71 deletions
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): <br /><ul>").tqarg(reason); + TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").arg(reason); for ( TQMap<unsigned int , Kopete::Message>::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( "<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 [email protected] 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 [email protected] 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; diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index e65fcd87..b8f852e3 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -183,7 +183,7 @@ void MSNSocket::slotSocketError( int error ) TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" ); if ( error == KSocketBase::LookupFailure ) - errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().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("<img src=\"%1\" alt=\"Typewrited message\" />" ).tqarg( file->name() ); + TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).arg( file->name() ); kdDebug(14140) << k_funcinfo << file->name() <<endl; @@ -1021,11 +1021,11 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms * emoticons like that. So, in that case, we show like the MSN client */ #if 0 TQString em = TQRegExp::escape( es ); - message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), + message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).arg(em).arg(em)), TQString::fromLatin1("\\1<img align=\"center\" width=\"") + #endif //match any occurence which is not in a html tag. - message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), + message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))), TQString::fromLatin1("<img align=\"center\" width=\"") + TQString::number(iconImage.width()) + TQString::fromLatin1("\" height=\"") + diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index 39d3c5d0..604df5d1 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -101,7 +101,7 @@ void OutgoingTransfer::slotSendData() buffer.resize(bytesRead); } - kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(bytesRead) << endl; + kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").arg(bytesRead) << endl; if((m_offset + bytesRead) < m_file->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 @@ <property name="text"> <string>&MSN Passport ID:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -70,7 +70,7 @@ <property name="text"> <string><i>(for example: [email protected])</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> 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 @@ <property name="text"> <string>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.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -229,7 +229,7 @@ <property name="text"> <string><qt><b>Note:</b> These settings are applicable to all MSN accounts</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -482,7 +482,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>There are also privacy options in the "Contacts" tab</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -673,7 +673,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>Please select a square image. The image will be scaled to 96x96.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -836,7 +836,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>WARNING: You need to be connected to modify this page.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1086,7 +1086,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>WARNING: You need to be connected to modify this page</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work.</string> <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> 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("<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see it?</qt>") : 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("<tcpport>([^<]*)</tcpport>"); rx.search(m_content); @@ -370,9 +370,9 @@ void Webcam::processMessage(const Message& message) while(true) { an++; - if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) )) + if(!m_content.contains( TQString("<tcpipaddress%1>").arg(an) )) break; - rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an)); + rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").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("<tcpipaddress%1>%2</tcpipaddress%3>").tqarg(ip_number).tqarg(*it).tqarg(ip_number); + ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").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 <<endl; //m_imageContainer.clear(); - //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) ); + //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).arg( TQString::number( reason ) ) ); //m_imageContainer.setAlignment( TQt::AlignCenter ); //show(); } |