summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn/outgoingtransfer.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/msn/outgoingtransfer.cpp
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/msn/outgoingtransfer.cpp')
-rw-r--r--kopete/protocols/msn/outgoingtransfer.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index f6b71c12..39d3c5d0 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -25,7 +25,7 @@
#include <kmdcodec.h>
using namespace KNetwork;
-// Qt includes
+// TQt includes
#include <tqfile.h>
#include <tqregexp.h>
#include <tqtimer.h>
@@ -39,7 +39,7 @@ using P2P::Dispatcher;
using P2P::OutgoingTransfer;
using P2P::Message;
-OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId)
+OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId)
: TransferContext(to,dispatcher,sessionId)
{
m_direction = Outgoing;
@@ -83,7 +83,7 @@ void OutgoingTransfer::sendImage(const TQByteArray& image)
void OutgoingTransfer::slotSendData()
{
- Q_INT32 bytesRead = 0;
+ TQ_INT32 bytesRead = 0;
TQByteArray buffer(1202);
if(!m_file)
return;
@@ -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);
}
@@ -357,7 +357,7 @@ void OutgoingTransfer::slotConnected()
{
kdDebug(14140) << k_funcinfo << endl;
// Check if connection is ok.
- Q_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4);
+ TQ_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4);
if(bytesWritten != 4)
{
// Not all data was written, close the socket.
@@ -381,10 +381,10 @@ void OutgoingTransfer::slotConnected()
handshake.header.ackSessionIdentifier = nonce.mid(0, 8).toUInt(0, 16);
handshake.header.ackUniqueIdentifier =
nonce.mid(8, 4).toUInt(0, 16) | (nonce.mid(12, 4).toUInt(0, 16) << 16);
- const Q_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16);
- const Q_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16);
+ const TQ_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16);
+ const TQ_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16);
handshake.header.ackDataSize =
- ((Q_INT64)htonl(lo)) | (((Q_INT64)htonl(hi)) << 32);
+ ((TQ_INT64)htonl(lo)) | (((TQ_INT64)htonl(hi)) << 32);
TQByteArray stream;
// Write the message to the memory stream.
@@ -395,13 +395,13 @@ void OutgoingTransfer::slotConnected()
void OutgoingTransfer::slotRead()
{
- Q_INT32 bytesAvailable = m_socket->bytesAvailable();
+ TQ_INT32 bytesAvailable = m_socket->bytesAvailable();
kdDebug(14140) << k_funcinfo << bytesAvailable << ", bytes available." << endl;
}
void OutgoingTransfer::slotSocketError(int)
{
- kdDebug(14140) << k_funcinfo << m_socket->errorString() << endl;
+ kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl;
// If an error has occurred, try to connect
// to another available peer endpoint.
// If there are no more available endpoints,