From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp') diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp index dcee98d9..3ed2192a 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp @@ -39,7 +39,7 @@ public: int version; int packetLength; Yahoo::Service service; - Yahoo::Status status; + Yahoo::tqStatus status; unsigned int id; ParamList data; bool valid; @@ -62,7 +62,7 @@ YMSGTransfer::YMSGTransfer(Yahoo::Service service) d->status = Yahoo::StatusAvailable; } -YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status) +YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status) { d = new YMSGTransferPrivate; d->valid = true; @@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service) d->service = service; } -Yahoo::Status YMSGTransfer::status() const +Yahoo::tqStatus YMSGTransfer::status() const { return d->status; } -void YMSGTransfer::setStatus(Yahoo::Status status) +void YMSGTransfer::settqStatus(Yahoo::tqStatus status) { d->status = status; } @@ -222,27 +222,27 @@ TQByteArray YMSGTransfer::serialize() const TQByteArray buffer; TQDataStream stream( buffer, IO_WriteOnly ); - stream << (Q_INT8)'Y' << (Q_INT8)'M' << (Q_INT8)'S' << (Q_INT8)'G'; + stream << (TQ_INT8)'Y' << (TQ_INT8)'M' << (TQ_INT8)'S' << (TQ_INT8)'G'; if( d->service == Yahoo::ServicePictureUpload ) - stream << (Q_INT16)0x0f00; + stream << (TQ_INT16)0x0f00; else - stream << (Q_INT16)0x000f; - stream << (Q_INT16)0x0000; + stream << (TQ_INT16)0x000f; + stream << (TQ_INT16)0x0000; if( d->service == Yahoo::ServicePictureUpload || d->service == Yahoo::ServiceFileTransfer ) - stream << (Q_INT16)(length()+4); + stream << (TQ_INT16)(length()+4); else - stream << (Q_INT16)length(); - stream << (Q_INT16)d->service; - stream << (Q_INT32)d->status; - stream << (Q_INT32)d->id; + stream << (TQ_INT16)length(); + stream << (TQ_INT16)d->service; + stream << (TQ_INT32)d->status; + stream << (TQ_INT32)d->id; for (ParamList::ConstIterator it = d->data.constBegin(); it != d->data.constEnd(); ++it) { kdDebug(YAHOO_RAW_DEBUG) << " Serializing key " << (*it).first << " value " << (*it).second << endl; stream.writeRawBytes ( TQString::number( (*it).first ).local8Bit(), TQString::number( (*it).first ).length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; stream.writeRawBytes( (*it).second, (*it).second.length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; } kdDebug(YAHOO_RAW_DEBUG) << " pos=" << pos << " (packet size)" << buffer << endl; return buffer; -- cgit v1.2.1