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/ymsgprotocol.cpp | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp') diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp index b1e6e4e3..5517c3f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp @@ -36,8 +36,8 @@ using namespace Yahoo; -YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) int pos = 0; int len = 0; - Yahoo::Status status = Yahoo::StatusAvailable; + Yahoo::tqStatus status = Yahoo::StatusAvailable; Yahoo::Service service = Yahoo::ServiceAuth; int statusnum = 0; int sessionid = 0; @@ -149,9 +149,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceIddeAct " << servicenum << endl; service = Yahoo::ServiceIddeAct; break; - case (Yahoo::ServiceStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl; - service = Yahoo::ServiceStatus; + case (Yahoo::ServicetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicetqStatus " << servicenum << endl; + service = Yahoo::ServicetqStatus; break; case (Yahoo::ServiceMessage) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceMessage " << servicenum << endl; @@ -177,9 +177,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureChecksum " << servicenum << endl; service = Yahoo::ServicePictureChecksum; break; - case (Yahoo::ServicePictureStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl; - service = Yahoo::ServicePictureStatus; + case (Yahoo::ServicePicturetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicturetqStatus " << servicenum << endl; + service = Yahoo::ServicePicturetqStatus; break; case (Yahoo::ServicePicture) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicture " << servicenum << endl; @@ -297,9 +297,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceComment " << servicenum << endl; service = Yahoo::ServiceComment; break; - case (Yahoo::ServiceBuddyStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl; - service = Yahoo::ServiceBuddyStatus; + case (Yahoo::ServiceBuddytqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddytqStatus " << servicenum << endl; + service = Yahoo::ServiceBuddytqStatus; break; case (Yahoo::ServiceBuddyList) : kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyList " << servicenum << endl; @@ -329,7 +329,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) ServiceGroupRename = 0x89, // > 1, 65(new), 66(0), 67(old) ServicePictureUpdate = 0xc1, ServiceVisibility = 0xc5, // YMSG13, key 13: 2 = invisible, 1 = visible - ServiceStatus = 0xc6, // YMSG13 + ServicetqStatus = 0xc6, // YMSG13 */ default: @@ -378,7 +378,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) YMSGTransfer *t = new YMSGTransfer(); t->setService(service); t->setId(sessionid); - t->setStatus(status); + t->settqStatus(status); t->setPacketLength(len); TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos ); -- cgit v1.2.1