summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/msn')
-rw-r--r--kopete/protocols/msn/config/msnprefs.ui4
-rw-r--r--kopete/protocols/msn/dispatcher.cpp18
-rw-r--r--kopete/protocols/msn/incomingtransfer.cpp12
-rw-r--r--kopete/protocols/msn/messageformatter.cpp2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp12
-rw-r--r--kopete/protocols/msn/msnaddcontactpage.cpp2
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp14
-rw-r--r--kopete/protocols/msn/msncontact.cpp18
-rw-r--r--kopete/protocols/msn/msncontact.h4
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp44
-rw-r--r--kopete/protocols/msn/msnnotifysocket.h8
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp22
-rw-r--r--kopete/protocols/msn/msnsocket.h6
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp38
-rw-r--r--kopete/protocols/msn/outgoingtransfer.cpp8
-rw-r--r--kopete/protocols/msn/transport.cpp2
-rw-r--r--kopete/protocols/msn/ui/msnadd.ui8
-rw-r--r--kopete/protocols/msn/ui/msneditaccountui.ui76
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp2
-rw-r--r--kopete/protocols/msn/ui/msninfo.ui4
-rw-r--r--kopete/protocols/msn/webcam.cpp22
-rw-r--r--kopete/protocols/msn/webcam.h4
-rw-r--r--kopete/protocols/msn/webcam/msnwebcamdialog.cpp8
25 files changed, 171 insertions, 171 deletions
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index 13817584..701d564d 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>tqlayout18</cstring>
</property>
<hbox>
<property name="name">
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>70</height>
diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index 8576748e..34aa7425 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -40,8 +40,8 @@ using P2P::OutgoingTransfer;
#include <tqdatastream.h>
#include <tqfile.h>
#include <tqregexp.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
// Kopete includes
#include <kopetechatsession.h> // Just for getting the contact
@@ -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.device()->at(20);
+ ts.tqdevice()->tqat(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.device()->at(570);
+ writer.tqdevice()->tqat(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").arg(receivedMessage.header.identifier)
+ << TQString("retrieving buffered messsage, %1").tqarg(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").arg(message.header.identifier)
+ << TQString("Buffering messsage, %1").tqarg(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").arg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(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.device()->at(8);
+ reader.tqdevice()->tqat(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.").arg(fileName, TQString::number(fileSize))
+ TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize))
<< endl
<< endl;
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index dd616a1b..b7b90296 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").arg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(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").arg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(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").arg(message.header.dataSize) << endl;
+ kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(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").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()) +
+ 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()) +
"\r\n";
}
else
diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp
index 0ca71789..40bd8877 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.device()->at(index);
+ reader.tqdevice()->tqat(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 6c4aa9cc..fbf43221 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ),
TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
- m_notifySocket->setStatus( m_connectstatus );
+ m_notifySocket->settqStatus( m_connectstatus );
m_notifySocket->connect(host, port);
}
@@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
disconnect();
else if ( m_notifySocket )
{
- m_notifySocket->setStatus( status );
+ m_notifySocket->settqStatus( status );
}
else
{
@@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed()
m_notifySocket->deleteLater();
m_notifySocket = 0l;
myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
- setAllContactsStatus( MSNProtocol::protocol()->FLN );
+ setAllContactstqStatus( MSNProtocol::protocol()->FLN );
disconnected(reason);
@@ -951,7 +951,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
- if ( c->onlineStatus() == MSNProtocol::protocol()->UNK )
+ if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK )
c->setOnlineStatus( MSNProtocol::protocol()->FLN );
if ( c->metaContact() && c->metaContact()->isTemporary() )
@@ -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" ).arg( c->metaContact()->displayName() );
+ TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
manager->appendMessage( tmpMsg );
}
@@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force)
if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent)
{
//update the msn pict
- m_notifySocket->setStatus( myself()->onlineStatus() );
+ m_notifySocket->settqStatus( myself()->onlinetqStatus() );
}
}
diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp
index a33ab93c..8bdf77a1 100644
--- a/kopete/protocols/msn/msnaddcontactpage.cpp
+++ b/kopete/protocols/msn/msnaddcontactpage.cpp
@@ -13,7 +13,7 @@
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <klocale.h>
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 6709f0f1..2b7fe8bb 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" ).arg( m.plainBody() );
+ TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( 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" )
- .arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName );
+ .tqarg( 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);
@@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture()
if( !c->object().isEmpty() )
m_chatService->requestDisplayPicture();
}
- else if(myself()->onlineStatus().isDefinitelyOnline() && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+ else if(myself()->onlinetqStatus().isDefinitelyOnline() && myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
startChatSession();
}
else
@@ -548,7 +548,7 @@ void MSNChatSession::slotDisplayPictureChanged()
int sz=22;
// get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know
- KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
+ KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
if(w)
{
//We connected that in the constructor. we don't need to keep this slot active.
@@ -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" ).arg( c->metaContact()->displayName() );
+ TQString body = i18n( "%1 has started a chat with you" ).tqarg( 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").arg(reason, m.plainBody());
+ TQString body=i18n("The following message has not been sent correctly (%1): \n%2").tqarg(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>").arg(reason);
+ TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").tqarg(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 700bf213..304029bf 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -89,7 +89,7 @@ MSNContact::~MSNContact()
bool MSNContact::isReachable()
{
- if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN )
+ if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN )
return true;
MSNChatSession *kmm=dynamic_cast<MSNChatSession*>(manager(Kopete::Contact::CannotCreate));
@@ -98,13 +98,13 @@ bool MSNContact::isReachable()
// When we are invisible we can't start a chat with others, make isReachable return false
// (This is an MSN limitation, not a problem in Kopete)
- if ( !account()->isConnected() || account()->myself()->onlineStatus() == MSNProtocol::protocol()->HDN )
+ if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == MSNProtocol::protocol()->HDN )
return false;
//if the contact is offline, it is impossible to send it a message. but it is impossible
//to be sure the contact is realy offline. For example, if the contact is not on the contactlist for
//some reason.
- if( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
+ if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
return false;
return true;
@@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked )
{
m_blocked = blocked;
//update the status
- setOnlineStatus(m_currentStatus);
- //m_currentStatus is used here. previously it was onlineStatus() but this may cause problem when
+ setOnlineStatus(m_currenttqStatus);
+ //m_currenttqStatus is used here. previously it was onlinetqStatus() but this may cause problem when
// the account is offline because of the Kopete::Contact::OnlineStatus() account offline hack.
}
}
@@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName )
void MSNContact::slotShowProfile()
{
- KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
+ KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
}
@@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
protocol() ,
status.internalStatus()+15 ,
status.overlayIcons() + TQStringList("msn_blocked") ,
- i18n("%1|Blocked").arg( status.description() ) ) );
+ i18n("%1|Blocked").tqarg( status.description() ) ) );
}
else if(!isBlocked() && status.internalStatus() >= 15)
{ //the user is not blocked, but the status is blocked
@@ -655,7 +655,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
}
else
Kopete::Contact::setOnlineStatus(status);
- m_currentStatus=status;
+ m_currenttqStatus=status;
}
void MSNContact::slotSendMail()
@@ -703,7 +703,7 @@ void MSNContact::setObject(const TQString &obj)
KConfig *config = KGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
- && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
+ && account()->myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically.
}
diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 42667682..97039fed 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -185,10 +185,10 @@ private:
TQString m_obj; //the MSNObject
/**
- * keep the current status here. (it's normally already in Kopete::Contact::d->onlineStatus)
+ * keep the current status here. (it's normally already in Kopete::Contact::d->onlinetqStatus)
* This is a workaround to prevent problems with the account offline status.
*/
- Kopete::OnlineStatus m_currentStatus;
+ Kopete::OnlineStatus m_currenttqStatus;
//MSNProtocol::deserializeContact need to acess some contact insternals
friend class MSNProtocol;
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 157209e9..72b5f1f8 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
void MSNFileTransferSocket::slotTimer()
{
- if(onlineStatus() != Disconnected)
+ if(onlinetqStatus() != Disconnected)
return;
kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl;
if( m_kopeteTransfer)
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index b9dbb921..93dc2f0e 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect()
m_isLogged = false;
if( m_disconnectReason==Kopete::Account::Unknown )
m_disconnectReason=Kopete::Account::Manual;
- if( onlineStatus() == Connected )
+ if( onlinetqStatus() == Connected )
sendCommand( "OUT", TQString(), false );
if( m_keepaliveTimer )
m_keepaliveTimer->stop();
// the socket is not connected yet, so I should force the signals
- if ( onlineStatus() == Disconnected || onlineStatus() == Connecting )
+ if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting )
emit socketClosed();
else
MSNSocket::disconnect();
@@ -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>" ).arg( handle );
+ msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( 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.)" ).arg(code);
+ "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(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>" ).arg(handle);
+ "console (in gzipped format, as it is probably a lot of output.)</qt>" ).tqarg(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." ).arg(handle);
+ msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle);
type = MSNSocket::ErrorServerError;
break;
}
@@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl;
// set the status
- setStatus( m_newstatus );
+ settqStatus( m_newstatus );
}
else if( cmd == "BPR" )
{
@@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
"<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n"
"<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n"
"<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n"
- "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n"
+ "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n"
"<input type=\"hidden\" name=\"svc\" value=\"mail\">\n"
"<input type=\"hidden\" name=\"js\" value=\"yes\">\n"
"</form></body>\n</html>\n";
@@ -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." ).arg(m),
+ TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m),
0 , 0 , i18n( "Open Inbox..." ) ),
TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
}
@@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
m_msnAlertURLs.append(subscString);
// Don't do any MSN alerts notification for new blog updates
- if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") )
+ if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") )
{
KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions);
TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int)));
@@ -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}").arg(i), formatterStrings[i]);
+ currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]);
}
if( type == TQString::fromUtf8("Music") )
{
// the "♫" is encoded in utf8 (and should be in utf8)
- currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia);
+ currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(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").arg( contactGuid ).arg( groupGuid );
+ args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid );
kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl;
}
// Adding a new contact
else
{
- args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) );
+ args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) );
kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl;
}
break;
}
case MSNProtocol::AL:
- args = TQString("AL N=%1").arg( handle );
+ args = TQString("AL N=%1").tqarg( handle );
break;
case MSNProtocol::BL:
- args = TQString("BL N=%1").arg( handle );
+ args = TQString("BL N=%1").tqarg( handle );
break;
case MSNProtocol::RL:
- args = TQString("RL N=%1").arg( handle );
+ args = TQString("RL N=%1").tqarg( handle );
break;
default:
kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl;
@@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS
m_tmpHandles[id]=handle;
}
-void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status )
+void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status )
{
// kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl;
- if( onlineStatus() == Disconnected )
+ if( onlinetqStatus() == Disconnected )
m_newstatus = status;
else
sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) );
@@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty
if( !mediaList[0].isEmpty() ) // Current Track
{
xmlCurrentMedia += "{0}";
- formatterArguments += TQString("%1\\0").arg(mediaList[0]);
+ formatterArguments += TQString("%1\\0").tqarg(mediaList[0]);
}
if( !mediaList[1].isEmpty() ) // Current Artist
{
xmlCurrentMedia += " - {1}";
- formatterArguments += TQString("%1\\0").arg(mediaList[1]);
+ formatterArguments += TQString("%1\\0").tqarg(mediaList[1]);
}
if( !mediaList[2].isEmpty() ) // Current Album
{
xmlCurrentMedia += " ({2})";
- formatterArguments += TQString("%1\\0").arg(mediaList[2]);
+ formatterArguments += TQString("%1\\0").tqarg(mediaList[2]);
}
xmlCurrentMedia += "\\0" + formatterArguments + "\\0";
break;
diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h
index ccec2e89..805e427c 100644
--- a/kopete/protocols/msn/msnnotifysocket.h
+++ b/kopete/protocols/msn/msnnotifysocket.h
@@ -50,7 +50,7 @@ public:
virtual void disconnect();
- void setStatus( const Kopete::OnlineStatus &status );
+ void settqStatus( const Kopete::OnlineStatus &status );
void addContact( const TQString &handle, int list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid );
void removeContact( const TQString &handle, int list, const TQString &contactGuid, const TQString &groupGuid );
@@ -86,7 +86,7 @@ public slots:
signals:
void newContactList();
void contactList(const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups);
- void contactStatus(const TQString&, const TQString&, const TQString& );
+ void contacttqStatus(const TQString&, const TQString&, const TQString& );
void contactAdded(const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid);
//void contactRemoved(const TQString&, const TQString&, uint);
void contactRemoved(const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid);
@@ -99,7 +99,7 @@ signals:
void invitedToChat(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& );
void startChat( const TQString&, const TQString& );
- void statusChanged( const Kopete::OnlineStatus &newStatus );
+ void statusChanged( const Kopete::OnlineStatus &newtqStatus );
void hotmailSeted(bool) ;
@@ -165,7 +165,7 @@ private:
Kopete::OnlineStatus m_newstatus;
/**
- * Convert an entry of the Status enum back to a string
+ * Convert an entry of the tqStatus enum back to a string
*/
TQString statusToString( const Kopete::OnlineStatus &status ) const;
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index b7eaf57b..a3ab2532 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting );
- // m_status = m_unknownStatus = UNK;
+ // m_status = m_unknowntqStatus = UNK;
}
Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index e098e27b..f238a507 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -56,7 +56,7 @@ class MimeMessage
MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
{
- m_onlineStatus = Disconnected;
+ m_onlinetqStatus = Disconnected;
m_socket = 0L;
m_useHttp = false;
m_timer = 0L;
@@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
MSNSocket::~MSNSocket()
{
- //if ( m_onlineStatus != Disconnected )
+ //if ( m_onlinetqStatus != Disconnected )
// disconnect();
delete m_timer;
m_timer = 0L;
@@ -75,13 +75,13 @@ MSNSocket::~MSNSocket()
void MSNSocket::connect( const TQString &server, uint port )
{
- if ( m_onlineStatus == Connected || m_onlineStatus == Connecting )
+ if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting )
{
kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl;
return;
}
- if( m_onlineStatus == Disconnecting )
+ if( m_onlinetqStatus == Disconnecting )
{
// Cleanup first.
// FIXME: More generic!!!
@@ -166,10 +166,10 @@ void MSNSocket::doneDisconnect()
void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
{
- if ( m_onlineStatus == status )
+ if ( m_onlinetqStatus == status )
return;
- m_onlineStatus = status;
+ m_onlinetqStatus = status;
emit onlineStatusChanged( status );
}
@@ -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" ).arg( m_socket->peerResolver().nodeName() );
+ errormsg += i18n( "Unable to lookup %1" ).tqarg( 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." ).arg( code );
+ "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code );
// "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes."
break;
}
@@ -762,7 +762,7 @@ TQString MSNSocket::escape( const TQString &str )
for ( int i = 0; i < old_length; i++ )
{
- unsigned short character = str[i].unicode();
+ unsigned short character = str[i].tqunicode();
if( character <= 32 || character == '%' )
{
@@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed()
{
kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl;
- if ( !m_socket || m_onlineStatus == Disconnected )
+ if ( !m_socket || m_onlinetqStatus == Disconnected )
{
kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl;
return;
@@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
m_gateway = "gateway.messenger.hotmail.com";
}
- if ( m_onlineStatus != Disconnected )
+ if ( m_onlinetqStatus != Disconnected )
disconnect();
m_useHttp = useHttp;
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index aa5a5922..e4238a59 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -76,11 +76,11 @@ public:
* handshake likely has to follow first.
*/
enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected };
- enum LookupStatus { Processing, Success, Failed };
+ enum LookuptqStatus { Processing, Success, Failed };
enum Transport { TcpTransport, HttpTransport };
enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation};
- OnlineStatus onlineStatus() { return m_onlineStatus; }
+ OnlineStatus onlinetqStatus() { return m_onlinetqStatus; }
/*
* return the local ip.
@@ -279,7 +279,7 @@ private:
void parseLine( const TQString &str );
KNetwork::KBufferedSocket *m_socket;
- OnlineStatus m_onlineStatus;
+ OnlineStatus m_onlinetqStatus;
TQString m_server;
uint m_port;
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 3b5fafd4..319df782 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -26,7 +26,7 @@
#include <cmath>
// qt
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqregexp.h>
#include <tqimage.h>
#include <tqtimer.h>
@@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
}
case 215:
{
- msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle );
+ msg = i18n( "The user %1 is already in this chat." ).tqarg( 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." ).arg( m_msgHandle );
+ msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( 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." ).arg( m_msgHandle );
+ msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( 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" ).arg( m_msgHandle );
+ TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle );
type = MSNSocket::ErrorInformation;
userLeftChat(m_msgHandle, i18n("user blocked you"));
@@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping )
if( !isTyping )
return;
- if ( onlineStatus() != Connected || m_chatMembers.empty())
+ if ( onlinetqStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
@@ -653,7 +653,7 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin
// this sends a short message to the server
int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
{
- if ( onlineStatus() != Connected || m_chatMembers.empty())
+ if ( onlinetqStatus() != Connected || m_chatMembers.empty())
{
// m_messagesQueue.append(msg);
return -1;
@@ -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.").arg(nb) ,
+ i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(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\" />" ).arg( file->name() );
+ TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).tqarg( file->name() );
kdDebug(14140) << k_funcinfo << file->name() <<endl;
@@ -1021,19 +1021,19 @@ 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)" ).arg(em).arg(em)),
- TQString::fromLatin1("\\1<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
+ TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") +
#endif
//match any occurence which is not in a html tag.
- message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))),
- TQString::fromLatin1("<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
+ TQString::tqfromLatin1("<img align=\"center\" width=\"") +
TQString::number(iconImage.width()) +
- TQString::fromLatin1("\" height=\"") +
+ TQString::tqfromLatin1("\" height=\"") +
TQString::number(iconImage.height()) +
- TQString::fromLatin1("\" src=\"") + imgPath +
- TQString::fromLatin1("\" title=\"") + es +
- TQString::fromLatin1("\" alt=\"") + es +
- TQString::fromLatin1( "\"/>" ) );
+ TQString::tqfromLatin1("\" src=\"") + imgPath +
+ TQString::tqfromLatin1("\" title=\"") + es +
+ TQString::tqfromLatin1("\" alt=\"") + es +
+ TQString::tqfromLatin1( "\"/>" ) );
kmsg.setBody(message, Kopete::Message::RichText);
}
}
@@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
the bad side effect: some switchboard connection may be maintained for really long time!
*/
- if ( onlineStatus() != Connected || m_chatMembers.empty())
+ if ( onlinetqStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index 604df5d1..39d3c5d0 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").arg(bytesRead) << endl;
+ kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(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").arg("-123657987") +
- TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") +
+ TQString("NetID: %1\r\n").tqarg("-123657987") +
+ TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") +
"UPnPNat: false\r\n"
"ICF: false\r\n" +
- TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) +
+ TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) +
"\r\n";
sendMessage(INVITE, content);
}
diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp
index 57b1f356..da0b856e 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").arg(errorCode).arg(mSocket->errorString()));
+ emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(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 fab496d3..283ea56f 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout21</cstring>
+ <cstring>tqlayout21</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="text">
<string>&amp;MSN Passport ID:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
<property name="buddy" stdset="0">
@@ -70,7 +70,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe@hotmail.com)&lt;/i&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>160</height>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 0a764c57..674248a1 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>146</height>
@@ -92,7 +92,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -101,7 +101,7 @@
<property name="text">
<string>To connect to the Microsoft network, you will need a Microsoft Passport.&lt;br&gt;&lt;br&gt;If you do not currently have a Passport, please click the button to create one.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -128,7 +128,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@
<property name="text">
<string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; These settings are applicable to all MSN accounts</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13_2</cstring>
+ <cstring>tqlayout13_2</cstring>
</property>
<hbox>
<property name="name">
@@ -408,7 +408,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>tqlayout28</cstring>
</property>
<hbox>
<property name="name">
@@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -468,7 +468,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -641,7 +641,7 @@ Only works for emoticons in the PNG format.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<vbox>
<property name="name">
@@ -673,13 +673,13 @@ 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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -736,7 +736,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<vbox>
<property name="name">
@@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>96</width>
<height>96</height>
@@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -810,7 +810,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -865,7 +865,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<grid>
<property name="name">
@@ -889,7 +889,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
@@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -950,7 +950,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout58</cstring>
+ <cstring>tqlayout58</cstring>
</property>
<hbox>
<property name="name">
@@ -966,7 +966,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -1005,7 +1005,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout59</cstring>
+ <cstring>tqlayout59</cstring>
</property>
<hbox>
<property name="name">
@@ -1021,7 +1021,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -1032,7 +1032,7 @@ Only works for emoticons in the PNG format.</string>
<property name="name">
<cstring>m_RLButton</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>200</width>
<height>32767</height>
@@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -1124,7 +1124,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout20</cstring>
+ <cstring>tqlayout20</cstring>
</property>
<hbox>
<property name="name">
@@ -1132,7 +1132,7 @@ Only works for emoticons in the PNG format.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout19</cstring>
+ <cstring>tqlayout19</cstring>
</property>
<hbox>
<property name="name">
@@ -1236,7 +1236,7 @@ Only check this option if the normal connection doesn't work.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout22</cstring>
+ <cstring>tqlayout22</cstring>
</property>
<hbox>
<property name="name">
@@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>70</height>
@@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work.</string>
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index a3ac755a..4bb246a2 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -22,7 +22,7 @@
#include <tqgroupbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index 59d50be6..42a0f0b6 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -98,7 +98,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index 88fe7d33..e2024a94 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.arg(m_recipient),
+ int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient),
i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline"));
if(!_this)
return;
- TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(m_sessionId);
if(result==KMessageBox::Yes)
{
//Send two message, an OK, and an invite.
@@ -268,7 +268,7 @@ void Webcam::processMessage(const Message& message)
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::fromLatin1(&C,1);
+ echoS+=TQString::tqfromLatin1(&C,1);
}
f+=16;
}
@@ -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").arg(rid).arg(sess);
+ m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(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").arg(rid,sess);
+ m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess);
kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl;
}
else
{
- m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess);
+ m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(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").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;
+ kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(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>").arg(an) ))
+ if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) ))
break;
- rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").arg(an).arg(an));
+ rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an));
rx.search(m_content);
TQString ip=rx.cap(1);
if(ip.isNull())
@@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY ,
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::fromLatin1(&C,1);
+ echoS+=TQString::tqfromLatin1(&C,1);
}
f+=16;
}
@@ -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>").arg(ip_number).arg(*it).arg(ip_number);
+ ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").tqarg(ip_number).tqarg(*it).tqarg(ip_number);
++ip_number;
}
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 459f7fca..75e742d3 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -57,7 +57,7 @@ class Webcam : public TransferContext
KNetwork::KServerSocket *m_listener;
KNetwork::KBufferedSocket *m_webcamSocket;
- enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
+ enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
Who m_who;
@@ -68,7 +68,7 @@ class Webcam : public TransferContext
MSNWebcamDialog *m_widget;
TQValueList<KNetwork::KBufferedSocket* > m_allSockets;
- TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates;
+ TQMap<KNetwork::KBufferedSocket*, WebcamtqStatus> m_webcamStates;
int m_timerId;
int m_timerFps;
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index 39b7049b..31e5dbfc 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" ).arg( contact ),
+ : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ),
KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ),
m_imageContainer( this )
{
@@ -48,7 +48,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co
{
kdDebug(14180) << k_funcinfo << "Adding webcam image container" << endl;
//m_imageContainer.setText( i18n( "No webcam image received" ) );
- //m_imageContainer.setAlignment( TQt::AlignCenter );
+ //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
m_imageContainer.setMinimumSize(320,240);
}
show();
@@ -72,8 +72,8 @@ 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" ).arg( TQString::number( reason ) ) );
- //m_imageContainer.setAlignment( TQt::AlignCenter );
+ //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) );
+ //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
//show();
}